禅道修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0409.java

@@ -27,8 +27,12 @@ public class BEH0409 extends QCCatalogue {
             String name = structureMap.get("关系");
             String historyPresenter = structureMap.get("病史陈述者");
             String historyreporter = structureMap.get("病史提供人");
+            String infoSources = structureMap.get("信息来源");
 
-            if(CatalogueUtil.isEmpty(name) && CatalogueUtil.isEmpty(historyPresenter) && CatalogueUtil.isEmpty(historyreporter)){
+            if(CatalogueUtil.isEmpty(name)
+                    && CatalogueUtil.isEmpty(historyPresenter)
+                    && CatalogueUtil.isEmpty(historyreporter)
+                    && CatalogueUtil.isEmpty(infoSources)){
                 status.set("-1");
             }
         }

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

@@ -1,17 +1,13 @@
 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.OperationDoc;
-import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
-import com.lantone.qc.pub.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 手术患者缺术前讨论或术前小结
@@ -31,26 +27,24 @@ public class OPE0370 extends QCCatalogue {
         //        boolean isOperativePatient = CatalogueUtil.isOperativePatients(doctorAdviceDocs);
         boolean isOperativePatient = true;//是手术患者(暂时默认是)
         List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
-        if(operationDocs == null || operationDocs.size() < 1){
+        if (operationDocs == null || operationDocs.size() < 1) {
             return;
         }
-        if ( operationDocs.size()>0) {
-
-            for (OperationDoc operationDoc : operationDocs) {
-                OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
-                if (operationRecordDoc == null) {
-                    continue;
-                }
-                Map<String, String> operationRecordStructureMap = operationRecordDoc.getStructureMap();
-                String preoperativeDiscussion = operationRecordStructureMap.get("术前讨论");
-                if (CatalogueUtil.isEmpty(preoperativeDiscussion)) {
-                    status.set("-1");
-                    return;
-                }
+        for (OperationDoc operationDoc : operationDocs) {
+            if (operationDoc.getPreoperativeDiscussionDoc() == null) {
+                status.set("-1");
+                return;
             }
-
-
         }
+        //            OperationRecordDoc operationRecordDoc = operationDoc.getOperationRecordDoc();
+        //            if (operationRecordDoc == null) {
+        //                continue;
+        //            }
+        //            Map<String, String> operationRecordStructureMap = operationRecordDoc.getStructureMap();
+        //            String preoperativeDiscussion = operationRecordStructureMap.get("术前讨论");
+        //            if (CatalogueUtil.isEmpty(preoperativeDiscussion)) {
+        //                status.set("-1");
+        //                return;
+        //            }
     }
-
 }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouOperationDocTrans.java

@@ -189,7 +189,7 @@ public class TaiZhouOperationDocTrans extends ModelDocTrans {
             "麻醉方式=麻醉方式",
             "术前准备=术前准备内容",
             "注意事项=术前术后注意事项",
-            "治疗计划和措施=可能意外和防范措施",
+            "术中、术后防范措施=可能意外和防范措施",
             "拟施手术名称和方式=拟行术式"
     );