Merge remote-tracking branch 'origin/hb/beilun' into hb/beilun

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

@@ -74,7 +74,7 @@ public class BeiLunBeHospitalizedDocTrans extends ModelDocTrans {
             "体 格 检 查 表 ( 一 )=体格检查",
             "补充及专科检查=专科检查",
             "辅 助 检 查=辅助检查",
-            "入 院 诊 断=入院诊断",
+            "入 院 诊 断=初步诊断","入院诊断=初步诊断",
             "初步诊断=入院诊断",
             "住址=单位或住址",
             "住院号=住院号码"

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

@@ -74,7 +74,8 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "诊疗方案=诊疗计划",
+            "诊疗方案=诊疗计划","病历特点=病例特点",
+            "西医诊断依据=诊断依据","西医鉴别诊断=鉴别诊断",
             "医师签名=记录医生"
     );
 

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

@@ -49,16 +49,16 @@ public class BeiLunBeHospitalizedHtmlAnalysis implements BeiLunHtmlAnalysis {
         List<String> titles = Lists.newArrayList("家长姓名","病区","床号","住院号码","病案号","住院号","入 院 记 录","住 院 大 病 历",
                 "姓 名","职业", "职 业", "性 别", "入院日期","年 龄", "记录日期", "婚 姻","病史陈述者", "出生地","可靠程度",
                 "民 族","身份证号码","发病节气","病案号","单位或住址","主 诉","现病史","既往史","个人史","婚育史","家族史",
-                "专项 评估","专项评估",
-                "体 格 检 查","体 格 检 查 表 ( 一 )","补充及专科检查","辅 助 检 查","辅助检查", "入 院 诊 断","初步诊断",
+                "入 院 诊 断","专项 评估","专项评估",
+                "体 格 检 查","体 格 检 查 表 ( 一 )","补充及专科检查","辅 助 检 查","辅助检查", "初步诊断",
                 "书写医生","医师签名","书写医师","修正诊断","家长电话","出生年月","住 址"
         );
         String htmlContent = XszyyCommonAnalysisUtil.html2String(doc.toString());
         if (StringUtil.isNotBlank(htmlContent)) {
-            //有冒号版本
-            XszyyCommonAnalysisUtil.html2StructureMap(titles,htmlContent,map);
             //无冒号版本
             XszyyCommonAnalysisUtil.html2StructureMapNoColon(titles,htmlContent,map);
+            //有冒号版本
+            XszyyCommonAnalysisUtil.html2StructureMap(titles,htmlContent,map);
         }
         //书写医生中包含书写时间
         if(map.containsKey("书写医生")&&XszyyCommonAnalysisUtil.extractDate(map.get("书写医生"))!=null){

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

@@ -29,13 +29,19 @@ public class BeiLunFirstCourseRecordHtmlAnalysis 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("病例特点","病历特点","中医辨病辩证依据及鉴别诊断",
+                    "西医诊断依据及鉴别诊断","西医诊断依据","西医鉴别诊断","拟诊讨论","初步诊断","诊疗方案",
                     "医师签名","诊疗计划"
             );
             String htmlContent = XszyyCommonAnalysisUtil.html2String(doc.toString());
             if (StringUtil.isNotBlank(htmlContent)) {
                 //无冒号版本
                 XszyyCommonAnalysisUtil.html2StructureMapNoColon(titles,htmlContent,structureMap);
+                if(htmlContent.contains("病历特点")){
+                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("病历特点")));
+                }else if(htmlContent.contains("病例特点")){
+                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("出院记录内容缺诊疗经过")));
+                }
                 if(XszyyCommonAnalysisUtil.extractDate(htmlContent)!=null){
                     structureMap.put("病历日期",XszyyCommonAnalysisUtil.extractDate(htmlContent));
                 }