修复一个因截取手术时间引起的异常

dbanaly/src/main/resources/application-local.yml

@@ -28,9 +28,9 @@ spring:
     database:
       cache: 10 # cache索引
       token: 10 # Token索引
-    host: 192.168.2.121  #Redis服务器地址
+    host: localhost  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password: lantone # Redis服务器连接密码（默认为空）
+    password: # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）

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

@@ -116,9 +116,9 @@ public class OperationDocTrans extends ModelDocTrans {
             if (StringUtils.isNotBlank(operation_time)) {
                 //2021.01.04 15:21-16:09
                 String[] split = operation_time.split(" ");
-                String[] split1 = split[1].split("-");
+                String[] split1 = split[split.length - 1].split("-");
                 String surgery_start_time = split[0] + " " + split1[0];
-                String surgery_end_time = split[0] + " " + split1[1];
+                String surgery_end_time = split[0] + " " + split1[split1.length - 1];
                 sourceMap.put("手术开始时间", surgery_start_time);
                 sourceMap.put("手术结束时间", surgery_end_time);
             }
@@ -141,6 +141,8 @@ public class OperationDocTrans extends ModelDocTrans {
             "治疗计划和措施=术后处理措施",
             "术后注意观察事项=术后注意事项",
             "手术名称=手术名称方式",
+            "术中诊断=术中后诊断",
+            "术后诊断=术中后诊断",
             "术后诊疗计划（处理措施）=术后处理措施",
             "术后谈话=术后注意事项",
             "记录医师签名=记录医生",
@@ -186,9 +188,9 @@ public class OperationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = ShengzhouyyXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             List<String> titles = Lists.newArrayList("手术开始时间", "手术结束时间", "术中诊断", "手术简要经过", "主    刀",
-                    "第一助手", "第二助手", "第三助手", "洗手护士","指 导 者","护    婴","器械护士","巡回护士", "麻醉方式", "手术方式", "麻醉医师", "手术标本", "冰冻切片结果",
-                    "术中并发症","术后出血量","术后检查时间","术后观察时间", "术中失血量", "手术经过及处理", "手术简要经过", "手术经过", "医师签名", "主刀医师签名", "时间", "术后生命体征",
-                    "患方签名", "记录时间","待产日期","手术名称","术后诊断");
+                    "第一助手", "第二助手", "第三助手", "洗手护士", "巡回护士", "麻醉方式", "手术方式", "麻醉医师", "手术标本", "冰冻切片结果",
+                    "术中并发症", "术中失血量", "手术经过及处理", "手术简要经过", "手术经过", "医师签名", "主刀医师签名", "时间", "术后生命体征",
+                    "术后出血量", "患方签名", "记录时间","待产日期","手术名称","术后诊断");
 
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);
@@ -210,29 +212,33 @@ public class OperationDocTrans extends ModelDocTrans {
 
     // 手术记录
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
-            "病程时间=病历日期", "病程标题=标题", "麻醉医师签名=麻醉人员","麻醉医师=麻醉人员",
-            "记录时间=医师签名时间","手术开始时间=开始时间","手术结束时间=结束时间",
-            "手术记录手术开始日期=开始时间","手术开始时间=开始时间",
-            "手术记录手术结束日期=结束时间","手术结束日期时间=结束时间","手术结束时间=结束时间",
-            "术后诊断=术中后诊断","手术经过及处理=手术经过",
-            "Ⅰ助姓名=一助","Ⅱ助姓名=二助"
-//            "巡回护士姓名=巡回护士",
-//            "医生=主刀医师签名",
-//            "助手=一助",
-//            "本人姓名=姓名",
-//            "术后诊断=术中后诊断",
-//            "术中后诊断=术中后诊断","术中诊断=术中后诊断",
-//            "手术记录手术过程=手术经过",
-//            "手术经过及处理=手术经过",
-//            "主刀医师=主刀医师",
-//            "手术记录麻醉方式=麻醉体位",
-//            "麻醉医师签名=麻醉医师",
-//            "麻醉医师签名=麻醉人员",
-//            "主刀医师签名=医师签名",
-//            "医师签名=医师签名",
-//            "记录时间=医师签名时间",
-//            "时间=医师签名时间",
-//            "手术方式=手术名称"
+            "病程时间=病历日期", "病程标题=标题", "麻醉医师=麻醉人员", "巡回护士姓名=巡回护士",
+            "待产日期=手术日期",
+            "医生=主刀医师签名",
+            "助手=一助",
+            "本人姓名=姓名",
+            "手术记录手术开始日期=开始时间",
+            "手术开始时间=开始时间",
+            "手术记录手术结束日期=结束时间",
+            "手术结束日期时间=结束时间",
+            "手术结束时间=结束时间",
+            "术后诊断=术中后诊断",
+            "术中后诊断=术中后诊断",
+            "术中诊断=术中后诊断",
+            "手术记录手术过程=手术经过",
+            "手术简要经过=手术经过",
+            "主刀医师=主刀医师",
+            "Ⅰ助姓名=一助",
+            "Ⅱ助姓名=二助",
+            "手术记录麻醉方式=麻醉体位",
+            "麻醉医师签名=麻醉医师",
+            "麻醉医师签名=麻醉人员",
+            "主刀医师签名=医师签名",
+            "医师签名=医师签名",
+            "记录时间=医师签名时间",
+            "时间=医师签名时间",
+            "观察时间=术后观察时间",
+            "手术方式=手术名称"
     );
 
     /**********************************************术前讨论、术前小结****************************************************/