北仑出院小结trans层修改bug

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java

@@ -6,6 +6,8 @@ import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.label.LeaveHospitalDoctorAdviceLabel;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
+import com.lantone.qc.trans.beilun.util.BeiLunLeaveHospitalHtmlAnalysis;
+import com.lantone.qc.trans.beilun.util.CommonAnalysisUtil;
 import com.lantone.qc.trans.comsis.ModelDocGenerate;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import org.apache.commons.lang3.StringUtils;
@@ -24,9 +26,10 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
     public LeaveHospitalDoc extract(MedrecVo medrecVo) {
         Map<String, Object> contentMap = ((List<Map>) medrecVo.getContent().get("content")).get(0);
         String content = contentMap.get("xmlText").toString();
-        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
-        sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        String recTitle = contentMap.get("recTitle").toString();
+        BeiLunLeaveHospitalHtmlAnalysis beiLunLeaveHospitalHtmlAnalysis = new BeiLunLeaveHospitalHtmlAnalysis();
+        Map<String, String> sourceMap = beiLunLeaveHospitalHtmlAnalysis.analysis(content, recTitle);
+//        Map<String, String> sourceMap = CxXmlUtil.firstLevelNodeValue(content);
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
         LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);
 
@@ -36,7 +39,8 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
             leaveHospitalDoctorAdviceLabel.setAiText(structureMap.get("出院医嘱"));
             leaveHospitalDoc.setLeaveHospitalDoctorAdviceLabel(leaveHospitalDoctorAdviceLabel);
         }
-        leaveHospitalDoc.setText(CxXmlUtil.getXmlText(content));
+        String text = CommonAnalysisUtil.html2String(content);
+        leaveHospitalDoc.setText(CxXmlUtil.getXmlText(text));
         leaveHospitalDoc.setPageData((Map) structureMap);
         return leaveHospitalDoc;
     }

trans/src/main/java/com/lantone/qc/trans/beilun/util/BeiLunLeaveHospitalHtmlAnalysis.java

@@ -3,6 +3,8 @@ package com.lantone.qc.trans.beilun.util;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.lantone.qc.pub.util.StringUtil;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
 
 import java.util.List;
 import java.util.Map;
@@ -20,13 +22,14 @@ public class BeiLunLeaveHospitalHtmlAnalysis implements BeiLunHtmlAnalysis {
                 "入院情况", "入院后检查化验结果", "诊疗经过", "出院计划", "病理检查结果", "出院情况", "治疗效果", "出院医嘱", "医师签名", "时间");
         String html = args[0];
         String recTitle = args[1];
+        Document doc = Jsoup.parse(html);
         Map<String, String> structureMap = Maps.newLinkedHashMap();
-        String htmlContent = CommonAnalysisUtil.html2String(html);
+        String htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
         if (StringUtil.isNotBlank(htmlContent)) {
             htmlContent = htmlContent.replaceAll("[   ]", " ");
             CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
         }
-        structureMap.put("rec_title=", "183");
+        BeiLunHtmlAnalysisUtil.insertModuleId(recTitle, structureMap);
         return structureMap;
     }