死亡病例讨论

kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathcasediscuss/DEAC0557.java

@@ -19,10 +19,12 @@ public class DEAC0557 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getDeathRecordDoc() != null && inputInfo.getDeathRecordDoc().getStructureMap() != null) {
-            Map<String, String> deathRecordStructureMap = inputInfo.getDeathCaseDiscussDoc().getStructureMap();
-            String deathTime = deathRecordStructureMap.get("讨论内容");
-            if (!CatalogueUtil.isEmpty(deathTime)) {
-                status.set("-1");
+            if(inputInfo.getDeathCaseDiscussDoc() != null){
+                Map<String, String> deathRecordStructureMap = inputInfo.getDeathCaseDiscussDoc().getStructureMap();
+                String deathTime = deathRecordStructureMap.get("讨论内容");
+                if (CatalogueUtil.isEmpty(deathTime)) {
+                    status.set("-1");
+                }
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0322.java

@@ -27,12 +27,17 @@ public class OPE0322 extends QCCatalogue {
             return;
         }
         long cou = inputInfo.getOperationDocs().stream().map(i -> i.getOperationRecordDoc()).filter(i -> i != null).count();
-        for (DoctorAdviceDoc dad:doctorAdviceDocs) {
+        long od_count = inputInfo.getOperationDocs().stream().map(i -> i.getOperationDiscussionDoc()).filter(i -> i != null).count();
+        if(od_count > 0 && cou == 0){
+            status.set("-1");
+            return;
+        }
+        /*for (DoctorAdviceDoc dad:doctorAdviceDocs) {
             String name = dad.getStructureMap().get("医嘱项目名称");
             if(name.contains("手术") && cou == 0){
                 status.set("-1");
             }
-        }
+        }*/
         /*long cou = inputInfo.getOperationDocs().stream().map(i -> i.getOperationRecordDoc()).filter(i -> i != null).count();
         if (cou == 0) {
             status.set("-1");