北仑术前小结解析html修改

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -238,10 +238,19 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
-            "术中、术后注意事项（含护理事项）=术后注意事项",
-            "拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
-            "术前特殊准备=术前准备",
-            "手术指征与禁忌征=手术指征与禁忌",
+            "1.术前诊断=术前诊断",
+            "2.手术指征与禁忌征=手术指征与禁忌",
+            "3.可替代方案=可替代的方案",
+            "4.拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
+            "5.计划性多次手术=计划性多次手术",
+            "6.拟施麻醉方式=拟施麻醉方式",
+            "7.术前特殊准备=术前准备",
+            "8.主要术中、术后风险及防范措施=风险及防范措施",
+            "9.术中、术后注意事项（含护理事项）=术中术后注意事项",
+            //"术中、术后注意事项（含护理事项）=术后注意事项",
+            //"拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
+            //"术前特殊准备=术前准备",
+            //"手术指征与禁忌征=手术指征与禁忌",
             "经治医生签字时间=记录时间"
     );
 

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunPreoperativeHtmlAnalysis.java

@@ -38,9 +38,9 @@ public class BeiLunPreoperativeHtmlAnalysis implements BeiLunHtmlAnalysis {
     }
 
     private void analysisGeneral(Element bigDivElement, Map<String, String> map) {
-        if (bigDivElement.selectFirst("hr") != null) {
+        /*if (bigDivElement.selectFirst("hr") != null) {
             bigDivElement.selectFirst("hr").previousElementSiblings().remove();
-        }
+        }*/
         String text = BeiLunHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
 
         int index1 = text.lastIndexOf("经治医生签名");
@@ -49,13 +49,14 @@ public class BeiLunPreoperativeHtmlAnalysis implements BeiLunHtmlAnalysis {
                 .replace("等）", "").replace("（如腹腔镜可能改开腹等）", "")
                 + text.substring(index1, index2).replace("签字时间", "经治医生签字时间").replace("年月日时分", "")
                 + text.substring(index2).replace("签字时间", "主刀医生签字时间").replace("年月日时分", "");
-
-        List<String> titles = Lists.newArrayList("讨论时间", "讨论方式", "参加人员", "简要病情", "具体讨论意见",
-                "术前诊断", "手术指征与禁忌征", "可替代方案", "拟施手术方式（名称）及可能的变更方案", "计划性多次手术",
-                "拟施麻醉方式", "术前特殊准备", "主要术中、术后风险及防范措施", "术中、术后注意事项（含护理事项）",
+        text = text.replace("术前讨论及术前小结", "").replace("讨论结论：", "");
+        List<String> titles = Lists.newArrayList("姓名", "出生年月", "科室", "床位", "住院号",
+                "讨论时间", "讨论方式", "参加人员", "简要病情", "具体讨论意见",
+                "1.术前诊断", "2.手术指征与禁忌征", "3.可替代方案", "4.拟施手术方式（名称）及可能的变更方案", "5.计划性多次手术",
+                "6.拟施麻醉方式", "7.术前特殊准备", "8.主要术中、术后风险及防范措施", "9.术中、术后注意事项（含护理事项）",
                 "经治医生签名", "经治医生签字时间", "主刀医生签名", "主刀医生签字时间");
-        CommonAnalysisUtil.cutByTitlesNoColon(text, titles, 0, map);
-        CommonAnalysisUtil.processType(map, "计划性多次手术");
+        CommonAnalysisUtil.cutByTitles(text, titles, 0, map);
+        CommonAnalysisUtil.processType(map, "5.计划性多次手术");
         CommonAnalysisUtil.processType(map, "讨论方式");
     }