浏览代码

更新测试

MarkHuang 6 年之前
父节点
当前提交
ede2a61c14

+ 0 - 3
graphdb/src/main/java/org/diagbot/repository/BaseNodeRepository.java

@@ -18,7 +18,4 @@ public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
     List<Map<String, Object>> getAllNode();
 
 //    Stream<BaseNode> findAllBy();
-    //get high risk
-    @Query("match(d:Disease) where d.name in {0} return d.name as name, d.high_risk as risk")
-    Map<String,String> getHighRisk(List diagList);
 }

+ 5 - 0
graphdb/src/main/java/org/diagbot/repository/DiseaseRepository.java

@@ -13,4 +13,9 @@ public interface DiseaseRepository extends Neo4jRepository<Disease, Long> {
     // find High Risk Disease
     @Query("MATCH (d:Disease) WHERE d.name in {0} RETURN d.name as name, d.high_risk as risk")
     List<Map<String, Object>> findHighRiskDisease(List<String> diseaselist);
+
+    //get high risk
+    @Query("match(d:Disease) where d.name in {0} return d.name as name, d.high_risk as risk")
+    List<Map<String, Object>> getHighRisk(List diagList);
+
 }

+ 1 - 1
graphdb/src/main/java/org/diagbot/service/KnowledgeService.java

@@ -39,7 +39,7 @@ public interface KnowledgeService {
     List<Map<String, Object>> findHighRiskDisease(QueryVo queryVo);
 
     // 获取高危疾病列表
-    Map<String, String> getHighRiskDisease(SearchData searchData);
+    List<Map<String, Object>> getHighRiskDisease(SearchData searchData);
 
     // 获取推荐项目
     List<Map<String, Object>> getRecommendItem(QueryVo queryVo);

+ 4 - 3
graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -180,14 +180,15 @@ public class KnowledgeServiceImpl implements KnowledgeService {
     }
 
     @Override
-    public Map<String, String> getHighRiskDisease(SearchData searchData) {
+    public List<Map<String, Object>> getHighRiskDisease(SearchData searchData) {
         String diag = searchData.getDiag();
         String[] diseaseArray = diag.split(",|,|、");
         List<String> diseaseList = new ArrayList<>();
         for (String di : diseaseArray) {
-            diseaseList.add("'" + di + "'");
+            diseaseList.add(di);
         }
-        return baseNodeRepository.getHighRisk(diseaseList);
+        List<Map<String, Object>> map = diseaseRepository.getHighRisk(diseaseList);
+        return map;
     }
 
     @Override

+ 1 - 1
graphdb/src/main/java/org/diagbot/web/KnowledgeController.java

@@ -145,7 +145,7 @@ public class KnowledgeController {
      * 获取高危疾病列表
      */
     @RequestMapping("/getHighRisk")
-    public Map<String, String> getHighRisk(@Valid @RequestBody SearchData searchData){
+    public List<Map<String, Object>> getHighRisk(@Valid @RequestBody SearchData searchData){
         return knowledgeService.getHighRiskDisease(searchData);
     }