医师签名修改

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].replaceAll("第一页", "");
+            String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
             String htmlContent = null;
@@ -38,13 +38,13 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
             if ("外院专家会诊申请单".equals(recTitle)) {
                 htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {
-                    htmlContent = htmlContent.replaceAll("[   ]", " ");
+                    htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
             } else if ("协定方会诊".equals(recTitle)) {
                 htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 if (StringUtil.isNotBlank(htmlContent)) {
-                    htmlContent = htmlContent.replaceAll("[   ]", " ");
+                    htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
                 if (StringUtil.isNotBlank(structureMap.get("会诊时间"))) {
@@ -60,7 +60,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                         "填写时间", "主持科室小结（MDT的最终诊治决议）", "科主任（主持人）签名", "记录人（主管医师）签字", "日期");
                 htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {
-                    htmlContent = htmlContent.replaceAll("[   ]", " ").replace("住院/门诊号", "");
+                    htmlContent = htmlContent.replaceAll("[   ]", " ").replace("住院/门诊号", "").replace("第1页", "");
                     StringBuffer sbf = new StringBuffer();
                     List<String> distinctText = Lists.newArrayList(htmlContent.split(" ")).stream().distinct().collect(Collectors.toList());
                     for (String text : distinctText) {
@@ -81,7 +81,7 @@ public class BeiLunConsultationHtmlAnalysis implements BeiLunHtmlAnalysis {
                 htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
                 //htmlContent = CommonAnalysisUtil.html2String(html);
                 if (StringUtil.isNotBlank(htmlContent)) {
-                    htmlContent = htmlContent.replaceAll("[   ]", " ");
+                    htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
                     CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
                 }
             }

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

@@ -26,14 +26,15 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
         try {
             List<String> titles = Lists.newArrayList("（一）病历特点", "（二）诊断依据", "（三）鉴别诊断",
                     "（四）初步诊断", "（五）诊疗计划", "医生签名");
-            String html = args[0].replaceAll("第一页", "");;
+            String html = args[0];;
             String recTitle = args[1];
             Document doc = Jsoup.parse(html);
             String htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replace("建议先书写大病", "")
                         .replace("历，并对导入的既往史和现病史进行归纳", "")
-                        .replace("若书写者为诊疗组长本人，以下签名框中可只签一个名字", "");
+                        .replace("若书写者为诊疗组长本人，以下签名框中可只签一个名字", "")
+                        .replace("第1页", "");
                 String[] lines = htmlContent.split("\n\n");
                 if (lines.length > 1) {
                     String text = "";