治疗方案合并

graph/src/main/java/org/diagbot/graph/medicationProcess/PushTreat.java

@@ -110,13 +110,14 @@ public class PushTreat {
                     List<Drugs> treatment = m.getTreatment();
                     kk.put(description,treatment);
                 }
-                /*if(fi.containsKey(disList)){
+                if(fi.containsKey(disList)){
                     LinkedHashMap<String, List<Drugs>> jj = fi.get(disList);
                     Map.Entry<String, List<Drugs>> next = jj.entrySet().iterator().next();
                     String key = next.getKey();
-                    if(!key.equals(description)){
+                    String key1 = meditionDetails.get(0).getDescription();
+                    if(!key.equals(key1)){
                         int type = getType(key.split(":")[0]);//原来的
-                        int type1 = getType(description.split(":")[0]);//新来的
+                        int type1 = getType(key1.split(":")[0]);//新来的
                         if(type>type1){
                             continue;
                         }else if(type<type1){
@@ -124,7 +125,7 @@ public class PushTreat {
                         }
 
                     }
-                }*/
+                }
                 fi.put(disList,kk);
             }
         }