手术及死亡规则更新

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

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 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 org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -19,6 +20,7 @@ import java.util.Map;
 public class DEAC0108 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> FirstPageStructure = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String outWay = FirstPageStructure.get(Content.outWay);
@@ -26,8 +28,9 @@ public class DEAC0108 extends QCCatalogue {
             if (CatalogueUtil.isEmpty(outWay) || !outWay.contains("死亡")) {
                 return;
             }
-            if ((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
-            && outWay.contains("死亡")){
+            if (((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
+            && outWay.contains("死亡")) || ((inputInfo.getDeathCaseDiscussDoc() == null || inputInfo.getDeathCaseDiscussDoc().getStructureMap().size() == 0)
+            && deathRecordDoc != null)){
                 status.set("-1");
             }
         }

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

@@ -0,0 +1,54 @@
+package com.lantone.qc.kernel.catalogue.operationdiscussion;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+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.operation.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : OPE0326
+ * @Description : 无术后首程
+ * @Author : kwz
+ * @Date: 2020-05-30 17:07
+ */
+@Component
+public class OPE0326 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        //先判断有无手术记录
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        long count_oper =0;
+        long count_discuss =0;
+        if(operationDocs != null && operationDocs.size()>0){
+            count_oper = operationDocs.stream().map(i -> i.getOperationRecordDoc()).filter(i -> i != null).count();
+
+            count_discuss = operationDocs.stream().map(i -> i.getOperationDiscussionDoc()).filter(i -> i != null).count();
+            if(count_oper>0 && count_discuss ==0){
+                status.set("-1");
+            }
+        }
+            /*List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+            if (operationDocs.size() == 0 || operationDocs == null) {
+                return;
+            }
+            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;
+                }
+            }*/
+
+
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.lantone.qc.kernel.catalogue.operationdiscussion;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.operation.OperationDoc;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName : OPE0348
+ * @Description : 无手术知情同意书
+ * @Author : kwz
+ * @Date: 2020-05-30 17:07
+ */
+@Component
+public class OPE0348 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        //先判断有无手术记录
+        List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+        long count_oper =0;
+        long count_info =0;
+        if(operationDocs != null && operationDocs.size()>0){
+            count_oper = operationDocs.stream().map(i -> i.getOperationRecordDoc()).filter(i -> i != null).count();
+
+            count_info = operationDocs.stream().map(i -> i.getOperationInformedConsentDoc()).filter(i -> i != null).count();
+            if(count_oper>0 && count_info ==0){
+                status.set("-1");
+            }
+        }
+            /*List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+            if (operationDocs.size() == 0 || operationDocs == null) {
+                return;
+            }
+            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;
+                }
+            }*/
+
+
+    }
+}

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfDeathCaseDiscussDocTrans.java

@@ -37,7 +37,7 @@ public class ShaoyfDeathCaseDiscussDocTrans extends ModelDocTrans {
             "主持人=讨论主持人",
             "死亡日期=死亡时间",
             "讨论意见=讨论内容",
-            "事件日期=讨论日期",
+            "事件日期=记录时间",
             "现病史- 发病情况=入院情况",
             "医生=记录医师",
             "本人姓名=姓名"