Merge branch 'master' of E:\ideaProject\push236 with conflicts.

graphdb/src/main/java/org/diagbot/repository/BaseNodeRepository.java

@@ -18,4 +18,7 @@ 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, Object> getHighRisk(List diagList);
 }

graphdb/src/main/java/org/diagbot/service/KnowledgeService.java

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

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -185,9 +185,9 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         String[] diseaseArray = diag.split(",|，|、");
         List<String> diseaseList = new ArrayList<>();
         for (String di : diseaseArray) {
-            diseaseList.add(di);
+            diseaseList.add("'" + di + "'");
         }
-        List<Map<String, Object>> map = diseaseRepository.getHighRisk(diseaseList);
+        Map<String, Object> map = baseNodeRepository.getHighRisk(diseaseList);
         return map;
     }