数据分析更新

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/XmlDataAnalysisFacade.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -301,11 +302,11 @@ public class XmlDataAnalysisFacade {
     }
 
     private Set<String> getKeys(long hospitalId, long modelId, String recTitle, String sex, String xml) throws Exception {
-        Set<String> keys = Sets.newHashSet();
+        Set<String> keys = new HashSet<>();
         if (hospitalId == 1) {
-            keys = CxXmlUtil.firstLevelNodeValue(xml).keySet();
+            keys.addAll(CxXmlUtil.firstLevelNodeValue(xml).keySet());
         } else if (hospitalId == 3) {
-            keys = TzXmlUtil.getXmlToMapForTZ(xml).keySet();
+            keys.addAll(TzXmlUtil.getXmlToMapForTZ(xml).keySet());
         }
         if (keys.size() > 0) {
             if (StringUtil.isNotBlank(sex)) {