Merge branch 'debug' of http://192.168.2.236:10080/louhr/qc into debug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON0526.java

@@ -6,10 +6,10 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationApplicationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -22,29 +22,30 @@ import java.util.Map;
  */
 @Component
 public class CON0526 extends QCCatalogue {
-    public static String FORMAT_LONC_CN_MI = "yyyy/MM/dd HH:mm";
-    public void start(InputInfo inputInfo, OutputInfo outputInfo)throws ParseException {
-
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
         List<ConsultationDoc> consultationDocs = inputInfo.getConsultationDocs();
-        if(consultationDocs.size()>0){
-            for (ConsultationDoc consulation:consultationDocs) {
+        if (consultationDocs.size() > 0) {
+            for (ConsultationDoc consulation : consultationDocs) {
                 ConsultationApplicationDoc consultationApplicationDoc = consulation.getConsultationApplicationDoc();
                 ConsultationResultsDoc consultationResultsDoc = consulation.getConsultationResultsDoc();
                 Map<String, String> applicationMap = consultationApplicationDoc.getStructureMap();
                 Map<String, String> resultMap = consultationResultsDoc.getStructureMap();
-                if(applicationMap != null && resultMap != null){
+                if (applicationMap != null && resultMap != null) {
                     String applicationDate = applicationMap.get("申请日期");
                     String resultDate = resultMap.get("会诊到达时间");
-                    if(applicationDate != null && resultDate != null){
-                        Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(applicationDate);
-                        Date date_out = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(resultDate);
+                    if (applicationDate != null && resultDate != null) {
+                        Date date_in = StringUtil.parseDateTime(applicationDate);
+                        Date date_out = StringUtil.parseDateTime(resultDate);
+                        if (date_in == null || date_out == null) {
+                            return;
+                        }
                         long times = date_out.getTime() - date_in.getTime();
                         long day = times / (24 * 60 * 60 * 1000);
                         long hour = (times / (60 * 60 * 1000) - day * 24);
                         long min = ((times / (60 * 1000)) - day * 24 * 60 - hour * 60);
                         long min1 = ((times / (60 * 1000)) - day * 24 * 60 - hour * 60);
-                        if (min1>10) {
+                        if (min1 > 10) {
                             status.set("-1");
                         }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/crisisvaluereport/CRI0382.java

@@ -5,6 +5,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.CrisisValueReportDoc;
 import com.lantone.qc.pub.util.DateUtil;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -22,6 +23,9 @@ public class CRI0382 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         List<CrisisValueReportDoc> crisisValueReportDocs = inputInfo.getCrisisValueReportDocs();
+        if (ListUtil.isEmpty(crisisValueReportDocs)) {
+            return;
+        }
         String format = "yyyy年MM月dd日HH时mm分";
         int timeCha = 21600000;
         crisisValueReportDocs.forEach(crisisValueReportDoc -> {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0561.java

@@ -5,10 +5,10 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.FirstPageRecordDoc;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 
@@ -20,7 +20,6 @@ import java.util.Map;
  */
 @Component
 public class DEAR0561 extends QCCatalogue {
-    public static String FORMAT_LONC_CN_MI = "yyyy/MM/dd HH:mm";
     public void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
         status.set("0");
         if (inputInfo.getDeathRecordDoc() != null && inputInfo.getDeathRecordDoc().getStructureMap() != null) {
@@ -28,14 +27,17 @@ public class DEAR0561 extends QCCatalogue {
             if (!CatalogueUtil.isEmpty(deathRecordStructureMap.get("死亡时间"))) {
                 String deathDate = deathRecordStructureMap.get("死亡时间");
                 FirstPageRecordDoc firstPageRecordDoc = inputInfo.getFirstPageRecordDoc();
-                if(firstPageRecordDoc != null && firstPageRecordDoc.getStructureMap() != null){
+                if (firstPageRecordDoc != null && firstPageRecordDoc.getStructureMap() != null) {
                     Map<String, String> firstPageMap = firstPageRecordDoc.getStructureMap();
                     String outDate = firstPageMap.get("出院时间");
-                    if(outDate != null && deathDate != null){
-                        Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(deathDate);
-                        Date date_out = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(outDate);
-                        int hours = (int) ((date_out.getTime() - date_in.getTime()) / (1000*3600));
-                        if(hours >24){
+                    if (outDate != null && deathDate != null) {
+                        Date date_in = StringUtil.parseDateTime(deathDate);
+                        Date date_out = StringUtil.parseDateTime(outDate);
+                        if (date_in == null || date_out == null) {
+                            return;
+                        }
+                        int hours = (int) ((date_out.getTime() - date_in.getTime()) / (1000 * 3600));
+                        if (hours > 24) {
                             status.set("-1");
                         }
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/dutyshiftsystem/DUT0296.java

@@ -20,9 +20,6 @@ import java.util.Map;
  */
 @Component
 public class DUT0296 extends QCCatalogue {
-    public static final String DATE_TIME_FORMAT_chanx = "yyyy-MM-dd HH:mm";
-    public static final String DATE_TIME_FORMAT_tz = "yyyy/MM/dd HH:mm:ss";
-
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
 

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");
                 }
             }
-        }
+
+//        }
     }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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();

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();

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();

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();

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();

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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;
                     }
                 }
-            }
+//            }
         }
     }
 

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 {
                     }
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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 {
                 }
             }
         }
-    }
+//    }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
-            }
+//            }
         }
     }
 

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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;
                 }
             }
-        }
+//        }
     }
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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;
                 }
             }
-        }
+//        }
     }
 }

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");
                 }
             }
-        }
+//        }
     }
 
 }

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;
                 }
             }
-        }
+//        }
     }
 }

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;
             }
         }
+//        }
     }
 }

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;
                 }
             }
-        }
+//        }
     }
 }