Explorar o código

主诉中的症状在现病史中未找到 规则更新

kongwz %!s(int64=5) %!d(string=hai) anos
pai
achega
fde0fb3de1
Modificáronse 37 ficheiros con 251 adicións e 130 borrados
  1. 20 17
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0323.java
  2. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0350.java
  3. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0351.java
  4. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0352.java
  5. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0353.java
  6. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0355.java
  7. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0356.java
  8. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0357.java
  9. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0358.java
  10. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0359.java
  11. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0575.java
  12. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0578.java
  13. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0579.java
  14. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0580.java
  15. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0581.java
  16. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0628.java
  17. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0629.java
  18. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0630.java
  19. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0631.java
  20. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0632.java
  21. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0634.java
  22. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0635.java
  23. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0636.java
  24. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0637.java
  25. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0638.java
  26. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0639.java
  27. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0640.java
  28. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0641.java
  29. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0643.java
  30. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0644.java
  31. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0645.java
  32. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0646.java
  33. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0647.java
  34. 7 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0648.java
  35. 8 6
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0649.java
  36. 19 15
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0650.java
  37. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0652.java

+ 20 - 17
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0323.java

@@ -29,29 +29,32 @@ public class OPE0323 extends QCCatalogue {
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (ListUtil.isNotEmpty(operationDocs)) {
-                long count = operationDocs.stream().filter(operationDoc -> {
-                    boolean flag = false;
-                    if (operationDoc.getOperationRecordDoc() != null) {
-                        String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
-                        String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("助手I");
-                        String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
-                        if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
-                            String operator = surgeon + ", " + assist1;
-                            if (!operator.contains(signature)) {
-                                flag = true;
+            if(operationDocs != null && operationDocs.size()>0){
+                if (ListUtil.isNotEmpty(operationDocs)) {
+                    long count = operationDocs.stream().filter(operationDoc -> {
+                        boolean flag = false;
+                        if (operationDoc.getOperationRecordDoc() != null) {
+                            String surgeon = operationDoc.getOperationRecordDoc().getStructureMap().get("手术医师");
+                            String assist1 = operationDoc.getOperationRecordDoc().getStructureMap().get("助手I");
+                            String signature = operationDoc.getOperationRecordDoc().getStructureMap().get("主刀医师签名");
+                            if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
+                                String operator = surgeon + ", " + assist1;
+                                if (!operator.contains(signature)) {
+                                    flag = true;
+                                }
                             }
                         }
+                        return flag;
+                    }).count();
+                    if (count > 0) {
+                        status.set("-1");
                     }
-                    return flag;
-                }).count();
-                if (count > 0) {
-                    status.set("-1");
                 }
             }
-        }
+
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0350.java

@@ -26,9 +26,13 @@ public class OPE0350 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+            if(operationDocs == null || operationDocs.size() == 0){
+                status.set("0");
+                return;
+            }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -45,6 +49,6 @@ public class OPE0350 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0351.java

@@ -25,9 +25,13 @@ public class OPE0351 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -42,7 +46,7 @@ public class OPE0351 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0352.java

@@ -26,9 +26,13 @@ public class OPE0352 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -44,7 +48,7 @@ public class OPE0352 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0353.java

@@ -28,9 +28,13 @@ public class OPE0353 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isEmpty(operationDocs)) {
                 return;
             }
@@ -55,6 +59,6 @@ public class OPE0353 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0355.java

@@ -28,9 +28,13 @@ public class OPE0355 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -45,6 +49,6 @@ public class OPE0355 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0356.java

@@ -28,9 +28,13 @@ public class OPE0356 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -45,6 +49,6 @@ public class OPE0356 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0357.java

@@ -28,9 +28,13 @@ public class OPE0357 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -44,7 +48,7 @@ public class OPE0357 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0358.java

@@ -28,9 +28,13 @@ public class OPE0358 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -44,7 +48,7 @@ public class OPE0358 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0359.java

@@ -28,9 +28,13 @@ public class OPE0359 extends QCCatalogue {
         //            return;
         //        }
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -45,6 +49,6 @@ public class OPE0359 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0575.java

@@ -24,7 +24,7 @@ public class OPE0575 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(ListUtil.isNotEmpty(operationDocs)){
+        if(operationDocs!= null && operationDocs.size()>0){
             pre:
             for (OperationDoc od:operationDocs) {
                 PreoperativeDiscussionDoc preoperativeDiscussionDoc = od.getPreoperativeDiscussionDoc();

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0578.java

@@ -23,7 +23,7 @@ public class OPE0578 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(ListUtil.isNotEmpty(operationDocs)){
+        if(operationDocs!= null && operationDocs.size()>0){
             pre:
             for (OperationDoc od:operationDocs) {
                 PreoperativeDiscussionDoc preoperativeDiscussionDoc = od.getPreoperativeDiscussionDoc();

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0579.java

@@ -23,7 +23,7 @@ public class OPE0579 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(ListUtil.isNotEmpty(operationDocs)){
+        if(operationDocs!= null && operationDocs.size()>0){
             pre:
             for (OperationDoc od:operationDocs) {
                 PreoperativeDiscussionDoc preoperativeDiscussionDoc = od.getPreoperativeDiscussionDoc();

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0580.java

@@ -23,7 +23,7 @@ public class OPE0580 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(ListUtil.isNotEmpty(operationDocs)){
+        if(operationDocs!= null && operationDocs.size()>0){
             pre:
             for (OperationDoc od:operationDocs) {
                 PreoperativeDiscussionDoc preoperativeDiscussionDoc = od.getPreoperativeDiscussionDoc();

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0581.java

@@ -23,7 +23,7 @@ public class OPE0581 extends QCCatalogue {
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(ListUtil.isNotEmpty(operationDocs)){
+        if(operationDocs!= null && operationDocs.size()>0){
             pre:
             for (OperationDoc od:operationDocs) {
                 PreoperativeDiscussionDoc preoperativeDiscussionDoc = od.getPreoperativeDiscussionDoc();

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0628.java

@@ -22,9 +22,13 @@ public class OPE0628 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -39,6 +43,6 @@ public class OPE0628 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0629.java

@@ -22,9 +22,13 @@ public class OPE0629 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0629 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0630.java

@@ -25,9 +25,13 @@ public class OPE0630 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 for (OperationDoc operationDoc : operationDocs) {
                     String operationStartDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术开始时间");
@@ -41,7 +45,7 @@ public class OPE0630 extends QCCatalogue {
                         return;
                     }
                 }
-            }
+//            }
         }
     }
 

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0631.java

@@ -25,9 +25,13 @@ public class OPE0631 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 for (OperationDoc operationDoc : operationDocs) {
                     String operationEndDateStr = operationDoc.getOperationRecordDoc().getStructureMap().get("手术结束时间");
@@ -42,7 +46,7 @@ public class OPE0631 extends QCCatalogue {
                     }
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0632.java

@@ -22,9 +22,13 @@ public class OPE0632 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0632 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0634.java

@@ -22,9 +22,13 @@ public class OPE0634 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0634 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0635.java

@@ -22,9 +22,13 @@ public class OPE0635 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -39,6 +43,6 @@ public class OPE0635 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0636.java

@@ -22,9 +22,13 @@ public class OPE0636 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -39,6 +43,6 @@ public class OPE0636 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0637.java

@@ -22,9 +22,13 @@ public class OPE0637 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -40,6 +44,6 @@ public class OPE0637 extends QCCatalogue {
                 }
             }
         }
-    }
+//    }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0638.java

@@ -22,9 +22,13 @@ public class OPE0638 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0638 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0639.java

@@ -22,9 +22,13 @@ public class OPE0639 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0639 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0640.java

@@ -22,9 +22,13 @@ public class OPE0640 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -37,7 +41,7 @@ public class OPE0640 extends QCCatalogue {
                 if (count > 0) {
                     status.set("-1");
                 }
-            }
+//            }
         }
     }
 

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0641.java

@@ -22,9 +22,13 @@ public class OPE0641 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0641 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0643.java

@@ -22,9 +22,13 @@ public class OPE0643 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0643 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0644.java

@@ -22,9 +22,13 @@ public class OPE0644 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0644 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0645.java

@@ -23,9 +23,13 @@ import java.util.Map;
 public class OPE0645 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (operationDocs.size() == 0) {
                 return;
             }
@@ -45,6 +49,6 @@ public class OPE0645 extends QCCatalogue {
                     return;
                 }
             }
-        }
+//        }
     }
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0646.java

@@ -22,9 +22,13 @@ public class OPE0646 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -38,7 +42,7 @@ public class OPE0646 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0647.java

@@ -22,9 +22,13 @@ import java.util.Map;
 public class OPE0647 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (operationDocs.size() == 0) {
                 return;
             }
@@ -47,6 +51,6 @@ public class OPE0647 extends QCCatalogue {
                     return;
                 }
             }
-        }
+//        }
     }
 }

+ 7 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0648.java

@@ -22,9 +22,13 @@ public class OPE0648 extends QCCatalogue {
     @Override
     protected void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
             if (ListUtil.isNotEmpty(operationDocs)) {
                 long count = operationDocs.stream().filter(operationDoc -> {
                     boolean flag = false;
@@ -46,7 +50,7 @@ public class OPE0648 extends QCCatalogue {
                     status.set("-1");
                 }
             }
-        }
+//        }
     }
 
 }

+ 8 - 6
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0649.java

@@ -22,12 +22,14 @@ import java.util.Map;
 public class OPE0649 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (operationDocs.size() == 0) {
-                return;
-            }
+        if(operationDocs == null || operationDocs.size() == 0){
+            status.set("0");
+            return;
+        }
+
             for (OperationDoc operationDoc : operationDocs) {
                 OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
                 if (operationDiscussionDoc == null) {
@@ -39,6 +41,6 @@ public class OPE0649 extends QCCatalogue {
                     return;
                 }
             }
-        }
+//        }
     }
 }

+ 19 - 15
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0650.java

@@ -21,23 +21,27 @@ import java.util.Map;
 public class OPE0650 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
-        boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
-            List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (operationDocs.size() == 0) {
-                return;
+//        boolean isOperativePatient = true;//是手术患者(暂时默认是)
+//        if (isOperativePatient) {
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        if (operationDocs == null || operationDocs.size() == 0) {
+            status.set("0");
+            return;
+        }
+        if (operationDocs.size() == 0) {
+            return;
+        }
+        for (OperationDoc operationDoc : operationDocs) {
+            OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
+            if (operationDiscussionDoc == null) {
+                continue;
             }
-            for (OperationDoc operationDoc : operationDocs) {
-                OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
-                if (operationDiscussionDoc == null) {
-                    continue;
-                }
-                Map<String, String> operationDiscussionStructureMap = operationDiscussionDoc.getStructureMap();
-                if (CatalogueUtil.isEmpty(operationDiscussionStructureMap.get("手术方式"))) {
-                    status.set("-1");
-                    return;
-                }
+            Map<String, String> operationDiscussionStructureMap = operationDiscussionDoc.getStructureMap();
+            if (CatalogueUtil.isEmpty(operationDiscussionStructureMap.get("手术方式"))) {
+                status.set("-1");
+                return;
             }
         }
+//        }
     }
 }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0652.java

@@ -22,9 +22,9 @@ public class OPE0652 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
-        if (isOperativePatient) {
+//        if (isOperativePatient) {
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-            if (operationDocs.size() == 0) {
+            if (operationDocs.size() == 0 || operationDocs == null) {
                 return;
             }
             for (OperationDoc operationDoc : operationDocs) {
@@ -38,6 +38,6 @@ public class OPE0652 extends QCCatalogue {
                     return;
                 }
             }
-        }
+//        }
     }
 }