|
@@ -2,11 +2,13 @@ package com.diagbot.facade;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.diagbot.biz.push.entity.Lis;
|
|
|
-import com.diagbot.biz.push.entity.Pacs;
|
|
|
import com.diagbot.client.ChiefPresentSimilarityServiceClient;
|
|
|
import com.diagbot.client.StandConvertServiceClient;
|
|
|
import com.diagbot.dto.*;
|
|
|
-import com.diagbot.entity.node.*;
|
|
|
+import com.diagbot.entity.node.LisRemind;
|
|
|
+import com.diagbot.entity.node.Medicine;
|
|
|
+import com.diagbot.entity.node.Symptom;
|
|
|
+import com.diagbot.entity.node.YiBaoDiseaseName;
|
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
@@ -229,7 +231,9 @@ public class NeoFacade {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- Map<String, Long> disCountSortMap = disCountSort(allDis);
|
|
|
+ Map<Long,List<String>> numberDiseasesMap = disCountSort(allDis);
|
|
|
+ //根据发病率排序
|
|
|
+
|
|
|
// String dis_first = dis_count.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).get(0);
|
|
|
|
|
|
return neoPushDTOS;
|
|
@@ -275,7 +279,7 @@ public class NeoFacade {
|
|
|
* @param allDis
|
|
|
* @return
|
|
|
*/
|
|
|
- public Map<String, Long> disCountSort(List<String> allDis) {
|
|
|
+ public Map<Long,List<String>> disCountSort(List<String> allDis) {
|
|
|
Map<String, Long> dis_count = allDis.stream().collect(
|
|
|
|
|
|
Collectors.groupingBy(Function.identity(), Collectors.counting())
|
|
@@ -292,7 +296,19 @@ public class NeoFacade {
|
|
|
}).get();
|
|
|
|
|
|
}
|
|
|
- return dis_count;
|
|
|
+ Map<Long,List<String>> number_diseases = new LinkedHashMap<>();
|
|
|
+ dis_count.forEach((x,y)->{
|
|
|
+ if(number_diseases.containsKey(y)){
|
|
|
+ List<String> diseases = number_diseases.get(y);
|
|
|
+ diseases.add(x);
|
|
|
+ number_diseases.put(y,diseases);
|
|
|
+ }else {
|
|
|
+ List<String> diseases = Lists.newArrayList();
|
|
|
+ diseases.add(x);
|
|
|
+ number_diseases.put(y,diseases);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return number_diseases;
|
|
|
}
|
|
|
|
|
|
/**
|