Merge remote-tracking branch 'origin/master'

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -656,6 +656,7 @@ public class Neo4jAPI {
             fildList.add("\"" + fild.trim() + "\"");
         }
         logger.info("根据 " + fildList + " 这些词推送图谱诊断!!!");
+//        System.out.println("原始词为:\n"+fildList);
         Session session = null;
         StatementResult result = null;
         String query = "";
@@ -663,7 +664,8 @@ public class Neo4jAPI {
             session = driver.session(AccessMode.WRITE);
             logger.info("session 为: " + session);
             //第一步查询是否有组合的词
-            query = propertiesUtil.getProperty("searchCollection").replace("fildList", fildList.toString());
+            query = propertiesUtil.getProperty("searchCollection1").replace("fildList", fildList.toString());
+//            System.out.println("查找是否有组合词语句:\n"+query);
             result = session.run(query);
             while (result.hasNext()) {
                 Record next = result.next();
@@ -694,7 +696,9 @@ public class Neo4jAPI {
             newList.addAll(fildList);
             int i = 0;
             while (newList.size() > 0) {
-                query = propertiesUtil.getProperty("searchCondition").replace("newList", newList.toString()).replace("fildList", fildList.toString());
+                query = propertiesUtil.getProperty("searchCondition1").replace("newList", newList.toString()).replace("fildList", fildList.toString());
+//                System.out.println("第"+i+"次的查询语句为: \n"+query);
+                i++;
                 result = session.run(query);
                 newList.clear();
                 while (result.hasNext()) {
@@ -710,6 +714,7 @@ public class Neo4jAPI {
             }
             //第三步查找确诊
             query = propertiesUtil.getProperty("searchQuezhen").replace("fildList", fildList.toString());
+//            System.out.println("查找确诊的语句为: \n"+query);
             result = session.run(query);
             while (result.hasNext()) {
                 Record record = result.next();

graph/src/main/resources/bolt.properties

@@ -42,9 +42,9 @@ return m.name as condition, count(distinct r)>=m.path as jundgement, labels(m)[0
 
 searchCondition1=match (l)-[r:\u8BCA\u65AD\u4F9D\u636E]->(m)\n \
 where l.name in newList\n \
-with m,fildList\n \
+with m,fildList as data\n \
 match (n)-[r:\u8BCA\u65AD\u4F9D\u636E]->(m)\n \
-where n.name in fildList\n \
+where n.name in data\n \
 return m.name as condition, count(distinct r)>=m.path as jundgement, labels(m)[0] as label
 #\u67E5\u627E\u786E\u8BCA,\u62DF\u8BCA\u7684\u8BED\u53E5
 searchQuezhen=match (n)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:Disease)\n \