北仑：术前小结除去无用数据

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

@@ -246,10 +246,14 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
                 structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
             }
         }
+        List<String> titles = Lists.newArrayList("手术指征", "注意事项", "术前诊断","医生签名", "手术指征与禁忌征", "可替代方案", "术前准备");
         if (structureMap.containsKey("简要病情")) {
-            String value = structureMap.get("简要病情").replaceAll("医师姓名", "");
+            String value = structureMap.get("简要病情").replaceAll("医师姓名", "").replaceAll("简要病情描述", "");
             structureMap.put("简要病情", value);
         }
+        for (String title : titles) {
+            eliminateDate(structureMap, title);
+        }
         if (MapUtils.isNotEmpty(structureMap)) {
             PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(structureMap);
             preoperativeDiscussionDoc.setPageData((Map) structureMap);
@@ -259,6 +263,13 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         }
     }
 
+    private void eliminateDate(Map<String, String> structureMap, String text) {
+        if (structureMap.containsKey(text)) {
+            String value = structureMap.get(text).replaceAll(text, "");
+            structureMap.put(text, value);
+        }
+    }
+
     private List<String> preoperativeDiscussion_keyContrasts = Lists.newArrayList(
             "1.术前诊断=术前诊断",
             "2.手术指征与禁忌征=手术指征与禁忌",
@@ -278,7 +289,8 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             //"拟施手术方式（名称）及可能的变更方案=拟施手术方式、名称及可能的变更与禁忌症",
             //"术前特殊准备=术前准备",
             //"手术指征与禁忌征=手术指征与禁忌",
-            "经治医生签字时间=记录时间"
+            "经治医生签字时间=记录时间",
+            "签字时间=记录时间"
     );
 
     /**********************************************手术知情同意书****************************************************/

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

@@ -53,7 +53,8 @@ public class BeiLunPreoperativeHtmlAnalysis implements BeiLunHtmlAnalysis {
                     + text.substring(index1, index2).replace("签字时间", "经治医生签字时间").replace("年月日时分", "")
                     + text.substring(index2).replace("签字时间", "主刀医生签字时间").replace("年月日时分", "");
         }
-        text = text.replace("术前讨论及术前小结", "").replace("讨论结论：", "");
+        text = text.replace("术前讨论及术前小结", "").replace("讨论结论：", "").replace("年月日时\n" +
+                "分", "");
         List<String> titles = Lists.newArrayList("姓名", "性别", "出生日期", "出生年月", "科别", "科室", "病区", "床号", "床位", "住院号",
                 "讨论时间", "讨论方式", "参加人员", "简要病情", "具体讨论意见",
                 "1.术前诊断", "2.手术指征与禁忌征", "3.可替代方案", "4.拟施手术方式（名称）及可能的变更方案", "5.计划性多次手术",