北仑会诊结果单修改bug

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

@@ -178,6 +178,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
     private List<String> consultationResults_pageDataTitles = Lists.newArrayList(
             "科室=科别",
             "申请会诊科别=申请科室",
+            "申请时间=申请日期",
             //"会诊诊断=当前诊断",
             "患者病情及诊疗经过、申请会诊的理由及目的=会诊目的",
             "记录医师"
@@ -215,7 +216,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
             String recTypeId = contentMap.get("recTypeId").toString();
             BeiLunHtmlAnalysis beiLunHtmlAnalysis = new BeiLunConsultationHtmlAnalysis();
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
-            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_sourceTitles);
+            structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
             structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
@@ -244,6 +245,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
 
     private List<String> consultationApplication_keyContrasts = Lists.newArrayList(
             "++++姓名=姓名",
+            "申请时间=申请日期",
             "性别=性别",
             "++++病区=病区",
             "床号=",

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

@@ -34,6 +34,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             String htmlContent = null;
+            Document doc = Jsoup.parse(html);
             if ("外院专家会诊申请单".equals(recTitle)) {
                 htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {
@@ -41,7 +42,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
             } else if ("协定方会诊".equals(recTitle)) {
-                htmlContent = CommonAnalysisUtil.html2String(html);
+                htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 if (StringUtil.isNotBlank(htmlContent)) {
                     htmlContent = htmlContent.replaceAll("[   ]", " ");
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
@@ -51,6 +52,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                     structureMap.put("会诊意见", strArr[strArr.length - 1]);
                     structureMap.put("会诊时间", strArr[0]);
                 }
+                CommonAnalysisUtil.extractDateByTitle(structureMap,"申请时间");
             } else if ("MDT会诊申请表".equals(recTitle) || "新-MDT会诊三合一".equals(recTitle)) {
                 titles = Lists.newArrayList("姓名", "性别", "出生日期", "联系电话",
                         "申请科室", "入院/首诊时间", "住院号", "病情概述（含主诉、病史、诊断、诊治过程等）", "拟申请MDT时间、地点",
@@ -76,7 +78,6 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                     }
                 }
             } else {
-                Document doc = Jsoup.parse(html);
                 htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 //htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {