会诊新模板切词更改

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

@@ -6,6 +6,7 @@ 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;
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
@@ -28,7 +29,11 @@ public class XyConsultationHtmlAnalysis implements XyHtmlAnalysis {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
 
         try {
-            List<String> titles = Lists.newArrayList("会诊病人姓名", "初步诊断", "会诊目的","申请会诊病室负责人签名", "申请日期", "医务办意见", "主任签名");
+
+//            List<String> titles = Lists.newArrayList("会诊病人姓名", "初步诊断", "会诊目的","申请会诊病室负责人签名", "申请日期", "医务办意见", "主任签名");
+            List<String> titles = Lists.newArrayList("会诊病人姓名", "主诉","现病史","既往史","相关检验检查","24h动态",
+                    "目前诊断","治疗","主持人","会诊意见回报","总结意见",
+                    "初步诊断", "会诊目的","申请会诊病室负责人签名", "申请日期","医师签名","记录人", "医务办意见", "主任签名");
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
@@ -36,10 +41,11 @@ public class XyConsultationHtmlAnalysis implements XyHtmlAnalysis {
             Document doc = Jsoup.parse(html);
             if ("2001-14".equals(recTypeId)) {
                 htmlContent = CommonAnalysisUtil.html2String(html);
-                titles = Lists.newArrayList("会诊意见回报","会诊意见执行情况","会诊诊断","诊断为","会诊建议","医师签名");
+//                titles = Lists.newArrayList("会诊意见回报","会诊意见执行情况","会诊诊断","诊断为","会诊建议","医师签名");
                 if (StringUtil.isNotBlank(htmlContent)) {
                     XyCommonAnalysisUtil.extractWardInfo(recTitle, htmlContent, structureMap);
                     XyCommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
+
                 }
             } else {
                 htmlContent = XyHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body"), true).replace("&nbsp", "");
@@ -53,6 +59,10 @@ public class XyConsultationHtmlAnalysis implements XyHtmlAnalysis {
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
             }
+            if (StringUtils.isNotEmpty(structureMap.get("医师签名"))&&structureMap.get("医师签名").contains("记录人")){
+                String[] strings = structureMap.get("医师签名").split("记录人");
+                structureMap.put("医师签名",strings[0]);
+            }
             XyCommonAnalysisUtil.processType(structureMap, "会诊类型");
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {

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

@@ -33,6 +33,7 @@ public class XyConsultationRecordHtmlAnalysis implements XyHtmlAnalysis {
             Document doc = Jsoup.parse(html);
 //            XyHtmlAnalysisUtil.tableStyle1InsertMap(Jsoup.parse(html).getElementById("table1_1"), map);
             Element bigDivElement = Jsoup.parse(html).selectFirst("body");
+
             analysisGeneral(recTitle,bigDivElement, map);
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
@@ -49,7 +50,9 @@ public class XyConsultationRecordHtmlAnalysis implements XyHtmlAnalysis {
 //            bigDivElement.selectFirst("hr").previousElementSiblings().remove();
 //        }
         String htmlContent = XyHtmlAnalysisUtil.blockDivToStr(bigDivElement, true).replace("&nbsp", "");
-        List<String> titles = Lists.newArrayList("会诊病人姓名", "初步诊断", "会诊目的","申请会诊病室负责人签名", "申请日期", "医务办意见", "主任签名");
+        List<String> titles = Lists.newArrayList("会诊病人姓名", "主诉","现病史","既往史","相关检验检查","24h动态",
+                "目前诊断","治疗","主持人","会诊意见回报","总结意见",
+                "初步诊断", "会诊目的","申请会诊病室负责人签名", "申请日期","医师签名","记录人", "医务办意见", "主任签名");
 
         //获取病历标题和文书标题
         List<String> titleContent = Lists.newArrayList(htmlContent.split(" "));