Browse Source

1、添加大模块非空判断,如果为空返回0

louhr 5 năm trước cách đây
mục cha
commit
68a0051b7e

+ 4 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/nursingsystem/NUR0293.java

@@ -21,6 +21,10 @@ import java.util.stream.Collectors;
 public class NUR0293 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
+        if (doctorAdviceDocs == null || doctorAdviceDocs.size() == 0) {
+            status.set("0");
+            return;
+        }
         List<DoctorAdviceDoc> filters = doctorAdviceDocs.stream().filter(doctorAdviceDoc ->
             StringUtils.isNotEmpty(doctorAdviceDoc.getStructureMap().get("医嘱项目名称"))
                     && doctorAdviceDoc.getStructureMap().get("医嘱项目名称").indexOf("护理") > -1

+ 7 - 19
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0328.java

@@ -21,26 +21,14 @@ public class PRE0328 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-       /* 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) {
-                        status.set("-1");
-                    }
-                }
-            }
-        }*/
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs != null && operationDocs.size()>0){
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null) {
-                    status.set("-1");
-                    break;
-                }
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() == null) {
+                status.set("-1");
+                break;
             }
         }
     }

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

@@ -22,17 +22,17 @@ public class PRE0329 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("手术指征"))) {
+                status.set("-1");
             }
-
         }
+
     }
 
 }

+ 8 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0330.java

@@ -21,16 +21,15 @@ public class PRE0330 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟行术式"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("拟行术式"))) {
+                status.set("-1");
             }
-
         }
     }
 

+ 9 - 10
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0331.java

@@ -21,16 +21,15 @@ public class PRE0331 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-                for (OperationDoc operationDoc : operationDocs) {
-                    if (operationDoc.getPreoperativeDiscussionDoc() == null
-                            || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("麻醉方式"))) {
-                        status.set("-1");
-                    }
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("麻醉方式"))) {
+                status.set("-1");
+            }
         }
     }
-
 }

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

@@ -21,14 +21,14 @@ public class PRE0332 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备内容"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前准备内容"))) {
+                status.set("-1");
             }
         }
     }

+ 8 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0333.java

@@ -21,16 +21,15 @@ public class PRE0333 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("可能意外和防范措施"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("可能意外和防范措施"))) {
+                status.set("-1");
             }
-
         }
     }
 

+ 8 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0334.java

@@ -21,16 +21,15 @@ public class PRE0334 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前术后注意事项"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术前术后注意事项"))) {
+                status.set("-1");
             }
-
         }
     }
 

+ 8 - 9
kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE0335.java

@@ -21,16 +21,15 @@ public class PRE0335 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            for (OperationDoc operationDoc : operationDocs) {
-                if (operationDoc.getPreoperativeDiscussionDoc() == null
-                        || StringUtil.isBlank(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主刀医师签名"))) {
-                    status.set("-1");
-                }
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size()== 0){
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() != null
+                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主刀医师签名"))) {
+                status.set("-1");
             }
-
         }
     }