义乌术前讨论记录字段映射和无术中术后注意点规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/preoperativediscussion/PRE0334.java

@@ -28,7 +28,8 @@ public class PRE0334 extends QCCatalogue {
         for (OperationDoc operationDoc : operationDocs) {
             if (operationDoc.getPreoperativeDiscussionDoc() != null
                     && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中、术后注意事项（含护理事项）"))
-                    && StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中术后注意事项含护理事项") )) {
+                    || StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("术中术后注意事项含护理事项") )
+                    || StringUtil.isEmpty(operationDoc.getPreoperativeDiscussionDoc().getStructureMap().get("主要术中、术后风险及防范措施") )) {
                 status.set("-1");
             }
         }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuOperationDocTrans.java

@@ -292,7 +292,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     , "拟施手术名称和方式及可能的变更", "可替代方案", "计划性多次手术",
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
                     "一：经治医师汇报病史", "二：讨论目的", "三：讨论","主持人的姓名及专业技术职务","参加讨论者的姓名及专业技术职务","记录医师签名",
-                    "手术预期","注意事项","防范措施");
+                    "手术预期","注意事项","防范措施","拟实施麻醉方式","手术时间","医师签名","会诊意见","患者术前情况");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -307,7 +307,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             }
             if(sourceMap.containsKey("术前准备情况")){
                 if(sourceMap.get("原始文本").split("术前准备情况").length>1){
-                    sourceMap.put("术前准备情况",sourceMap.get("原始文本").split("术前准备情况")[1].split("手术指征")[0]);
+                    sourceMap.put("术前准备情况",sourceMap.get("原始文本").split("术前准备情况")[1].split("手术指征")[0].split("拟实施麻醉方式")[0]);
                 }
             }
             if(sourceMap.containsKey("计划性多次手术")){
@@ -389,7 +389,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "病史摘要=简要病情",
             "医师签名=记录医生",
             "注意事项=术中术后注意事项含护理事项",
-            "防范措施=主要术中、术后风险及防范措施"
+            "防范措施=主要术中、术后风险及防范措施",
+            "医师签名时间=记录时间",
+            "医师签名=记录医生",
+            "会诊意见=讨论意见"
     );
 
     /**********************************************手术知情同意书****************************************************/