|
@@ -212,15 +212,29 @@ public class PushTreat {
|
|
|
return treatDetailList;
|
|
|
}
|
|
|
private void addColl(Map<String,List<String>> condiTypedis,Map<String,Map<String,Object>> disDrugs){
|
|
|
- List<List<String>> collList = new ArrayList<>();
|
|
|
if(condiTypedis!= null &&condiTypedis.size()>0){
|
|
|
for (Map.Entry<String,List<String>> ctd:condiTypedis.entrySet()) {
|
|
|
- if(disDrugs.containsKey(ctd.getKey().split("&")[1])){
|
|
|
- Map<String, Object> objectMap = disDrugs.get(ctd.getKey().split("&")[1]);
|
|
|
- List<String> value = ctd.getValue();
|
|
|
- collList.add(value);
|
|
|
- objectMap.put("coll",collList);
|
|
|
- disDrugs.put(ctd.getKey().split("&")[1],objectMap);
|
|
|
+ String name = ctd.getKey().split("&")[1];
|
|
|
+ String type = ctd.getKey().split("&")[0];//主症或并发症
|
|
|
+ if(disDrugs.containsKey(name)){
|
|
|
+
|
|
|
+ Map<String, Object> objectMap = disDrugs.get(name);
|
|
|
+ List<String> cateList = (List<String>) objectMap.get("cate");
|
|
|
+ int index = cateList.indexOf(type);
|
|
|
+ if(objectMap.containsKey("coll")){
|
|
|
+ List<Object> list = (List<Object>) objectMap.get("coll");
|
|
|
+ List<String> v = new ArrayList<>();
|
|
|
+ v.addAll(ctd.getValue());
|
|
|
+ list.add(index,v);
|
|
|
+ objectMap.put("coll",list);
|
|
|
+ }else {
|
|
|
+ List<Object> list = new ArrayList<>();
|
|
|
+ List<String> v = new ArrayList<>();
|
|
|
+ v.addAll(ctd.getValue());
|
|
|
+ list.add(v);
|
|
|
+ objectMap.put("coll",list);
|
|
|
+ }
|
|
|
+ disDrugs.put(name,objectMap);
|
|
|
}
|
|
|
|
|
|
}
|