|
@@ -104,11 +104,27 @@ public class PushTreat {
|
|
}
|
|
}
|
|
LinkedHashMap<String,List<Drugs>> kk = new LinkedHashMap<>();
|
|
LinkedHashMap<String,List<Drugs>> kk = new LinkedHashMap<>();
|
|
List<MeditionDetail> meditionDetails = td.getMeditionDetails();
|
|
List<MeditionDetail> meditionDetails = td.getMeditionDetails();
|
|
|
|
+ String description ="";
|
|
for (MeditionDetail m:meditionDetails) {
|
|
for (MeditionDetail m:meditionDetails) {
|
|
- String description = m.getDescription();
|
|
|
|
|
|
+ description = m.getDescription();
|
|
List<Drugs> treatment = m.getTreatment();
|
|
List<Drugs> treatment = m.getTreatment();
|
|
kk.put(description,treatment);
|
|
kk.put(description,treatment);
|
|
}
|
|
}
|
|
|
|
+ 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)){
|
|
|
|
+ int type = getType(key.split(":")[0]);//原来的
|
|
|
|
+ int type1 = getType(description.split(":")[0]);//新来的
|
|
|
|
+ if(type>type1){
|
|
|
|
+ continue;
|
|
|
|
+ }else if(type<type1){
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
fi.put(disList,kk);
|
|
fi.put(disList,kk);
|
|
}
|
|
}
|
|
}
|
|
}
|