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

kernel/src/main/java/com/lantone/qc/kernel/util/CacheUtil.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -27,6 +28,7 @@ import java.util.Map;
  */
 @Slf4j
 @Component
+@Order(50)
 public class CacheUtil implements ApplicationRunner {
     private Configuration configuration = new DefaultConfig();
     @Autowired

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

@@ -26,7 +26,7 @@ public class BeiLunCriticallyIllNoticeHtmlAnalysis implements BeiLunHtmlAnalysis
 
         try {
             List<String> titles = Lists.newArrayList("姓名", "性别", "出生日期", "科别", "病区", "床号", "住院号",
-                    "临床诊断", "主要症状", "体格检查", "辅助检查", "告知医师签名",
+                    "临床诊断", "病情摘要", "主要症状", "体格检查", "辅助检查", "告知医师签名",
                     "告知时间", "患方意见", "患方签名", "手印说明", "与患者关系", "签字时间");
             String html = args[0];
             String recTitle = args[1];

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

@@ -30,16 +30,30 @@ public class BeiLunOperationRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
             Element bigDivElement = Jsoup.parse(html).selectFirst("body").child(0);
             analysisGeneral(bigDivElement, map);
             BeiLunHtmlAnalysisUtil.mapValueRemoveStartColon(map);
+            String operatingCrew = null;
             if (map.containsKey("手术人员")) {
-                String operatingCrew = map.get("手术人员");
-                if (StringUtil.isNotBlank(operatingCrew)) {
-                    CommonAnalysisUtil.cutByTitles(operatingCrew, Lists.newArrayList("主刀", "一助", "二助", "洗手护士"), 0, map);
-                }
+                operatingCrew = map.get("手术人员");
+            } else if (map.containsKey("手术者及助手名称")) {
+                operatingCrew = map.get("手术者及助手名称");
+            }
+            if (StringUtil.isNotBlank(operatingCrew)) {
+                CommonAnalysisUtil.cutByTitles(operatingCrew, Lists.newArrayList("主刀", "一助", "二助", "助手", "洗手护士"), 0, map);
+            }
+            if (map.containsKey("主刀")) {
+                map.put("主刀", map.get("主刀").replaceAll("[^\u4E00-\u9FA5]", ""));
             }
             if (map.containsKey("麻醉者")) {
                 map.put("麻醉医师", map.get("麻醉者").replace("麻醉医生：", ""));
             }
-            CommonAnalysisUtil.makeEmpty(map,"医生签名");
+            if (map.containsKey("手术日期")) {
+                String operatorDateStr = map.get("手术日期");
+                if (operatorDateStr.contains("--")) {
+                    String[] operatorDate = operatorDateStr.split("--");
+                    map.put("手术开始时间", operatorDate[0]);
+                    map.put("手术结束时间", operatorDate[1]);
+                }
+            }
+            CommonAnalysisUtil.makeEmpty(map, "医生签名");
             BeiLunHtmlAnalysisUtil.insertModuleId(modeId, recTypeId, map);
         } catch (Exception e) {
             log.error(e.getMessage(), e);