解析问题调整

trans/src/main/java/com/lantone/qc/trans/xszyy/BeiLunLeaveHospitalDocTrans.java

@@ -66,7 +66,7 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "入院时间=入院日期",
             "医师签名=记录医生",
-            "日期=医师签名日期"
+            "日期=医师签名日期","诊治经过=诊疗经过"
     );
 
 }

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

@@ -254,7 +254,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         } else {
             String recTitle = contentMap.get("recTitle").toString();
             String recTypeId = contentMap.get("recTypeId").toString();
-            BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunPreoperativeHtmlAnalysis();
+            BeiLunPreoperativeHtmlAnalysis beiLunHtmlAnalysis = new BeiLunPreoperativeHtmlAnalysis();
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             if (MapUtils.isNotEmpty(sourceMap)) {
                 structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
@@ -262,7 +262,8 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
                 structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
             }
         }
-        List<String> titles = Lists.newArrayList("讨论时间", "手术指征", "注意事项", "术前诊断", "医生签名", "风险及防范措施", "可替代方案", "术前准备", "参加人员");
+        List<String> titles = Lists.newArrayList("讨论时间", "手术指征", "注意事项", "术前诊断", "医生签名", "风险及防范措施",
+                "可替代方案", "术前准备", "参加人员");
         if (structureMap.containsKey("简要病情")) {
             String value = structureMap.get("简要病情").replaceAll("医师姓名", "").replaceAll("简要病情描述", "");
             structureMap.put("简要病情", value);

trans/src/main/java/com/lantone/qc/trans/xszyy/util/BeiLunBeHospitalizedHtmlAnalysis.java

@@ -69,6 +69,14 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
             map.put("书写时间",XszyyCommonAnalysisUtil.extractDate(map.get("医师签名")));
             map.put("书写医生",map.get("医师签名").substring(0,map.get("医师签名").indexOf(map.get("书写时间"))));
         }
+        /**
+         *姓名后面的内容截取
+         */
+        if(map.get("姓名").length()>3){
+            map.put("家长姓名",map.get("姓名").substring(map.get("姓名").indexOf("家"),map.get("姓名").indexOf(map.get("姓名").charAt(map.get("姓名").length() - 1))+1));
+            map.put("姓名",map.get("姓名").substring(0,map.get("姓名").indexOf(map.get("家长姓名"))));
+        }
+
         if(map.containsKey("书写医师")&&XszyyCommonAnalysisUtil.extractDate(map.get("书写医师"))!=null){
             map.put("书写时间",XszyyCommonAnalysisUtil.extractDate(map.get("书写医师")));
             map.put("书写医生",map.get("书写医师").substring(0,map.get("书写医师").indexOf(map.get("书写时间"))));

trans/src/main/java/com/lantone/qc/trans/xszyy/util/BeiLunLeaveHospitalHtmlAnalysis.java

@@ -32,7 +32,7 @@ public class BeiLunLeaveHospitalHtmlAnalysis implements BeiLunHtmlAnalysis {
             Document doc = Jsoup.parse(html);
 
             List<String> titles = Lists.newArrayList("姓名","病区","床号","住院号","出 院 记 录",
-                    "入院时间","出院时间","住院天数","入院情况","入院诊断","诊治经过","出院情况","出院诊断","出院医嘱",
+                    "入院时间","出院时间","住院天数","入院情况","入院诊断","诊疗经过","诊治经过","出院情况","出院诊断","出院医嘱",
                     "患者或其授权人签字","医师签名","日期","出院温馨提示"
             );
             String htmlContent = XszyyCommonAnalysisUtil.html2String(doc.toString());

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

@@ -31,9 +31,9 @@ public class BeiLunPreoperativeHtmlAnalysis implements BeiLunHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            List<String> titles = Lists.newArrayList("简要病情","术前诊断","手术指征","拟施手术名称和方式","拟施麻醉方式",
+            List<String> titles = Lists.newArrayList("简要病情","术前诊断","拟施手术名称和方式","拟施麻醉方式",
                     "注意事项","术者术前查房情况","书写医师","医师签名",
-                    "术前准备","麻醉方式","手术人员","手术方式",
+                    "麻醉方式","手术人员","手术方式",
                     "入院日期","入院时间","讨论日期","讨论时间","讨论地点","主 持 人","参加人员姓名及专业技术职称","参加人员","报告病史", "讨论记录","讨论意见内容记录","记录者签名","记录者",
                     "主持人签名","（4）可能出现的意外及防范措施","（3）手术方案","（2）术前准备","（1）手术指征","主持人小结意见","主持人小结"
             );