推送警惕bug修复

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -793,7 +793,7 @@ public class Neo4jAPI {
      * @return
      */
     public Map<String, Map<String, String>> getNewCondition(String[] keys, String webDiag) {
-//        Map<String, Map<String, String>> diseaseCondition = new LinkedHashMap<>();
+        Map<String, Map<String, String>> diseaseCondition = new LinkedHashMap<>();
         Map<String,Map<String,String>> neoPushMap = new HashMap<>();
         List<String> newList = new ArrayList<>();
         List<String> fildList = new ArrayList<>();
@@ -858,19 +858,7 @@ public class Neo4jAPI {
                     newMap.put(que,"");
                     neoPushMap.put(quezhenName,newMap);
                 }
-//                if ("确诊".equals(conditionType)) {
-//                    quezhen.add(quezhenName);
-//                } else if ("拟诊".equals(conditionType)) {
-//                    quezhen.add(quezhenName);
-//                }
-            }
-//            for (String qu : quezhen) {
-//                Map<String, String> dis_res = new HashMap<>();
-//                dis_res.put("确诊", "");
-//                diseaseCondition.put(qu, dis_res);
-//                logger.info("图谱推出的诊断为: " + qu);
-//            }
-
+            }
             Map<String,Map<String,String>> queHighMap = new HashMap<>();
             Map<String,Map<String,String>> highMap = new HashMap<>();
             Map<String,Map<String,String>> quezhenMap = new HashMap<>();
@@ -893,14 +881,14 @@ public class Neo4jAPI {
                     Map<String,String> k = new HashMap<>();
                     k.put("确诊","");
                     k.put("警惕","");
-                    neoPushMap.put(dis,k);
+                    diseaseCondition.put(dis,k);
                 }
                 if(quezhenMap != null && quezhenMap.size()>0){
                     Set<String> queDis = quezhenMap.keySet();
                     for (String dis:queDis) {
                         Map<String,String> k = new HashMap<>();
                         k.put("确诊","");
-                        neoPushMap.put(dis,k);
+                        diseaseCondition.put(dis,k);
                     }
                 }
             }else {
@@ -909,7 +897,7 @@ public class Neo4jAPI {
                     for (String dis:queDis) {
                         Map<String,String> k = new HashMap<>();
                         k.put("确诊","");
-                        neoPushMap.put(dis,k);
+                        diseaseCondition.put(dis,k);
                     }
                 }
                 if(highMap != null && highMap.size()>0){
@@ -917,15 +905,11 @@ public class Neo4jAPI {
                     for (String dis:highSet) {
                         Map<String,String> k = new HashMap<>();
                         k.put("警惕","");
-                        neoPushMap.put(dis,k);
+                        diseaseCondition.put(dis,k);
                     }
                 }
             }
-
-
-
-
-            Set<String> queSets = neoPushMap.keySet();
+            Set<String> queSets = diseaseCondition.keySet();
             if (webDiag != null && webDiag.trim() != "") {
                 String[] webDiagSplits = webDiag.split(",");
                 String mainDiag = webDiagSplits[0];
@@ -938,13 +922,13 @@ public class Neo4jAPI {
                     if (coll != null && coll.size() > 0) {
                         for (Object o : coll) {
                             if (queSets.contains(o.toString().replace("\"", ""))) {
-                                Map<String, String> stringStringMap = neoPushMap.get(o.toString().replace("\"", ""));
+                                Map<String, String> stringStringMap = diseaseCondition.get(o.toString().replace("\"", ""));
                                 stringStringMap.put("鉴别诊断", "");
-                                neoPushMap.put(o.toString().replace("\"", ""), stringStringMap);
+                                diseaseCondition.put(o.toString().replace("\"", ""), stringStringMap);
                             } else {
                                 Map<String, String> diffMap = new HashMap<>();
                                 diffMap.put("鉴别诊断", "");
-                                neoPushMap.put(o.toString().replace("\"", ""), diffMap);
+                                diseaseCondition.put(o.toString().replace("\"", ""), diffMap);
                             }
                         }
                     }
@@ -952,7 +936,7 @@ public class Neo4jAPI {
             }
             List<String> newDis = new ArrayList<>();
             //判断急诊
-            for (Map.Entry<String, Map<String, String>> fs:neoPushMap.entrySet()) {
+            for (Map.Entry<String, Map<String, String>> fs:diseaseCondition.entrySet()) {
                 String dis = fs.getKey();
                 Set<String> leiSet = fs.getValue().keySet();
                 if(leiSet.contains("确诊")){
@@ -970,14 +954,14 @@ public class Neo4jAPI {
                 if(em == 1){
                     stringStringMap.put("急诊", "");
                 }
-                neoPushMap.put(emDis.replace("\"", ""), stringStringMap);
+                    diseaseCondition.put(emDis.replace("\"", ""), stringStringMap);
             }
 
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
             CloseSession(session);
-            return neoPushMap;
+            return diseaseCondition;
         }
     }