save

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/BeHospitalizedDocTrans.java

@@ -67,10 +67,12 @@ public class BeHospitalizedDocTrans extends ModelDocTrans {
             "疼痛评估=疼痛",
             "代诉=主诉",
             "入院日期=入院时间",
+            "入院于=入院时间",
             "记录日期=记录时间",
             "体格检查一般情况=一般体格检查一般情况",
             "一般体格检查一般状况=一般体格检查一般情况",
-            "一般状况=一般体格检查一般情况"
+            "一般状况=一般体格检查一般情况",
+            "联系电话=电话"
 //            "西医诊断"
     );
 

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/BeHospitalizedHtmlAnalysis.java

@@ -49,16 +49,16 @@ public class BeHospitalizedHtmlAnalysis implements HtmlAnalysis {
     //一般模板
     private void analysisGeneral(Document doc, String recTitle, Map<String, String> map) {
 
-        List<String> titles = Lists.newArrayList("姓　　名", "性 　 别", "出生日期", "出 生 地", "职 业", "民 族", "宗教信仰", "婚 姻",
+        List<String> titles = Lists.newArrayList("姓名", "性别", "年龄","出生日期","父母姓名", "出生地", "职业", "民族", "宗教信仰", "婚 姻","入院时间","籍贯","入院于","生于","电话","供史者",
                 "联系地址", "联系电话", "入院日期", "记录日期", "身份证号码", "病史陈述者", "病史可靠程度", "产前检查", "丈夫姓名",
-                "主 诉", "现病史", "既往史", "个人史", "月经史", "婚姻史", "生育史", "家族史", "体格检查","一般状况","一般体格检查一般情况","一般体格检查一般状况","体格检查一般情况","辅助检查", "妇科检查","产科检查","实验室检查", "特殊检查",
-                "初步诊断", "康复需求","营养需求","医生签名", "医师签名", "签名时间", "记录时间", "补充诊断", "修正诊断","其    他");
+                "主诉", "现病史", "既往史", "个人史", "月经史", "婚姻史", "生育史", "家族史", "体格检查","一般状况","一般体格检查一般情况","一般体格检查一般状况","体格检查一般情况","辅助检查", "妇科检查","产科检查","实验室检查", "特殊检查",
+                "初步诊断", "康复需求","营养需求","医生签名", "医师签名", "签名时间", "记录时间", "补充诊断", "修正诊断","其他");
         //个人基础信息table解析
-        String htmlContent = CommonAnalysisUtil.html2String(doc.toString());
+        String htmlContent = CommonAnalysisUtil.html2String(doc.toString()).replaceAll(" ","").replaceAll("[   ]", "").replaceAll("　", "");
         if (StringUtil.isNotBlank(htmlContent)) {
             CommonAnalysisUtil.html2StructureMap(titles,htmlContent,map);
         }
-        //去掉生育史里面的表格jj
+        //去掉生育史里面的表格
         String reproductiveHistory = map.get("生育史");
         if (StringUtil.isNotBlank(reproductiveHistory)) {
             int index = reproductiveHistory.indexOf("孕次生产年月流产早产足月产");

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/LeaveHospitalHtmlAnalysis.java

@@ -25,10 +25,10 @@ public class LeaveHospitalHtmlAnalysis implements HtmlAnalysis {
     public Map<String, String> analysis(String... args) {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
-            List<String> titles = Lists.newArrayList("姓名", "性别","出生年月","主诊医师",
-                    "入院日期", "出院日期", "入院诊断", "出院诊断","疗效评价", "住院天数","入院情况", "住院诊治经过(包括重要发现和结论、接受手术和操作、药物和其它治疗)","辅助检查"
-                    ,"出院情况","出院去向", "出院带药","出院指导","复诊", "健康宣教",
-                    "可能需要的紧急医疗", "出院交通需求", "监护人意见", "监护人签名",
+            List<String> titles = Lists.newArrayList("姓名", "性别", "出生年月", "主诊医师",
+                    "入院日期", "出院日期", "入院诊断", "出院诊断", "疗效评价", "住院天数", "入院情况", "住院诊治经过(包括重要发现和结论、接受手术和操作、药物和其它治疗)", "辅助检查"
+                    , "出院情况", "出院去向", "出院带药", "出院指导", "复诊", "健康宣教",
+                    "可能需要的紧急医疗", "出院交通需求", "监护人意见", "监护人签名", "时间", "医生签名", "患者或家属意见", "患方签名",
                     "健康指导");
             String html = args[0];
             String recTitle = args[1];

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/PreoperativeHtmlAnalysis.java

@@ -60,7 +60,7 @@ public class PreoperativeHtmlAnalysis implements HtmlAnalysis {
                 .replace("(如高血压病、冠心病、糖尿病、脑梗、心梗、心肺肝肾功能不全、口服抗凝药等)", "")
                 .replace("年月日时\n" + "分", "")
                 .replace("一、简要病情", "简要病情");*/
-        text = text.replace("参加人员（姓名及专业技术职务） ", "参加人员");
+        text = text.replace("参加人员（姓名及专业技术职务）", "参加人员");
         text = text.replace("患者目前心理状态/文化需求 ", "患者目前心理状态或文化需求");
         List<String> titles = Lists.newArrayList("记录时间", "术前讨论时间", "讨论方式", "参加人员", "简要病情", "术前诊断", "手术指征"
                 ,  "术前诊断", "手术指征", "术前准备", "手术禁忌证", "患者目前心理状态或文化需求", "拟行手术方案",