Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0131.java

@@ -57,7 +57,9 @@ public class THR0131 extends QCCatalogue {
         String conditionRecord = firstAttendStructureMap.get("病情记录");
         if (StringUtil.isNotBlank(conditionRecord)) {
             if (conditionRecord.contains("鉴别")
-                    || conditionRecord.contains("明确")) {
+                    || conditionRecord.contains("明确")
+                    || conditionRecord.contains("修正")
+                    || conditionRecord.contains("目前诊断")) {
                 status.set("0");
                 return;
             }

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

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.util.FastJsonUtils;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +38,7 @@ public class YiWuDifficultCaseDiscussDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
+            List<String> titles =Lists.newArrayList("记录人","主持人");
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
@@ -63,7 +65,8 @@ public class YiWuDifficultCaseDiscussDocTrans extends ModelDocTrans {
             "当前科室=科别",
             "主持人姓名=主持人姓名及专业技术职务",
             "参加讨论人员名单=参加人员的姓名及专业技术职务",
-            "讨论内容=具体讨论意见"
+            "讨论内容=具体讨论意见",
+            "讨论时间=讨论日期"
     );
 
 }

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

@@ -193,7 +193,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "麻醉医师", "手术护士", "巡回护士", "手术中用药（化疗等药物）", "手术切口类别（可选）", "术中出血量", "输血量", "术中输血量"
                     , "围术期并发症", "手术切除标本", "冰冻切片结果", "标本件数", "是否有植入物", "手术步骤", "记录者签名", "记录日期", "术中失血量",
                     "手术简要经过（包括“术中所见”）", "医师签名", "签名时间", "患者或代理人签名", "术中并发症", "日    期", "术前诊断", "术后诊断","手术经过",
-                    "手术适应症");
+                    "手术适应症","手术记录人员");
 
             String text = sourceMap.get("原始文本").replace(" ", "");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
@@ -249,7 +249,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "初步诊断=术前诊断",
             "手术经过=手术经过及处理",
             "助手=一助",
-            "手术前诊断=术前诊断"
+            "手术前诊断=术前诊断",
+            "手术记录人员=记录医生"
     );
 
 
@@ -289,7 +290,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "可能出现的意外及防范措施", "讨论日期时间", "参加人员", "讨论主持人", "小结", "记录医师", "手术指征与禁忌症"
                     , "拟施手术名称和方式及可能的变更", "可替代方案", "计划性多次手术",
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
-                    "一：经治医师汇报病史", "二：讨论目的", "三：讨论","主持人的姓名及专业技术职务","参加讨论者的姓名及专业技术职务","记录医师签名");
+                    "一：经治医师汇报病史", "二：讨论目的", "三：讨论","主持人的姓名及专业技术职务","参加讨论者的姓名及专业技术职务","记录医师签名",
+                    "手术预期","注意事项","防范措施");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
             CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
@@ -313,7 +315,7 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);
             //去除list中key对应的value中末尾的数字字符
             List<String> title = Lists.newArrayList("术前诊断","手术指征与禁忌","拟施手术方式名称及可能的变更与禁忌症",
-                    "可替代方案","计划性多次手术","主要术中、术后风险及防范措施","心理状态","经济评估");
+                    "可替代方案","计划性多次手术","主要术中、术后风险及防范措施","心理状态","经济评估","手术预期","注意事项","防范措施");
             for (String str:title) {
                 if(structureMap.containsKey(str)){
                     String orign=structureMap.get(str).replaceAll("\\a.","");
@@ -383,7 +385,10 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术要点=主要术中、术后风险及防范措施",
             "参加讨论者的姓名及专业技术职务=参加人员",
             "主持人的姓名及专业技术职务=讨论主持人",
-            "病史摘要=简要病情"
+            "病史摘要=简要病情",
+            "医师签名=记录医生",
+            "注意事项=术中术后注意事项含护理事项",
+            "防范措施=主要术中、术后风险及防范措施"
     );
 
     /**********************************************手术知情同意书****************************************************/