Merge remote-tracking branch 'origin/master'

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0329.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,14 @@ public class PRE0329 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征"))) {
-                        status.set("-1");
-                    }
+
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征"))) {
+                    status.set("-1");
                 }
             }
+
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,13 @@ public class PRE0330 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟行术式"))) {
-                        status.set("-1");
-                    }
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟行术式"))) {
+                    status.set("-1");
                 }
             }
+
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0331.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,12 @@ public class PRE0331 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
                 for (OperationDoc operationDoc : operationDocs) {
                     if (operationDoc.getPreoperativeDiscussionDoc() == null
                             || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("麻醉方式"))) {
                         status.set("-1");
                     }
                 }
-            }
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0332.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,14 +24,10 @@ public class PRE0332 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备内容"))) {
-                        status.set("-1");
-                    }
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备内容"))) {
+                    status.set("-1");
                 }
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0333.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,13 @@ public class PRE0333 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("可能意外和防范措施"))) {
-                        status.set("-1");
-                    }
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("可能意外和防范措施"))) {
+                    status.set("-1");
                 }
             }
+
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0334.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,13 @@ public class PRE0334 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前术后注意事项"))) {
-                        status.set("-1");
-                    }
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前术后注意事项"))) {
+                    status.set("-1");
                 }
             }
+
         }
     }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0335.java

@@ -4,7 +4,6 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -25,16 +24,13 @@ public class PRE0335 extends QCCatalogue {
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isEmpty(operationDocs)) {
-                status.set("-1");
-            } else {
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主刀医师签名"))) {
-                        status.set("-1");
-                    }
+            for (OperationDoc operationDoc : operationDocs) {
+                if (operationDoc.getPreoperativeDiscussionDoc() == null
+                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主刀医师签名"))) {
+                    status.set("-1");
                 }
             }
+
         }
     }