Merge branch 'hb/beilun' into his/xszyy

# Conflicts:
#	dbanaly/src/main/resources/application-local.yml
#	kernel/src/main/resources/bootstrap.yml

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

@@ -5,7 +5,7 @@ spring:
     druid:
       lantone:
         driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://192.168.2.237:3307/qc_xszyy?useUnicode=true&characterEncoding=utf8&useSSL=false
+        url: jdbc:mysql://192.168.2.237:3307/qc?useUnicode=true&characterEncoding=utf8&useSSL=false
         username: root
         password: lantone
         initial-size: 8
@@ -30,7 +30,7 @@ spring:
       token: 10 # Token索引
     host: 127.0.0.1  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password:  # Redis服务器连接密码（默认为空）
+    password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）

kernel/src/main/resources/cache/37/concept_clinic_bodypart_properties.dict

@@ -0,0 +1,84 @@
+sjwPlFuzwYtdGy/Xru8l0w==
+sjwPlFuzwYuOwjk+wlafMb496h/s94Lp
+GaEOqMDeIR/A3JPjaU/OYQ==
+KUZ84E/l6BtIxYdpVp2d2udw4JKVz6fxOAPHyqzXUMY=
+ClvKDL868eyBa0I3oBBXTiLG5UIUjigm
+cpVuhYfN0VLL15lmAanTHLudBba0KZdGSmARnfpRl/s=
+tgLfZiBNXVfe46uqWooJfQ==
++elokrz+5ZZ4nftSAgjXeP9VC/9mRBPm
+u18AKL/dfo8=
+FXYCcRyAS3o=
+1y8RNUzpzDDA3JPjaU/OYQ==
+GDAzhKkwugqOwjk+wlafMb496h/s94Lp
+vVsbjXwCHtKFIWuMj59JFg==
+S00FGSMpzFYRJHHOrCiJIw==
+LQ4RQ5c6TvEfVJH7s8MZNQ==
+KkqtLy22gBtRq6Y4vkNXyQ==
+FpNKk6eB+A78k09Y7waUfQ==
+55LO8f+DGuqsZzaaPHDG7A==
+anCWsr9KEAcfVJH7s8MZNQ==
+Ms4itbwo4woHjnX6dZF4Ew==
+eE2lKBuqkGwbZW204O8pbL496h/s94Lp
+KPTiLOQlvfcHjnX6dZF4Ew==
+EHYxrOGlbsJINCuQrfA+Qw==
+IoIoNIGjGAkfVJH7s8MZNQ==
+TkKCqeWSukdcNzQgT7Qg/y/95Ux1UGf/
+5sS2G/r6ssUfVJH7s8MZNQ==
+Fz6WuGDyOlM=
+6BJE0DCYV4PN7oAmfhVFQqHIcEkBIHl+SmARnfpRl/s=
+ClvKDL868ewfVJH7s8MZNQ==
+IoIoNIGjGAmt+3FIqYSLwA==
+qjVzhjIuUT4fVJH7s8MZNQ==
+fAvCqq32iRGYkjXG21GhdA==
+Qz54IR1t0pxhD8mu55a07QB9XVjkemQO
+VDAaAfFpalOc8iRXg5Txmg==
+v2wP8zYN7yUfVJH7s8MZNQ==
+2O+0+BuTK7hnAFNeF32DwQ==
+LRQ8TiPskP8=
+MHWWVpSYUhZp84i3DCFu/g==
+4a+BNcRWzuwuxVbFLjJEww==
+yWJqJiL6qWQskpnR2QjFRA==
+LkBZ8uh2sivD7O64F4fyYD26Q3FauFTq
+vU9OSQNfzsdHGRV53JQHXTZxIOEr6XT/
+Z0A2kuK86msFZwSJa38bOw==
+qglFhT75KVY=
+J47wTSKVIotrynAbi7Nl7g==
+PSCtbA3GBCLqcUHlnbz5ig==
+pGzYL5VYctXxzUrAtKDMFg==
+J47wTSKVIotWP8N6Zu8teQ==
+hnOhzeqPs7c=
+FpNKk6eB+A60ivUVDCQonmb0NA6xAPvZ
+6eB67p+u3VA=
+38rBhrBd2ZA=
+WlxWJO1bvWM=
+/UTzDiOxLWpNfh/SNay22g==
+PLBt3Oha1AAOSE8k2YZYMw==
+cA6kPjEpsoKKXDwNc4sbZv9VC/9mRBPm
+ubvY7WEHsf0HjnX6dZF4Ew==
+NI9su0Z8kvY=
+z5dpaPXQysM+03JbZpPE8K74oEbqwDfN
+e7OvqkV6Qx5DhU/YuJZA4A==
+vnSKQ0o1HZO5fhcvExqbXw==
+5j32mrEC41Q=
+teXiWF5i95089VmH6nOntT26Q3FauFTq
+C5DNXPfJ3MsXUKrj9yaJVQ==
+aBDrcQGdFjgXTO+Ia0kzAA==
+EyuDTtt1Nh1c5OTNuAf37Q==
+0NhZqdATkZ4=
+1IKx7GtShHg=
+h/OwYNYyciw=
+kGg6y+QB2f8=
+et0S9LyTiS4MhEBuylTk2g==
+goFZ0v8zcPc=
+cA6kPjEpsoJc5OTNuAf37Q==
+BZNVMNz30Z00iPLsFnfW9Q==
+FUNtEl6WjOUfVJH7s8MZNQ==
+1boew8BvzsDzIpTnzy5Qnw==
+/CIzubCbNzzkzFf+CBlT64JiFWxfW6DV
+teXiWF5i953EeSAoaVSW+wBBqlZ1ciHqSmARnfpRl/s=
+CTNjqF5g7EIfVJH7s8MZNQ==
+OOQuqjL/h5M16D9aZjbrRw==
+ZfWBQ/To1p1p84i3DCFu/g==
+Q449MTqnm/c=
+xmHl5DY7FyM=
+hV3gMCbT8x+fXEA0j/uq7Q==

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

@@ -42,7 +42,7 @@ public class CriticallyIllNoticeDocTrans extends ModelDocTrans {
     }
 
     private CriticallyIllNoticeDoc getCriticallyIllNoticeDoc(Map<String, Object> contentMap) {
-        String content = contentMap.get("xmlText").toString();
+        String content = contentMap.get("htmlText").toString();
         Map<String, String> structureMap = null;
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);

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

@@ -40,8 +40,8 @@ public class FirstCourseRecordDocTrans extends ModelDocTrans {
             } else {
                 String recTitle = contentMap.get("recTitle").toString();
                 String recTypeId = contentMap.get("recTypeId").toString();
-                HtmlAnalysis hangzhoufubaoHtmlAnalysis = new FirstCourseRecordHtmlAnalysis();
-                Map<String, String> sourceMap = hangzhoufubaoHtmlAnalysis.analysis(content, recTitle, recTypeId);
+                HtmlAnalysis htmlAnalysis = new FirstCourseRecordHtmlAnalysis();
+                Map<String, String> sourceMap = htmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     sourceMap = removeSerialNumber(sourceMap);
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);

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

@@ -62,7 +62,10 @@ public class BeHospitalizedHtmlAnalysis implements HtmlAnalysis {
         String reproductiveHistory = map.get("生育史");
         if (StringUtil.isNotBlank(reproductiveHistory)) {
             int index = reproductiveHistory.indexOf("孕次生产年月流产早产足月产");
-            map.put("生育史", reproductiveHistory.substring(0, index));
+            if (index > 0) {
+                map.put("生育史", reproductiveHistory.substring(0, index));
+
+            }
         }
 
 

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

@@ -26,40 +26,40 @@ public class CriticallyIllNoticeHtmlAnalysis implements HtmlAnalysis {
         Map<String, String> structureMap = Maps.newLinkedHashMap();
 
         try {
-            List<String> titles = Lists.newArrayList("姓名", "科别", "床号", "病案号",
-                    "1.简要病情", "2.目前诊断", "3.目前病情评估", "4.目前患者病情危重，随时出现以下一种或多种危及患者生命的并发症，且病情有进一步恶化\n" +
-                            "可能", "5.注意事项", "谈话医师签名", "签名日期", "时间", "6.患方知情选择",
-                    "患者签名", "指印", "患者签名时间", "若患者无法签署知情同意书或授权于亲属，请法定监护人或被授权人在此签名", "法定监护人/被授权人签名", "与患者关系", "法定监护人签名时间");
+            List<String> titles = Lists.newArrayList("姓名", "健康号", "年龄", "病区",
+                    "床号", "入院日期", "入院诊断", "病情概括及治疗措施", "可能的风险及预后", "医师签名", "时间", "患方签名");
             String html = args[0];
             String recTitle = args[1];
             String recTypeId = args[2];
             Document doc = Jsoup.parse(html);
             String htmlContent = HtmlAnalysisUtil.blockDivToStr(doc.selectFirst("body").child(0), true)
-                    .replace("患者签名", "患者签名：")
-                    .replace("法定监护人/被授权人签名", "法定监护人/被授权人签名：")
-                    .replace("与患者关系", "与患者关系：")
-                    .replace("指印", "指印：")
-                    .replace("第1页", "");
+                    .replace("姓名", "姓名：")
+                    .replace("健康号", "健康号：")
+                    .replace("年龄", "年龄：")
+                    .replace("病区", "病区：")
+                    .replace("床号", "床号：")
+                    .replace("入院日期", "入院日期：");
+
 
-            int index1 = htmlContent.indexOf("患者签名");
-            int index2 = htmlContent.lastIndexOf("法定监护人/被授权人签名");
-            if (index1 != -1 && index2 != -1) {
-                htmlContent = htmlContent.substring(0, index1)
-                        + htmlContent.substring(index1, index2).replace("签名时间", "患者签名时间").replace("年    月    日    时    分", "")
-                        + htmlContent.substring(index2).replace("签名时间", "法定监护人签名时间").replace("年    月    日    时    分", "");
-            }
 
             if (StringUtil.isNotBlank(htmlContent)) {
                 htmlContent = htmlContent.replaceAll("[   ]", " ");
                 CommonAnalysisUtil.html2StructureMap(titles, htmlContent, structureMap);
             }
-            structureMap.put("患者签名", structureMap.get("患者签名").replace("患者签名", ""));
-            if (StringUtil.isNotBlank(structureMap.get("法定监护人/被授权人签名"))) {
-                structureMap.put("法定监护人/被授权人签名", structureMap.get("法定监护人/被授权人签名").replace("患方签名", ""));
+            //拆分患方签名时间
+            String s = structureMap.get("患方签名");
+            if (StringUtil.isNotBlank(s)) {
+                int index = s.indexOf("时间：");
+                if (index == -1) {
+                    index = s.indexOf("时间:");
+
+                }
+                if (index != -1) {
+                    structureMap.put("患方签名", s.substring(0, index));
+                    structureMap.put("患方签名时间", s.substring(index + 3));
+                }
             }
-            CommonAnalysisUtil.processTypeRight(structureMap, "3.目前病情评估");
-            CommonAnalysisUtil.processType(structureMap, "6.患方知情选择");
-            CommonAnalysisUtil.processType(structureMap, "指印");
+
             HtmlAnalysisUtil.insertModuleId(modeId, recTypeId, structureMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

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

@@ -9,7 +9,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: