配置和解析工具修改

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/qdnzyy/QdnzyyXmlUtil.java

@@ -24,11 +24,12 @@ public class QdnzyyXmlUtil {
         Map<String, String> map = Maps.newHashMap();
         try {
             Document doc = DocumentHelper.parseText(xml);
-            Element root = (Element) doc.selectSingleNode("//XTextDocument/XElements/Element[@xsi:type='XTextBody']/XElements");
-            findElement(root, "XInputField").forEach(i -> {
+//            Element root = (Element) doc.selectSingleNode("//CDR/body/Element[@xsi:type='XTextBody']/XElements");
+            Element root = (Element) doc.selectSingleNode("//CDR/body/structureBody/component/table");
+            findElement(root, "paragraph").forEach(i -> {
                 xInputField(map, i, null);
             });
-            findElement(root, "XTextTable").forEach(tableElement -> {
+            findElement(root, "paragraph").forEach(tableElement -> {
                 String tablePreTxt = getElementPreVal(tableElement);
                 findElement(tableElement.element("XElements"), "XTextTableRow").forEach(rowElement -> {
                     findElement(rowElement.element("XElements"), "XTextTableCell").forEach(cellElement -> {
@@ -54,7 +55,10 @@ public class QdnzyyXmlUtil {
     public static List<Element> findElement(Element element, String attual) {
         List<Element> ret = Lists.newArrayList();
         ((List<Element>) (element.elements())).forEach(i -> {
-            if (StringUtil.isNotBlank(i.attributeValue("type")) && i.attributeValue("type").equals(attual)) {
+//            if (StringUtil.isNotBlank(i.attributeValue("type")) && i.attributeValue("type").equals(attual)) {
+//                ret.add(i);
+//            }
+            if (i.content()!=null){
                 ret.add(i);
             }
         });
@@ -146,7 +150,7 @@ public class QdnzyyXmlUtil {
     }
 
     public static void main(String[] args) {
-        xmlToMap(FileUtil.fileRead("C:\\Users\\Administrator\\Desktop\\义务\\jiexi\\n5.xml"));
+        xmlToMap(FileUtil.fileRead("C:\\Users\\DELL\\Desktop\\qdnzyy\\ruyuanjl.xml"));
     }
 
 }

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

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

kernel/src/main/resources/bootstrap.yml

@@ -18,10 +18,10 @@ spring:
   resources:
     static-locations: classpath:/
   profiles:
-    active: local
+    active: test
 
 qc:
-  hospital_id: 1,2,3,4,5,6,7,8,10,11,13,15,20,21,22,23,24,34,35,36
+  hospital_id: 1,2,3,4,5,6,7,8,10,11,13,15,20,21,22,23,24,34,35,36,38
 
 logging:          # 日志
   config: classpath:logback-spring.xml

trans/src/main/java/com/lantone/qc/trans/qdnzyy/BeHospitalizedDocTrans.java

@@ -2,6 +2,7 @@ package com.lantone.qc.trans.qdnzyy;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.lantone.qc.dbanaly.facade.qdnzyy.QdnzyyXmlUtil;
 import com.lantone.qc.dbanaly.facade.shengzhouzz.ShengzhouyyXmlUtil;
 import com.lantone.qc.dbanaly.util.ModuleMappingUtil;
 import com.lantone.qc.dbanaly.util.SpecialStorageUtil;
@@ -44,7 +45,7 @@ public class BeHospitalizedDocTrans extends ModelDocTrans {
         if (contentMap.get("isParsed") != null && "1".equals(contentMap.get("isParsed").toString())) {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
-            Map<String, String> sourceMap = ShengzhouyyXmlUtil.xmlToMap(content);
+            Map<String, String> sourceMap = QdnzyyXmlUtil.xmlToMap(content);
             sourceMap.put("mode_id", ModuleMappingUtil.getDeptModuleId(modeId));
             String text = sourceMap.get("原始文本").replace("：", ":").replaceAll("■", "");
             List<String> titles = Lists.newArrayList(