义乌术前讨论、小结映射修改

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

@@ -30,8 +30,8 @@ public class THR0136 extends QCCatalogue {
         if (firstCourseRecordDoc != null) {
             Map<String, String> structureMap = firstCourseRecordDoc.getStructureMap();
             String diffDiag = structureMap.get("鉴别诊断");
-            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") || diffDiag.contains("无需鉴别") ||
-                    diffDiag.contains("诊断基本明确") || diffDiag.contains("故可鉴别")|| diffDiag.contains("不能排除"))) {
+            if (StringUtil.isNotBlank(diffDiag) && (diffDiag.contains("诊断明确") ||
+                    diffDiag.contains("诊断基本明确") || diffDiag.contains("鉴别")|| diffDiag.contains("不能排除"))) {
                 status.set("0");
                 return;
             }

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

@@ -285,8 +285,8 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
                     "术前特殊准备", "心理状态", "经济评估", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
                     "一：经治医师汇报病史", "二：讨论目的", "三：讨论");
             String text = sourceMap.get("原始文本").replaceAll("[0-9:.]", "");
-            List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
-            CommonAnalysisUtil.cutByTitles(text, sortTitles, 0, sourceMap);
+            List<String> sortTitles = CommonAnalysisUtil.sortTitlesNoColon(titles, text);
+            CommonAnalysisUtil.cutByTitlesNoColon(text, sortTitles, 0, sourceMap);
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts, modeId);
@@ -349,7 +349,9 @@ public class YiWuOperationDocTrans extends ModelDocTrans {
             "手术名称=拟施手术方式名称及可能的变更与禁忌症",
             "病历内容=历史摘要",
             "麻醉方式=拟施麻醉方式",
-            "拟施手术名称和方式及可能的变更=拟施手术方式名称及可能的变更与禁忌症"
+            "拟施手术名称和方式及可能的变更=拟施手术方式名称及可能的变更与禁忌症",
+            "历史摘要=术前准备",
+            "手术要点=主要术中、术后风险及防范措施"
     );
 
     /**********************************************手术知情同意书****************************************************/