Merge remote-tracking branch 'origin/push-0710' into push-dev

graph-web/src/main/java/org/diagbot/graphWeb/work/DiseaseCalculate.java

@@ -43,10 +43,10 @@ public class DiseaseCalculate {
         responseData.setMedicalIndications(medicalIndications);
 
         //走管理评估
-        Map managementEvaluation = diseaseResponse.getManagementEvaluation();
-        Map test = this.getMan(managementEvaluation);
-
-        responseData.setManagementEvaluation(test);
+//        Map managementEvaluation = diseaseResponse.getManagementEvaluation();
+//        Map test = this.getMan(managementEvaluation);
+//
+//        responseData.setManagementEvaluation(test);
         responseData.setTreat(treat);
         responseData.setDis(diseaseName);
         return responseData;
@@ -115,6 +115,9 @@ public class DiseaseCalculate {
                                 newMedicitionsList.add(newMedication);
                             }
                         }
+                        if(bigdrugsName.equals(subdrugsName)){
+                            subdrugsName = "";
+                        }
                         drugs.setBigdrugsName(bigdrugsName);
                         drugs.setSubdrugsName(subdrugsName);
                         drugs.setDrugsForbidden(drugsForbidden);

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

@@ -879,11 +879,12 @@ public class Neo4jAPI {
                     }
                 }
             }
-            //判断急诊
-            Set<String> disSet = diseaseCondition.keySet();
             List<String> newDis = new ArrayList<>();
-            if(disSet.size()>0){
-                for (String dis:disSet) {
+            //判断急诊和警惕
+            for (Map.Entry<String, Map<String, String>> fs:diseaseCondition.entrySet()) {
+                String dis = fs.getKey();
+                Set<String> leiSet = fs.getValue().keySet();
+                if(leiSet.contains("确诊")){
                     newDis.add("\""+dis+"\"");
                 }
             }
@@ -893,10 +894,18 @@ public class Neo4jAPI {
                 while (result.hasNext()) {
                 Record record = result.next();
                 String emDis = record.get("emDis").toString();
+                int em = record.get("em").asInt();//急诊
+                int hi = record.get("hi").asInt();//警惕
                 Map<String, String> stringStringMap = diseaseCondition.get(emDis.replace("\"", ""));
-                stringStringMap.put("急诊", "");
+                if(em == 1){
+                    stringStringMap.put("急诊", "");
+                }
+                if(hi == 1){
+                    stringStringMap.put("警惕", "");
+                }
                 diseaseCondition.put(emDis.replace("\"", ""), stringStringMap);
             }
+
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

graph/src/main/resources/bolt.properties

@@ -87,8 +87,8 @@ searchBigSubDrugs=match (n:Disease{name:diseaseName})-[r0:\u63A8\u8350]->(m:Drug
 #\u67E5\u627E\u9274\u522B\u8BCA\u65AD\u7684\u8BED\u53E5
 searchDifferentialDiagnose=match(d:Disease)-[r:\u9274\u522B\u8BCA\u65AD]->(h) where d.name='mainDis' return collect(h.name) as coll
 
-#\u5224\u65AD\u662F\u5426\u4E3A\u6025\u8BCA\u7684\u8BED\u53E5
-searchEmergency=match(d:Disease) where d.name in disList and d.emergency=1 return d.name as emDis
+#\u5224\u65AD\u662F\u5426\u4E3A\u6025\u8BCA,\u8B66\u60D5\u7684\u8BED\u53E5
+searchEmergency=match(d:Disease) where d.name in disList return d.name as emDis,d.emergency as em,d.high_risk as hi
 
 #\u67E5\u627E\u6307\u6807\u7684\u8BED\u53E5
 searchIndication=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:Indicators)\n \