反推症状、体征、化验、辅检按照nodeid排序

src/main/java/com/diagbot/process/PushProcess.java

@@ -41,12 +41,12 @@ public class PushProcess {
         NeoPushVO pushVO = commonFacade.generatePushInput(wordCrfDTO);
         Map<String, List<PushBaseDTO>> dis = new HashMap<>();
         //如果下的诊断有数据就反推
-        if (pushVO.getDiagVo() != null && pushVO.getDiagVo().getDiags().size() > 0) {
+        if (pushVO.getDiagVo() != null && ListUtil.isNotEmpty(pushVO.getDiagVo().getDiags())) {
             reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO, dis);
         } else {
             //正推
             List<NeoPushDTO> push = neoFacade.getPush(pushVO);
-            if (ListUtil.isNotEmpty(push) && push.size() > 0) {
+            if (ListUtil.isNotEmpty(push)) {
                 //先把所有疾病推出来
                 if (ruleTypeList.contains("7")) {
                     List<PushBaseDTO> diseeases = push.stream().filter(x -> x.getDisease() != null).map(x -> x.getDisease()).collect(Collectors.toList());

src/main/java/com/diagbot/repository/YiBaoDiseaseNode.java

@@ -8,9 +8,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 import com.diagbot.vo.NeoPushVO;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class YiBaoDiseaseNode {
@@ -28,16 +26,21 @@ public class YiBaoDiseaseNode {
 			pushBaseDTO = new PushBaseDTO();
 			pushBaseDTO.setName(disease.getName());
 			pushDTO.setDisease(pushBaseDTO);
-			Set<Symptom> symptoms = disease.getSymptoms();
-//			disease.getSymptoms().stream().collect(Collectors.toMap(Symptom::getName,Symptom::getNodeId,(e1, e2) -> e2)))
+			pushDTO.setSymptoms(disease.getSymptoms().stream().collect(Collectors.toMap(Symptom::getName,Symptom::getNodeId,(e1, e2) -> e2))
+					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setSymptoms(disease.getSymptoms().stream().map(x ->NeoUtil.updatePushInfo(x.getName())).collect(Collectors.toList()));
+			pushDTO.setVitals(disease.getVitals().stream().collect(Collectors.toMap(Vital::getName,Vital::getNodeId,(e1, e2) -> e2))
+					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setVitals(disease.getVitals().stream().map(x ->NeoUtil.updatePushInfo(x.getName())).collect(Collectors.toList()));
+			pushDTO.setLis(disease.getLisnames().stream().collect(Collectors.toMap(LisName::getName,LisName::getNodeId,(e1, e2) -> e2))
+					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));
 
-			pushDTO.setLis(disease.getLisnames().stream().map(x ->NeoUtil.updatePushInfo(x.getName())).collect(Collectors.toList()));
-
-			pushDTO.setPacs(disease.getPacsnames().stream().map(x ->NeoUtil.updatePushInfo(x.getName())).collect(Collectors.toList()));
+			pushDTO.setPacs(disease.getPacsnames().stream().collect(Collectors.toMap(PacsName::getName,PacsName::getNodeId,(e1, e2) -> e2))
+					.entrySet().stream().sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
+					.map(x ->NeoUtil.updatePushInfo(x.getKey())).collect(Collectors.toList()));