化验、辅检、体征推送的更新

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

@@ -39,8 +39,6 @@ public class GraphCalculate {
         long starttime = System.currentTimeMillis();
         System.out.println("Start at: " + starttime);
         ResponseData responseData = new ResponseData();
-//        ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
-//        paramsDataProxy.createSearchData(request, searchData);
         List<String> inputList = new ArrayList<>();
         int age = searchData.getAge();
         String sex = searchData.getSex();
@@ -203,4 +201,16 @@ public class GraphCalculate {
         System.out.println("Total takes: " + (System.currentTimeMillis()-starttime)/1000d + 's');
         return responseData;
     }
+    /**
+     * 推送化验，辅检，体征
+     */
+    public ResponseData getLisPacs(HttpServletRequest request, SearchData searchData) throws Exception {
+
+        ResponseData responseData = new ResponseData();
+        Map<String, List<FeatureRate>> lisPacs = neo4jAPI.getLisPacs(searchData);
+        responseData.setLabs(lisPacs.get("lisList"));
+        responseData.setPacs(lisPacs.get("pacsList"));
+        responseData.setVitals(lisPacs.get("vitalResultList"));
+        return responseData;
+    }
 }

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

@@ -65,7 +65,6 @@ public class gdbtest {
             JSONArray jarray = jobj.getJSONArray("lis");
 
             Neo4jAPI napi = new Neo4jAPI(DriverManager.newDrive("192.168.3.201:7687", "neo4j", "123456"));
-            lisres = napi.AnalysisLISResult(jarray);
 
             for (String item:lisres) {
                 System.out.println(item);

graph/src/main/resources/bolt.properties

@@ -103,8 +103,8 @@ return m.name as name
 #\u67E5\u627E\u4E00\u4E9B\u8BCD\u662F\u5426\u5728\u56FE\u8C31\u4E2D
 searchWords=match(d) where d.name in fildList return distinct d.name as name
 #\u6839\u636E\u75BE\u75C5\u67E5\u627E\u76F8\u5E94\u7684Lis Pacs
-serchLisPacs=match (d:Disease)-[r1:\u63A8\u8350]->(m)\n \
-where d.name in diseaseNmae return distinct d.name as name,labels(m)[0] as lei,m.name as n
+serchLisPacs=unwind disList as row \n \
+  match (d:Disease)-[r1:\u63A8\u8350|:\u8868\u73B0]->(m) where d.name=row return  labels(m)[0] as label,m.name as name
 
 #\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

@@ -157,19 +157,6 @@ public class AlgorithmController extends BaseController {
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);
         if (graphResponseData.getDis().size() > 0) {
             List<FeatureRate> disFeatureRates = new ArrayList<>();
-            /*boolean isFind = false;
-            for (int i = 0; i < bigDataResponseData.getDis().size(); i++) {
-                FeatureRate bigdata_fr = bigDataResponseData.getDis().get(i);
-                isFind = false;
-                for (FeatureRate graph_fr : graphResponseData.getDis()) {
-                    if (graph_fr.getDesc().contains("拟诊")|| graph_fr.getDesc().contains("确诊") && bigdata_fr.getFeatureName().equals(graph_fr.getFeatureName())) {
-                        isFind = true;
-                    }
-                }
-                if (!isFind) {
-                    disFeatureRates.add(bigdata_fr);
-                }
-            }*/
             List<FeatureRate> bigdis = bigDataResponseData.getDis();
             List<FeatureRate> graphdis = graphResponseData.getDis();
             for (FeatureRate bg:graphdis) {
@@ -210,13 +197,13 @@ public class AlgorithmController extends BaseController {
 
         //推送管理评估
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
-        //知识图谱直接替换大数据中的检验检查数据
-        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
-        graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
 
+        //知识图谱直接替换大数据中的检验检查数据
+        graphResponseData = graphCalculate.getLisPacs(request,searchData);
         bigDataResponseData.setLabs(graphResponseData.getLabs());
         bigDataResponseData.setPacs(graphResponseData.getPacs());
 
+
         //体征结果和指标推送
         Map<String, String> vitalCache = CacheUtil.getVitalCache();
         List<String> featureList = Arrays.asList(searchData.getFeatureTypes());