死亡记录规则更新

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

@@ -22,6 +22,7 @@ import java.util.Map;
 public class DEAC0097 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        String outWay = inputInfo.getFirstPageRecordDoc().getStructureMap().get(Content.outWay);
         List<String> deathRecords = new ArrayList<>();
         List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
         if (doctorAdviceDocs.size() == 0 ) {
@@ -32,7 +33,7 @@ public class DEAC0097 extends QCCatalogue {
                 deathRecords.add(dad.getStructureMap().get("医嘱项目名称"));
             }
         }
-        if(deathRecords != null && deathRecords.size()>0 && inputInfo.getDeathRecordDoc() == null){
+        if((deathRecords.size()>0 || outWay.contains("死亡")) && inputInfo.getDeathRecordDoc() == null){
             status.set("-1");
         }
         /*if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {

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

@@ -6,8 +6,10 @@ import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
+import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,11 +30,19 @@ public class DEAC0108 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(outWay) || !outWay.contains("死亡")) {
                 return;
             }
-            if (((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
+            List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
+            if (doctorAdviceDocs.size() == 0 ) {
+                return;
+            }
+            long count = doctorAdviceDocs.stream().filter(x -> x.getStructureMap().get("医嘱项目名称").contains("死亡")).count();
+            if((count>0 || outWay.contains("死亡")) && (inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)){
+                status.set("-1");
+            }
+            /*if (((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
             && outWay.contains("死亡")) || ((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
             && deathRecordDoc != null)){
                 status.set("-1");
-            }
+            }*/
         }
     }
 }