Merge remote-tracking branch 'origin/master'

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

@@ -16,12 +16,11 @@ public class DiagnoseMain {
 //                "侵袭性骨破坏","右上腹痛","向右背部放射","墨菲斯征阳性","白细胞增多","不洁饮食","胆囊内有强回声团");
 //        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
 //                "上腹痛","墨菲斯征阳性","白细胞增多","不洁饮食","胆囊内有强回声团");
-//        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
-//                "咽痛","鼻塞","乏力","淋巴结肿大","扁桃体肿大","上腹痛","墨菲斯征阳性","白细胞增多","不洁饮食","胆囊内有强回声团","近端指间关节炎","足关节炎","对称性关节肿胀",
-//                "晨僵≥30分钟","类风湿因子阳性","抗CCP抗体阳性","胸腔积液","呼吸音减弱","发热","胸痛","呼吸困难","咳嗽");
         Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
                 "咽痛","鼻塞","乏力","淋巴结肿大","扁桃体肿大","上腹痛","墨菲斯征阳性","白细胞增多","不洁饮食","胆囊内有强回声团","近端指间关节炎","足关节炎","对称性关节肿胀",
-                "晨僵≥30分钟","类风湿因子阳性","抗CCP抗体阳性","胸腔积液","呼吸音减弱","发热","咳嗽");
+                "晨僵≥30分钟","类风湿因子阳性","抗CCP抗体阳性","胸腔积液","呼吸音减弱","发热","胸痛","呼吸困难","咳嗽");
+//        Map<String, String> diagnose = new DiagnoseProcess().getDiagnose(
+//              "耳鸣","视力下降","EB病毒早期抗原(EA-IgA)升高","咽部充血");
         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

@@ -11,7 +11,7 @@ public class DiagnoseProcess {
     PropertiesUtil propertiesUtil = new PropertiesUtil("bolt.properties");
     protected Map<String,String> getDiagnose(String ...filds) throws Exception {
         Map<String,String> quezhenDiagnose = new LinkedHashMap<>();
-        List<String> startList = new ArrayList<>();
+        Set<String> startList = new HashSet<>();
         List<String> newList = new ArrayList<>();
         for (String fild:filds) {
             startList.add("\""+fild+"\"");
@@ -41,9 +41,18 @@ 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);
+                }
             }
         }
+        System.out.println(startList);
         newList.addAll(startList);
         int i =0;
         //第二步查找能推诊断

graph/src/main/java/org/diagbot/graph/encryptionNeo4j/ReadNeo4jData2Neo4j.java

@@ -26,7 +26,7 @@ public class ReadNeo4jData2Neo4j{
         StatementResult result =null;
         session = driver233.session(AccessMode.WRITE);
         //把233的数据存到232,包括症状,体征,化验,辅检,诊断依据
-//        from233to232(nodeRelationUtil, driver232, session);
+//        from233to232(diseaseArray,nodeRelationUtil, driver232, session);
         //把233的治疗数据存入232,用药数据
        from233treatto232(diseaseArray,nodeRelationUtil, driver232, session);
         session.close();