Merge branch 'dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0573.java

@@ -21,15 +21,33 @@ public class CLI0573 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<ClinicalBloodDoc> clinicalBloodDocs = inputInfo.getClinicalBloodDocs();
-        if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
-            for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
+        if (clinicalBloodDocs != null && clinicalBloodDocs.size() > 0) {
+            for (ClinicalBloodDoc cliB : clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("输注前评估")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("输注前评估"))){
+               /* if (cliBStructureMap.containsKey("输注前评估")) {
+                    if (StringUtils.isEmpty(cliBStructureMap.get("输注前评估"))
+                            && StringUtils.isEmpty(cliBStructureMap.get("输血检验指标"))
+                            && StringUtils.isEmpty(cliBStructureMap.get("输血项目"))
+                            && StringUtils.isEmpty(cliBStructureMap.get("输血目的"))
+                            && StringUtils.isEmpty(cliBStructureMap.get("输血计划"))) {
                         status.set("-1");
                         break;
                     }
-                }else {
+                } else {
+                    status.set("-1");
+                    break;
+                }*/
+
+                if (StringUtils.isEmpty(cliBStructureMap.get("输注前评估"))
+                        && StringUtils.isEmpty(cliBStructureMap.get("初步诊断"))
+                        && StringUtils.isEmpty(cliBStructureMap.get("输血检验指标"))
+                        && StringUtils.isEmpty(cliBStructureMap.get("输血项目"))
+                        && StringUtils.isEmpty(cliBStructureMap.get("输血目的"))
+                        && StringUtils.isEmpty(cliBStructureMap.get("输血计划"))) {
+                    status.set("-1");
+                    break;
+
+                } else {
                     status.set("-1");
                     break;
                 }