save

trans/src/main/java/com/lantone/qc/trans/comsis/CommonAnalysisUtil.java

@@ -306,7 +306,6 @@ public class CommonAnalysisUtil {
     public static String extractDateHangzhou(String top) {
         Pattern pattern = Pattern.compile("[0-9]{4}[-][0-9]{1,2}[-][0-9]{1,2}");
         Matcher matcher = pattern.matcher(top);
-        String need = null;
         if (matcher.find()) {
 
 
@@ -320,6 +319,9 @@ public class CommonAnalysisUtil {
         String s = extractDateHangzhou(a);
         String replace = a.replace(s, "");
         System.out.println(s + " " + replace);
+
+
+
         System.out.println(s);
     }
 

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

@@ -49,8 +49,8 @@ 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解析
@@ -81,9 +81,31 @@ public class BeHospitalizedHtmlAnalysis implements HtmlAnalysis {
                 map.put(str, "时间:" + replace);
             }
         }
+        String admissionDate = map.get("入院日期");
+        String s = CommonAnalysisUtil.extractDateHangzhou(admissionDate);
+        if (StringUtil.isNotBlank(s)) {
+            String replace = admissionDate.replace(s, "");
+            map.put(admissionDate, s + " " + replace);
+        }
+        String recordDate = map.get("记录日期");
+        String extractRecordDate = CommonAnalysisUtil.extractDateHangzhou(recordDate);
+        if (StringUtil.isNotBlank(extractRecordDate)) {
+            String replace = recordDate.replace(extractRecordDate, "");
+            map.put(recordDate, extractRecordDate + " " + replace);
+        }
 
-
-
+        String writeTime = map.get("记录时间");
+        String extractWriteTime = CommonAnalysisUtil.extractDateHangzhou(writeTime);
+        if (StringUtil.isNotBlank(extractWriteTime)) {
+            String replace = writeTime.replace(extractWriteTime, "");
+            map.put(writeTime, extractWriteTime + " " + replace);
+        }
+        String admissionTime = map.get("入院时间");
+        String extractAdmissionTime = CommonAnalysisUtil.extractDateHangzhou(admissionTime);
+        if (StringUtil.isNotBlank(extractAdmissionTime)) {
+            String replace = admissionTime.replace(extractAdmissionTime, "");
+            map.put(admissionTime, extractAdmissionTime + " " + replace);
+        }
 
 
     }