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

kernel/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   profiles:
-    active: local
+    active: debug
 
 qc:
   hospital_id: 1,2,3,4,5,6,7,8,10,13,15,20,34,35,36

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

@@ -188,7 +188,8 @@ public class OperationDocTrans extends ModelDocTrans {
     }
 
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
-            "麻醉=麻醉方式","术后诊断=术中后诊断","术者=手术者","手术过程=手术经过","手术医师签名=记录医生","签名时间=记录时间","实施手术=手术名称"
+            "麻醉=麻醉方式","术后诊断=术中后诊断","术者=手术者","手术过程=手术经过","手术医师签名=记录医生",
+            "签名时间=记录时间","实施手术=手术名称","术前主要诊断=术前诊断","术后主要诊断=术中后诊断"
     );
 
 

trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyLeaveHospitalHtmlAnalysis.java

@@ -58,7 +58,7 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
                     .replace("9315", "④");
 
             if (StringUtil.isNotBlank(htmlContent)) {
-                titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
+//                titles = CommonAnalysisUtil.sortTitles(titles, htmlContent);
                 List<String> sortTitles = XyCommonAnalysisUtil.sortTitles(titles, htmlContent);
                 XyCommonAnalysisUtil.cutByTitles(htmlContent, titles, 0, structureMap);
             }
@@ -94,6 +94,20 @@ public class XyLeaveHospitalHtmlAnalysis implements XyHtmlAnalysis {
                     structureMap.put("基本信息",diagString.substring(index, diagString.length()));
                 }
             }
+            //解决出院诊断中包含出院医嘱的情况
+            if (StringUtils.isNotEmpty(structureMap.get("出院诊断"))&&structureMap.get("出院诊断").contains("出院医嘱")){
+                String[] strings=structureMap.get("出院诊断").split("出院医嘱");
+                structureMap.put("出院诊断",strings[0]);
+                structureMap.put("出院医嘱",strings[1]);
+            }
+            //解决出院时情况包含出院诊断的情况
+            if (StringUtils.isNotEmpty(structureMap.get("出院时情况"))&&structureMap.get("出院时情况").contains("出院诊断")){
+                String[] strings=structureMap.get("出院时情况").split("出院诊断");
+                structureMap.put("出院时情况",strings[0]);
+                structureMap.put("出院诊断",strings[1]);
+            }
+
+
             XyHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

trans/src/main/java/com/lantone/qc/trans/changshaxy/util/XyOperationRecordHtmlAnalysis.java

@@ -62,7 +62,7 @@ public class XyOperationRecordHtmlAnalysis implements XyHtmlAnalysis {
                 .replace("9314", "③")
                 .replace("9315", "④");
         List<String> titles = Lists.newArrayList(
-                "手术日期", "是否非计划再次手术", "麻醉", "术前诊断", "术后诊断", "拟施手术", "拟行手术", "实施手术", "手术级别", "手术医师", "助手",
+                "手术日期", "是否非计划再次手术", "麻醉", "术前诊断","术前主要诊断","术后主要诊断", "术后诊断", "拟施手术", "拟行手术", "实施手术", "手术级别", "手术医师", "助手",
                 "手术人员及职称", "手术人员", "术者", "一助",
                 "二助", "巡回护士", "手术指导者", "手术过程", "手术医师签名"
         );