湘雅trans层代码合并

trans/src/main/java/com/lantone/qc/trans/changshaxy/OperationDocTrans.java

@@ -119,7 +119,7 @@ public class OperationDocTrans extends ModelDocTrans {
             }
             if (MapUtils.isNotEmpty(structureMap)) {
                 operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
-                String text = XyHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body"), true);
+                String text = XyHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
                 operationDiscussionDoc.setText(text);
                 operationDiscussionDoc.setPageData((Map) structureMap);
                 return operationDiscussionDoc;

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

@@ -44,7 +44,7 @@ public class InformedHtmlAnalysis implements XyHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            String htmlContent = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body"), false);
+            String htmlContent = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false);
             if (StringUtil.isNotBlank(recTitle) && recTitle.contains("知情选择授权书")) {
                 structureMap.put("标题", recTitle);
                 return structureMap;

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

@@ -33,15 +33,13 @@ public class XyBeHospitalizedHtmlAnalysis implements XyHtmlAnalysis {
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html.replace("<b>", "").replace("</b>", ""));
 
-            if (recTitle.contains("24")||recTitle.contains("日间")) {
+            if (recTitle.contains("24")) {
                 analysis24h(doc, map);
-            }else {
+            } else if (recTitle.contains("日间病历")) {
+                analysisDay(doc, map);
+            } else {
                 analysisGeneral(doc, recTitle, map);
             }
-//            else if (recTitle.contains("日间病历")) {
-//                analysisDay(doc, map);
-//            }
-
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -125,7 +123,7 @@ public class XyBeHospitalizedHtmlAnalysis implements XyHtmlAnalysis {
 
     //24小时出入院记录、24小时出入院记录（全院）、24小时入出院记录(全院通用)、24小时内入院死亡记录(全院通用)
     private void analysis24h(Document doc, Map<String, String> map) {
-        String text = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body"), false).replace("&nbsp"," ");
+        String text = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), false).replace("&nbsp"," ");
 //        text = text.substring(text.lastIndexOf("24小时入出院记录姓    名")).replaceFirst("第1页", "");
         List<String> titles = Lists.newArrayList("姓名", "出生地", "性别", "民族", "年龄", "职业", "婚姻",
                 "病史陈述者", "住址", "入院方式", "入院日期", "出院日期", "主诉", "入院情况","现病史", "既往史", "个人史", "婚育史", "月经史",

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

@@ -29,7 +29,7 @@ public class XyClinicBloodEffectHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
             if (map.containsKey("病情记录")) {
                 String content = map.get("病情记录");

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

@@ -27,7 +27,7 @@ public class XyDutyShiftSystemHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {

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

@@ -28,14 +28,13 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
         try {
             List<String> titles = Lists.newArrayList("入院日期", "出院日期", "住院天数", "入院诊断",
-                     "辅助资料", "住院经过", "出院时情况","出院情况",
+                    "入院时体查", "辅助资料", "住院经过", "出院时情况",
                     "出院诊断", "出院医嘱", "医师签名", "上级医师签名", "医师", "上级医师");
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-
-            String htmlContent = doc.text();
+            String htmlContent = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body"), true).replace("&nbsp", ":");
             htmlContent = htmlContent.replace(" ", "")
                     .replace("&nbsp", " ")
                     .replace("8220", "“")
@@ -59,56 +58,25 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
                     .replace("出院医嘱", "出院医嘱:");
 
             if (StringUtil.isNotBlank(htmlContent)) {
-//                titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
                 List<String> sortTitles = XyCommonAnalysisUtil.sortTitles(titles, htmlContent);
-                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("，"," "));
+                XyCommonAnalysisUtil.cutByTitles(htmlContent, sortTitles, 0, structureMap);
             }
-            //处理主诉和入院诊断被切割到住院天数的情况情况
-            if (StringUtils.isNotEmpty(structureMap.get("住院天数"))) {
-                String diagString = structureMap.get("住院天数");
-                    if(diagString.contains("入院诊断")) {
-                        structureMap.put("住院天数", diagString.substring(0, diagString.indexOf("入院诊断")));
-                        if ((diagString.indexOf("入院诊断")+4) < diagString.length()) {
-                            structureMap.put("入院诊断", diagString.substring(diagString.lastIndexOf("入院诊断") + 4, diagString.length()));
-                        }else {
-                            structureMap.put("入院诊断", diagString.substring(diagString.lastIndexOf("入院诊断"), diagString.length()));
-                        }
-                    }
+            if (StringUtils.isNotEmpty(structureMap.get("入院日期"))) {
+                String dateString = structureMap.get("入院日期");
+                if (dateString.contains("出院日期")) {
+                    Integer index = dateString.indexOf("出院日期");
+                    structureMap.put("入院日期", dateString.substring(0, index));
+                    structureMap.put("出院日期", dateString.substring(index, dateString.length()));
+                }
             }
-            //处理主诉被切割到入院诊断的情况
             if (StringUtils.isNotEmpty(structureMap.get("入院诊断"))) {
                 String diagString = structureMap.get("入院诊断");
                 if (diagString.contains("。")) {
                     Integer index = diagString.indexOf("。");
                     structureMap.put("入院诊断", diagString.substring(0, index));
-                    if(diagString.contains("因") && diagString.contains("入院")) {
-                        if(diagString.indexOf("入院")>(diagString.lastIndexOf("因") + 1)) {
-                            structureMap.put("主诉", diagString.substring(diagString.lastIndexOf("因") + 1, diagString.indexOf("入院")));
-                        }
-                    }
-                    structureMap.put("基本信息",diagString.substring(index, diagString.length()));
+                    structureMap.put("基本信息", diagString.substring(index, diagString.length()));
                 }
             }
-            //解决出院诊断中包含出院医嘱的情况
-            if (StringUtils.isNotEmpty(structureMap.get("出院诊断"))&&structureMap.get("出院诊断").contains("出院医嘱")){
-                String[] strings=structureMap.get("出院诊断").split("出院医嘱");
-                structureMap.put("出院诊断",strings[0]);
-                structureMap.put("出院医嘱",strings[1]);
-            }
-            //解决出院时情况包含出院诊断的情况
-            if (StringUtils.isNotEmpty(structureMap.get("出院时情况"))&&structureMap.get("出院时情况").contains("出院诊断")){
-                String[] strings=structureMap.get("出院时情况").split("出院诊断");
-                structureMap.put("出院时情况",strings[0]);
-                structureMap.put("出院诊断",strings[1]);
-            }
-
-
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

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

@@ -28,7 +28,7 @@ public class XyOperationHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {

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

@@ -2,7 +2,6 @@ package com.lantone.qc.trans.changshaxy.util;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.changshaxy.util.comsis.XyCommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.CommonAnalysisUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +28,7 @@ public class XyOperationRecordHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("html");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(bigDivElement, map);
             XyHtmlAnalysisUtil.mapValueRemoveStartColon(map);
             CommonAnalysisUtil.makeEmpty(map, "医生签名");
@@ -41,7 +40,7 @@ public class XyOperationRecordHtmlAnalysis implements XyHtmlAnalysis {
     }
 
     private void analysisGeneral(Element bigDivElement, Map<String, String> map) {
-            String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
+        String text = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         text = text.replaceAll("第1页", "")
                 .replace("（包括体位、切口处理经过，病灶所见及手术步骤等）：", "")
                 .replace("&nbsp", "")

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

@@ -29,7 +29,7 @@ public class XyPreoperativeHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
 
             XyHtmlAnalysisUtil.mapValueRemoveStartColon(map);

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

@@ -28,7 +28,7 @@ public class XyRescueHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle,bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {

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

@@ -28,7 +28,7 @@ public class XyStagesSummaryHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {

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

@@ -28,7 +28,7 @@ public class XyTransferIntoHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {

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

@@ -28,7 +28,7 @@ public class XyTransferOutHtmlAnalysis implements XyHtmlAnalysis {
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
-            Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+            Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(recTitle, bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {