Merge branch 'master' of http://192.168.2.236:10080/louhr/qc

Conflicts:
	trans/src/main/java/com/lantone/qc/trans/taizhou/util/TzXmlUtil.java

kernel/pom.xml

@@ -98,7 +98,7 @@
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
-			<version>2.6.12</version>
+			<version>2.6.10</version>
 		</dependency>
 	</dependencies>
 

trans/src/main/java/com/lantone/qc/trans/taizhou/util/TzXmlUtil.java

@@ -21,7 +21,7 @@ public class TzXmlUtil {
         Map<String, String> retMap = Maps.newHashMap();
         try {
             Document doc = DocumentHelper.parseText(xml);
-            List<Element> emrTermElements = doc.getRootElement().element("emr_xml_root").element("TermList").elements("EMR-TERM");
+            List<Element> emrTermElements = doc.getRootElement().element("TermList").elements("EMR-TERM");
             emrTermElements.forEach(emrTermElement -> {
                 retMap.put(
                         StringUtil.removeBlank(emrTermElement.attributeValue("ename")),
@@ -53,7 +53,7 @@ public class TzXmlUtil {
     }
 
     public static void main(String[] args) {
-        String msg = FileUtil.fileRead("C:\\Users\\RGB\\Desktop\\调试\\入院记录.txt");
+        String msg = FileUtil.fileRead("C:\\Users\\RGB\\Desktop\\调试\\台州出院小结.xml");
         Map<String, String> map = getXmlToMapForTZ(msg);
         map.keySet().forEach(key -> {
             System.out.println("\"" + key + "=\",");