Merge remote-tracking branch 'origin/master'

graph/src/main/java/org/diagbot/graph/Diagnose/DiagnoseMain.java

@@ -14,10 +14,11 @@ public class DiagnoseMain {
 //                "咽痛","鼻塞","乏力","淋巴结肿大","扁桃体肿大","上腹痛","墨菲斯征阳性","白细胞增多","不洁饮食","胆囊内有强回声团","近端指间关节炎","足关节炎","对称性关节肿胀",
 //                "晨僵≥30分钟","类风湿因子阳性","抗CCP抗体阳性","胸腔积液","呼吸音减弱","发热","胸痛","呼吸困难","咳嗽","听力下降","传导性耳聋","白细胞计数(WBC)升高","鼓膜穿孔",
 //                "耳鸣","视力下降","EB病毒早期抗原(EA-IgA)升高","咽部充血");
-        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
-                  "耳鸣","视力下降","EB病毒早期抗原(EA-IgA)升高","咽部充血","暴饮暴食","右上腹痛","胸痛", "放射", "左肩", "胸闷", "第二心音","逆分裂","高血压");
 //        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
-//                "听力下降","传导性耳聋","白细胞计数(WBC)升高","鼓膜穿孔");
+//                  "耳鸣","视力下降","EB病毒早期抗原(EA-IgA)升高","咽部充血","暴饮暴食","右上腹痛","胸痛", "放射", "左肩", "胸闷", "第二心音","逆分裂","高血压");
+        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
+                "恶心","二便正常","右上腹痛","右上腹","上腹隐痛","放射","背部","畏寒","呕吐","腹痛","绞痛","Murphy征阳性","阵发性","发热","肌紧张","暴饮暴食"
+        ,"反跳痛","突发");
         for (Map.Entry<String,String> disease:diagnose.entrySet()) {
             System.out.println(disease.getKey()+"\t"+disease.getValue());
         }

graph/src/main/java/org/diagbot/graph/Diagnose/DiagnoseProcess.java

@@ -23,6 +23,7 @@ public class DiagnoseProcess {
         Session session = driver.session(AccessMode.READ);
         //第一步查询是否有组合的词
         query = propertiesUtil.getProperty("searchCollection").replace("fildList",startList.toString());
+        System.out.println(query);
         run = session.run(query);
         while (run.hasNext()){
             Record next = run.next();
@@ -35,6 +36,7 @@ public class DiagnoseProcess {
 
         //第一步查找近义词
         query = propertiesUtil.getProperty("serchCollect").replace("fildList",startList.toString());
+        System.out.println(query);
         run = session.run(query);
         while (run.hasNext()){
             Record record = run.next();
@@ -50,16 +52,17 @@ public class DiagnoseProcess {
                     startList.remove(fild);
                     startList.add(js);
                 }
-            }else {
-                startList.add(fild);
-                query = "match(l)-[r:近义词]->(h) where l.name="+fild+" return h.name as js";
-                StatementResult run1 = session.run(query);
-                while (run1.hasNext()){
-                    Record next = run1.next();
-                    String js = next.get("js").toString();
-                    startList.add(js);
-                }
             }
+//            else {
+//                startList.add(fild);
+//                query = "match(l)-[r:近义词]->(h) where l.name="+fild+" return h.name as js";
+//                StatementResult run1 = session.run(query);
+//                while (run1.hasNext()){
+//                    Record next = run1.next();
+//                    String js = next.get("js").toString();
+//                    startList.add(js);
+//                }
+//            }
         }
         System.out.println(startList);
         newList.addAll(startList);

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

@@ -680,16 +680,17 @@ public class Neo4jAPI {
                         fildList.remove(fild);
                         fildList.add(js);
                     }
-                }else {
-                    fildList.add(fild);
-                    query = "match(l)-[r:近义词]->(h) where l.name="+fild+" return h.name as js";
-                    StatementResult run1 = session.run(query);
-                    while (run1.hasNext()){
-                        Record next = run1.next();
-                        String js = next.get("js").toString();
-                        fildList.add(js);
-                    }
                 }
+//                else {
+//                    fildList.add(fild);
+//                    query = "match(l)-[r:近义词]->(h) where l.name="+fild+" return h.name as js";
+//                    StatementResult run1 = session.run(query);
+//                    while (run1.hasNext()){
+//                        Record next = run1.next();
+//                        String js = next.get("js").toString();
+//                        fildList.add(js);
+//                    }
+//                }
             }
             newList.addAll(fildList);
             int i = 0;