Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

# Conflicts:
#	trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java

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

@@ -68,7 +68,8 @@ public class BeiLunCriticallyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-
+            "临床诊断=当前诊断",
+            "患方签名=患者签名"
     );
 
 }

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

@@ -35,7 +35,8 @@ public class BeiLunLeaveHospitalHtmlAnalysis implements BeiLunHtmlAnalysis {
             String htmlContent = BeiLunHtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ").replace("第1页", "");
-                CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
+                List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, htmlContent.replace("复诊时间",""));
+                CommonAnalysisUtil.cutByTitles(htmlContent, sortTitles, 0, structureMap);
             }
             CommonAnalysisUtil.extractDateByTitle(structureMap, "时间");
             BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);