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

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/HangzhoufubaoDocTrans.java

@@ -51,7 +51,7 @@ public class HangzhoufubaoDocTrans extends com.lantone.qc.trans.DocTrans {
                     ClinicBloodEffectDocTrans clinicBloodEffectDocTrans = new ClinicBloodEffectDocTrans();
                     inputInfo.setClinicBloodEffectDocs(clinicBloodEffectDocTrans.extract(i));
                 }
-                if (i.getTitle().equals("危急值记录")) {
+                         if (i.getTitle().equals("危急值记录")) {
                     CrisisValueReportDocTrans crisisValueReportDocTrans = new CrisisValueReportDocTrans();
                     inputInfo.setCrisisValueReportDocs(crisisValueReportDocTrans.extract(i));
                 }
@@ -85,7 +85,7 @@ public class HangzhoufubaoDocTrans extends com.lantone.qc.trans.DocTrans {
                 }
                 if (i.getTitle().equals("首次病程录")) {
                     FirstCourseRecordDocTrans firstCourseRecordDocTrans = new FirstCourseRecordDocTrans();
-                    inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
+                     inputInfo.setFirstCourseRecordDoc(firstCourseRecordDocTrans.extract(i));
                 }
                 if (i.getTitle().equals("病案首页")) {
                     FirstPageRecordDocTrans firstPageRecordDocTrans = new FirstPageRecordDocTrans();
@@ -125,7 +125,7 @@ public class HangzhoufubaoDocTrans extends com.lantone.qc.trans.DocTrans {
                     inputInfo.setBeHospitalizedDoc(outDepDocTrans.extract(i));
                 }
                 /*******************************VTE评分 trans解析*****************************************/
-                if (i.getTitle().equals("VTE评分")) {
+                 if (i.getTitle().equals("VTE评分")) {
                     VTEGradeDocTrans vteGradeDocTrans = new VTEGradeDocTrans();
                     inputInfo.setVteGradeDoc(vteGradeDocTrans.extract(i));
                 }

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/OperationDocTrans.java

@@ -191,7 +191,7 @@ public class OperationDocTrans extends ModelDocTrans {
             "手术经过及处理（包括患者的体位、切口处理、病灶所见及手术步骤等）=手术经过",
             "术(中)后诊断=术中诊断",
             "手术主刀医师=主刀医师",
-            "主刀医师签名=主刀签字"
+            "主刀医师签名=主刀签字","输入血/血制品=输入血或血制品","时 间=时间"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/RescueDocTrans.java

@@ -66,8 +66,7 @@ public class RescueDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "病历标题=标题",
-            "病情记录=抢救内容"
+            "病情记录=抢救内容","病历日期=抢救记录"
     );
 
 }

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/TransferRecordDocTrans.java

@@ -296,7 +296,7 @@ public class TransferRecordDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "医师签名=记录医生",
+
             "病历标题=标题",
             "病情记录=病历内容",
             "签名时间=记录时间"

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/CrisisValueReportHtmlAnalysis.java

@@ -44,7 +44,7 @@ public class CrisisValueReportHtmlAnalysis implements HtmlAnalysis {
         }
 
         String text = HtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
-        ArrayList<String> strings = Lists.newArrayList("报告时间", "报告内容", "处理情况", "记录医师");
+        ArrayList<String> strings = Lists.newArrayList("病历日期","报告时间", "报告内容", "处理情况", "记录医师");
         HangzhoufubaoTranUtils.getStructureMapSplitCommonCutByList(map, text, recTitle, strings);
     }
 

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/FirstCourseRecordHtmlAnalysis.java

@@ -32,7 +32,7 @@ public class FirstCourseRecordHtmlAnalysis implements HtmlAnalysis {
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
-            List<String> titles = Lists.newArrayList("记录时间","一般情况","病史特点", "初步诊断", "诊断依据", "鉴别诊断","治疗目标","诊疗计划","医生签名");
+            List<String> titles = Lists.newArrayList("记录时间","一般情况","一、病史特点", "二、初步诊断", "三、诊断依据", "四、鉴别诊断","五、治疗目标","六、诊疗计划","医生签名");
             String htmlContent = HtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true);
             if (StringUtil.isNotBlank(htmlContent)) {
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/OperationRecordHtmlAnalysis.java

@@ -44,9 +44,9 @@ public class OperationRecordHtmlAnalysis implements HtmlAnalysis {
         text = text.replaceAll("第1页", "")
                 .replace("输入血/血制品", "输入血或血制品");
         List<String> titles = Lists.newArrayList(
-                "手术时间","手术开始时间", "手术结束时间", "手术全程时间", "术前诊断", "手术名称", "手术指征", "术后诊断", "主刀医师", "麻醉人员", "器械护士",
-                "儿科医生", "护婴人", "指导人", "麻醉方式", "麻醉体位", "麻醉效果", "手术经过", "术中并发症", "冰冻切片诊断", "送检手术标本",
-                "失血量", "输入血/血制品", "植入物", "手术医生签名", "日 期");
+                "手术时间", "手术结束时间", "手术全程时间", "术前诊断", "手术名称", "手术指征", "术后诊断", "主刀医师", "麻醉人员", "器械护士",
+                "儿科医生", "护婴人", "指导人", "麻醉方式", "麻醉体位", "麻醉效果", "手术经过", "术中并发症", "冰冻切片诊断", "送检手术标本","手术切口类别",
+                "失血量", "输入血/血制品", "植入物", "手术医生签名", "时 间");
         titles = CommonAnalysisUtil.sortTitles(titles, text);
         CommonAnalysisUtil.cutByTitles(text, titles, 0, map);
 /*        CommonAnalysisUtil.processTypeRight(map, "NNIS分级");

trans/src/main/java/com/lantone/qc/trans/hangzhoufubao/util/RescueHtmlAnalysis.java

@@ -44,7 +44,7 @@ public class RescueHtmlAnalysis implements HtmlAnalysis {
         }
         String htmlText = HtmlAnalysisUtil.blockDivToStr(bigDivElement, true);
         List<String> titles = Lists.newArrayList(
-                "抢救时间", "抢救内容", "参加人员", "记录医师"
+                "病例标题","病例日期","抢救开始时间","抢救结束时间","注意事项","参加抢救的医务人员姓名","病情变化情况","抢救经过及措施","记录医师"
         );
         HangzhoufubaoTranUtils.getStructureMapSplitByLineCutByList(structureMap, htmlText, recTitle, titles);