Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -64,8 +64,6 @@ public class NeoFacade {
     @Autowired
     DiseaseRepository diseaseRepository;
     @Autowired
-    ICDDiseaseRepository icdDiseaseRepository;
-    @Autowired
     MedicineCodeRepository medicineCodeRepository;
     @Autowired
     ChiefPresentSimilarityServiceClient chiefPresentSimilarityServiceClient;
@@ -120,10 +118,9 @@ public class NeoFacade {
     public Map<String, List<String>> getSimilarCache() {
         Map<String, List<String>> res = new HashMap<>();
         // 临床表现，诊断，化验，辅检，药品，查体，手术
-        res.put(StandConvertEnum.disease.getName(), getDiseaseList());
         // TODO 测试数据
         res.put(StandConvertEnum.clinical.getName(), Arrays.asList("胸痛","咳嗽"));
-//        res.put(StandConvertEnum.disease.getName(), Arrays.asList("高血压", "糖尿病"));
+        res.put(StandConvertEnum.disease.getName(), Arrays.asList("高血压", "糖尿病"));
         return res;
     }
 
@@ -205,14 +202,6 @@ public class NeoFacade {
     }
 
 
-    public List<String> getDiseaseList() {
-
-        ICDDiseaseNode diseaseNode = new ICDDiseaseNode();
-        List<String> diseaselist = diseaseNode.getDiseaseNameList(icdDiseaseRepository);
-
-        return diseaselist;
-    }
-
 
 
     public Map<String, PushDTO> getDiag(List<String> diaglist) {

src/main/java/com/diagbot/facade/RetrievalFacade.java

@@ -1,9 +1,14 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.repository.ICDDiseaseNode;
+import com.diagbot.repository.ICDDiseaseRepository;
 import com.diagbot.vo.RetrievalVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -12,6 +17,9 @@ import org.springframework.stereotype.Component;
 @Component
 public class RetrievalFacade {
 
+    @Autowired
+    ICDDiseaseRepository icdDiseaseRepository;
+
     /**
      * 检索
      *
@@ -20,6 +28,24 @@ public class RetrievalFacade {
      */
     public RetrievalDTO index(RetrievalVO retrievalVO) {
         RetrievalDTO retrievalDTO = new RetrievalDTO();
+
+        if (retrievalVO.getType()==1) {
+            retrievalDTO.setDiseaseNames(getDiseaseList());
+        }
+
         return retrievalDTO;
     }
+
+
+    /*
+     * 获取疾病名称列表
+     */
+    public List<String> getDiseaseList() {
+
+        ICDDiseaseNode diseaseNode = new ICDDiseaseNode();
+        List<String> diseaselist = diseaseNode.getDiseaseNameList(icdDiseaseRepository);
+
+        return diseaselist;
+    }
+
 }