Merge remote-tracking branch 'origin/master'

# Conflicts:
#	graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

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")
+    List<Map<String, Object>> getHighRisk(List diagList);
 }

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

@@ -180,20 +180,11 @@ 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 = Arrays.asList(diseaseArray);
-
-        Map<String, String> map = new HashMap<>();
-        List<Map<String, Object>> list = diseaseRepository.getHighRisk(diseaseList);
-
-        for (Map hrmap:list) {
-            String name = hrmap.get("name").toString();
-            String risk = hrmap.get("risk").toString();
-            map.put(name, risk);
-        }
-
+        List<Map<String, Object>> map = baseNodeRepository.getHighRisk(diseaseList);
         return map;
     }