会诊科室修改

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

@@ -5,6 +5,7 @@ import com.google.common.collect.Maps;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.util.FastJsonUtils;
+import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.beilun.util.BeiLunFirstCourseRecordHtmlAnalysis;
 import com.lantone.qc.trans.beilun.util.BeiLunHtmlAnalysis;
@@ -48,6 +49,9 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
                     structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
                 }
             }
+            if (StringUtil.isNotBlank(structureMap.get("医生签名"))) {
+                structureMap.put("医生签名", structureMap.get("医生签名").replaceAll("医生签名", ""));
+            }
             if (MapUtils.isNotEmpty(structureMap)) {
                 firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
                 firstCourseRecordDoc.setText(CommonAnalysisUtil.html2String(content));

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

@@ -30,7 +30,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                     "会诊类型", "被邀医院", "被邀科室", "申请时间", "患者病情及诊疗经过、申请会诊的理由及目的", "申请会诊科别",
                     "被邀会诊科别", "申请会诊医师", "会诊意见", "会诊时间", "科主任", "会诊到达时间", "查体", "会诊建议",
                     "会诊诊断", "会诊科室", "会诊医师", "外院会诊医师所在医疗机构名称", "会诊医师所在医疗机构名称");
-            String html = args[0];
+            String html = args[0].replaceAll("第一页", "");
             String recTitle = args[1];
             String recTypeId = args[2];
             String htmlContent = null;
@@ -52,7 +52,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                     structureMap.put("会诊意见", strArr[strArr.length - 1]);
                     structureMap.put("会诊时间", strArr[0]);
                 }
-                CommonAnalysisUtil.extractDateByTitle(structureMap,"申请时间");
+                CommonAnalysisUtil.extractDateByTitle(structureMap, "申请时间");
             } else if ("MDT会诊申请表".equals(recTitle) || "新-MDT会诊三合一".equals(recTitle)) {
                 titles = Lists.newArrayList("姓名", "性别", "出生日期", "联系电话",
                         "申请科室", "入院/首诊时间", "住院号", "病情概述（含主诉、病史、诊断、诊治过程等）", "拟申请MDT时间、地点",

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

@@ -26,7 +26,7 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
         try {
             List<String> titles = Lists.newArrayList("（一）病历特点", "（二）诊断依据", "（三）鉴别诊断",
                     "（四）初步诊断", "（五）诊疗计划", "医生签名");
-            String html = args[0];
+            String html = args[0].replaceAll("第一页", "");;
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);
             String htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);