把推送警惕的接口移到push-web

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

@@ -91,14 +91,22 @@ public class GraphCalculate {
         List<String> webDiagList = Arrays.asList(webDiag.split(",|，|、"));
         List<String> bigdataDiagList = searchData.getPushDiags();
         for (String web: webDiagList ) {
-            for (String big: bigdataDiagList ) {
-                if(big.equals(web)){
-                    bigdataDiagList.remove(big);
+                for (int i=0;i<bigdataDiagList.size();i++ ) {
+                    if(bigdataDiagList.get(i).equals(web)){
+                        bigdataDiagList.remove(bigdataDiagList.get(i));
+                    }
                 }
-            }
         }
-        Map<String, Set<FeatureRate>> weblisPacs = neo4jAPI.getLisPacs(webDiagList);
-        Map<String, Set<FeatureRate>> biglisPacs = neo4jAPI.getLisPacs(bigdataDiagList);
+        System.out.println("web:"+webDiagList+"\n"+"大数据:"+bigdataDiagList);
+        Map<String, Set<FeatureRate>> weblisPacs =null;
+        Map<String, Set<FeatureRate>> biglisPacs =null;
+        if(webDiagList !=null && webDiagList.size()>0){
+            weblisPacs = neo4jAPI.getLisPacs(webDiagList);//界面诊断推出的LIS,PACS
+        }
+        if(bigdataDiagList !=null && bigdataDiagList.size()>0){
+            biglisPacs =neo4jAPI.getLisPacs(bigdataDiagList);//大数据推得诊断
+        }
+
         Set<FeatureRate> lis =null;
         Set<FeatureRate> pacs =null;
         //如果界面有诊断

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

@@ -17,9 +17,9 @@ public class HighRiskCalculate {
         GdbResponse responseData = new GdbResponse();
         Response<GdbResponse> objectResponse = new Response<>();
         Map<String,String> RSet = null;
-//        if (driver == null) {
+        if (driver == null) {
             driver = DriverManager.newDrive();
-//        }
+        }
         if (driver != null && driver.session() != null) {
             n4api = new Neo4jAPI(driver);
             if(searchData.getDiag().trim()!=null){

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

@@ -1298,12 +1298,14 @@ public class Neo4jAPI {
             List<FeatureRate> lisList = new ArrayList<>();
             List<FeatureRate> pacsList = new ArrayList<>();
             query = serchLisPacs.replace("diseaseNmae", diseaseList.toString());
+            System.out.println(query);
             result = session.run(query);
             while (result.hasNext()) {
                 FeatureRate featureRate = new FeatureRate();
                 Record next = result.next();
                 String lei = next.get("lei").toString().replaceAll("\"", "");
                 String name = next.get("n").toString().replaceAll("\"", "");
+                String subLis = next.get("lr").toString().replaceAll("\"", "");
                 if ("LIS".equals(lei)) {
                     featureRate.setFeatureName(name);
                     if (!lisList.contains(featureRate)) {

graph/src/main/resources/bolt.properties

@@ -54,9 +54,13 @@ return m.name as name, labels(m)[0] as label,type(r) as relationType
 #\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=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=match (d:Disease)-[r1:\u63A8\u8350]->(m:LIS)-[r2:\u5C0F\u9879]->(l) \
+where d.name in diseaseNmae return distinct d.name as name,labels(m)[0] as lei,m.name as n,l.name as lr \
+union \
+match (d:Disease)-[r1:\u63A8\u8350]->(m:PACS)-[r2:\u7ED3\u679C]->(l) \
+where d.name in diseaseNmae return distinct d.name as name,labels(m)[0] as lei,m.name as n,l.name as lr
 #\u66F4\u65B0\u8BCA\u65AD\u4F9D\u636E\u7684path
 updateConditionPath=match (n:Condition)<-[:\u8BCA\u65AD\u4F9D\u636E]-(m) \n \
           with n,\n \

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

@@ -1,17 +1,26 @@
 package org.diagbot.push.controller;
 
+import org.diagbot.common.work.SearchData;
+import org.diagbot.graph.javabean.GdbResponse;
+import org.diagbot.graphWeb.work.HighRiskCalculate;
+import org.diagbot.pub.api.Response;
 import org.diagbot.pub.web.BaseController;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
 @Controller
 @RequestMapping("/graph")
 public class GraphController extends BaseController {
-    {
-        listView = "/pages/graph/list.html";
-    }
-
-    @RequestMapping({"/index"})
-    public String index() {
-        return listView;
+    @RequestMapping(value = "/highRisk", method = RequestMethod.POST)
+    @ResponseBody
+    public Response<GdbResponse> getHighRisk(HttpServletRequest request, @RequestBody SearchData searchData) throws Exception {
+        HighRiskCalculate highRiskCalculate = new HighRiskCalculate();
+        Response<GdbResponse> gdbResponseResponse = highRiskCalculate.calculateHighRisk(request, searchData);
+        return gdbResponseResponse;
     }
 }