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

trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyLeaveHospitalHtmlAnalysis.java

@@ -34,7 +34,8 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body"), true).replace("&nbsp", ":");
+
+            String htmlContent = doc.text();
             htmlContent = htmlContent.replace(" ", "")
                     .replace("&nbsp", " ")
                     .replace("8220", "“")
@@ -58,7 +59,13 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
 
             if (StringUtil.isNotBlank(htmlContent)) {
                 List<String> sortTitles = XyCommonAnalysisUtil.sortTitles(titles, htmlContent);
-                XyCommonAnalysisUtil.cutByTitles(htmlContent, sortTitles, 0, structureMap);
+                XyCommonAnalysisUtil.cutByTitles(htmlContent, titles, 0, structureMap);
+            }
+           if (StringUtils.isNotEmpty(structureMap.get("入院日期"))){
+               structureMap.put("入院日期",structureMap.get("入院日期").replace(","," ").replace("，"," "));
+           }
+            if (StringUtils.isNotEmpty(structureMap.get("出院日期"))){
+                structureMap.put("出院日期",structureMap.get("出院日期").replace(","," ").replace("，"," "));
             }
             if (StringUtils.isNotEmpty(structureMap.get("入院诊断"))) {
                 String diagString = structureMap.get("入院诊断");