Merge remote-tracking branch 'origin/push-dev-edite' into push-debug

common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -381,7 +381,7 @@ public class CacheFileManager {
             }
             fw.close();
 
-            sql = "SELECT id, rule_id, rule_type, remind FROM kl_rule_app";
+            sql = "SELECT id, rule_id, type_id, remind FROM kl_rule_app";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
             fw = new FileWriter(path + "bigdata_rule_app_filter.dict");

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

@@ -136,7 +136,7 @@ public class GraphCalculate {
             // 查找页面诊断里是否有不良反应
             Map<String, List<String>> disUE = neo4jAPI.getDisUE(diseaseName, diseaseType);
             //根据页面输入内容推出的不良反应集合
-            Set<String> ue = neo4jAPI.getUe((String[]) inputList.toArray(new String[inputList.size()]));
+            Map<String,String> ue = neo4jAPI.getUe((String[]) inputList.toArray(new String[inputList.size()]));
             //走平常诊断治疗
 //            Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(diseaseName,webDiag, diseaseType, diseaseSet,disUE,ue,String.join(",", inputList));
             Map<String, Filnlly> mulDiseaseTreat_new = neo4jAPI.getMulDiseaseTreat_new(diseaseName,webDiag, diseaseType, diseaseSet,disUE,ue,String.join(",", inputList));
@@ -148,9 +148,10 @@ public class GraphCalculate {
             logger.info("featureTypeList 包含11,走管理评估!!!");
             starttime = System.currentTimeMillis();
             if(webDiag != null){
-                MangementEvaluation mangementEvaluation = neo4jAPI.pushMe(webDiagList,lis_Result);
+//                MangementEvaluation mangementEvaluation = neo4jAPI.pushMe(webDiagList,lis_Result);
+                MangementEvaluation mangementEvaluation_new = neo4jAPI.pushMe_new(webDiagList);
                 System.out.println("推送管理评估消耗："+(System.currentTimeMillis()-starttime)+"s");
-                Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation.getMangementEvaluation();
+                Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation_new.getMangementEvaluation();
                 responseData.setManagementEvaluation(mangementEvaluation1);
             }
         }
@@ -217,9 +218,6 @@ public class GraphCalculate {
     public Map<String, List<FeatureRate>> getLisPacs(HttpServletRequest request, SearchData searchData) {
 
         Map<String, List<FeatureRate>> lisPacs = neo4jAPI.getLisPacs(searchData);
-//        responseData.setLabs(lisPacs.get("lisList"));
-//        responseData.setPacs(lisPacs.get("pacsList"));
-//        responseData.setVitals(lisPacs.get("vitalResultList"));
         return lisPacs;
     }
 }

graph/src/main/resources/bolt.properties

@@ -85,10 +85,10 @@ match(i:Indicators) WHERE i.name=m.name and age>i.minAge and age<i.maxAge and i.
 return i.name as name
 
 #\u67E5\u627E\u4E0D\u826F\u53CD\u5E94\u7684\u8BED\u53E5
-searchUe=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:UntowardEffect)\n \
+searchUe=match (n:Condition)-[r:\u53EF\u80FD\u6709|:\u8F7B\u5EA6|:\u4E2D\u5EA6|:\u91CD\u5EA6]->(m:UntowardEffect)\n \
 where n.name in fildList\n \
 with distinct m,r\n \
-return m.name as name
+return m.name as name,type(r) as tr
 
 #\u6839\u636E\u75BE\u75C5\u67E5\u627E\u76F8\u5E94\u7684Lis Pacs
 serchLisPacs=unwind disList as row \n \
@@ -107,9 +107,12 @@ union\n \
 match(h:Disease{name:disName})-[r:\u6CBB\u7597\u65B9\u6848]->(t:Treat)-[r2:\u63A8\u8350]->(m:Medicine)-[r1:\u5C5E\u4E8E]->(d:Drugs)\n \
 with t,m,d\n \
 match(t)-[r:\u63A8\u8350]->(m)-[r1:\u5C5E\u4E8E]->(h:Drugs)\n \
-where d.name=h.bigDrugs and h.p<6 \n \
+where d.name=h.bigDrugs \n \
 return t.name as treat,d.name as big,h.name as sub, m.name as med,null as ty\n \
 order by h.p
+# \u65B0\u7ED3\u6784\u7BA1\u7406\u8BC4\u4F30
+mangement=match(d:Disease)-[r:\u7BA1\u7406\u8BC4\u4F30]->(m)-[r1]->(e) where d.name='disName' \
+   return e.name as name,e.filds as filds,type(r1) as type order by r1.p
 
 #\u66F4\u65B0\u8BCA\u65AD\u4F9D\u636E\u7684path
 updateConditionPath=match (n:Condition)<-[:\u8BCA\u65AD\u4F9D\u636E]-(m) \n \

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -202,11 +202,7 @@ public class AlgorithmController extends BaseController {
         //知识图谱直接替换大数据中的检验检查数据
         Map<String, List<FeatureRate>> lisPacs = graphCalculate.getLisPacs(request, searchData);
         bigDataResponseData.setLabs(lisPacs.get("lisList"));
-
         bigDataResponseData.setPacs(lisPacs.get("pacsList"));
-
-
-
         //体征结果和指标推送
         Map<String, String> vitalCache = CacheUtil.getVitalCache();
         List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
@@ -225,21 +221,10 @@ public class AlgorithmController extends BaseController {
         List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
         List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
         bigDataResponseData.setDis(featureRates);
-        logger.info("获得化验数目为："+bigDataResponseData.getLabs().size());
-        logger.info("获得辅检数目为："+bigDataResponseData.getPacs().size());
         //返回结果化验、辅检、体征、进行性别年龄过滤
         ResultDataProxy resultDataProxy = new ResultDataProxy();
         resultDataProxy.resultSexAgeFilter(request, bigDataResponseData, searchData);
         response.setData(bigDataResponseData);
-        List<FeatureRate> labs = bigDataResponseData.getLabs();
-        logger.info("获得lis.."+labs.size());
-        ArrayList<String> objects = new ArrayList<>();
-        if(labs.size()>0){
-            for (FeatureRate fe :labs) {
-                objects.add(fe.getFeatureName());
-            }
-        }
-        logger.info("最终的lis:"+objects);
         return response;
     }