新版高危

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -102,6 +102,10 @@ ai:
   server:
     address: http://192.168.2.234:5008
 
+graph:
+  server:
+    address: http://192.168.2.234:5003
+
 treat:
   server:
     address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-local.yml

@@ -102,6 +102,10 @@ ai:
   server:
     address: http://192.168.2.234:5008
 
+graph:
+  server:
+    address: http://192.168.2.234:5003
+
 treat:
   server:
     address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -102,6 +102,10 @@ ai:
   server:
     address: http://192.168.2.234:5008
 
+graph:
+  server:
+    address: http://192.168.2.234:5003
+
 treat:
   server:
     address: http://192.168.3.112:8080

config-server/src/main/resources/shared/icss-service-test.yml

@@ -102,6 +102,10 @@ ai:
   server:
     address: http://192.168.2.234:5008
 
+graph:
+  server:
+    address: http://192.168.2.234:5003
+
 treat:
   server:
     address: http://192.168.3.112:8080

icss-service/src/main/java/com/diagbot/client/HighRiskServiceClient.java

@@ -2,6 +2,7 @@ package com.diagbot.client;
 
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
+import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.HighRiskServiceHystrix;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,8 +15,8 @@ import java.util.Map;
  * @Author:zhaops
  * @time: 2018/12/21 11:38
  */
-@FeignClient(name = "HighRisk", url = "${ai.server.address}", fallback = HighRiskServiceHystrix.class)
+@FeignClient(name = "HighRisk", url = "${graph.server.address}", fallback = HighRiskServiceHystrix.class)
 public interface HighRiskServiceClient {
-    @PostMapping(value = "/web/graphdb/HighRisk")
-    Response<GdbResponse> highRiskPageData(@RequestBody Map<String, String> map);
+    @PostMapping(value = "/graph-web/graph/highRisk")
+    Response<GdbResponse> highRiskPageData(@RequestBody SearchData searchData);
 }

icss-service/src/main/java/com/diagbot/client/hystrix/HighRiskServiceHystrix.java

@@ -3,6 +3,7 @@ package com.diagbot.client.hystrix;
 import com.diagbot.client.HighRiskServiceClient;
 import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.Response;
+import com.diagbot.client.bean.SearchData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +18,7 @@ import java.util.Map;
 @Slf4j
 public class HighRiskServiceHystrix implements HighRiskServiceClient {
     @Override
-    public Response<GdbResponse> highRiskPageData(Map<String, String> map) {
+    public Response<GdbResponse> highRiskPageData(SearchData searchData) {
         log.error("【hystrix】调用{}异常", "highRiskPageData");
         return null;
     }

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -193,7 +193,9 @@ public class PushFacade {
             List<String> diseaseNameList = dis.stream().map(disease -> disease.getFeatureName()).collect(Collectors.toList());
             Map<String, String> highRiskMap = new HashMap<>();
             highRiskMap.put("disease", String.join(",", diseaseNameList));
-            Response<GdbResponse> graphRes = highRiskServiceClient.highRiskPageData(highRiskMap);
+            SearchData searchData = new SearchData();
+            searchData.setDiag(String.join(",", diseaseNameList));
+            Response<GdbResponse> graphRes = highRiskServiceClient.highRiskPageData(searchData);
             if (graphRes != null) {
                 Map<String, String> graphResult = graphRes.getData().getResult();
                 if (graphResult.size() > 0) {
@@ -423,7 +425,7 @@ public class PushFacade {
                 orderByAsc("order_no");
         List<DeptVital> deptVitalList = deptVitalFacade.list(deptVitalQueryWrapper);
         //科室模板为空时，取全科模板
-        if(deptVitalList.size()==0) {
+        if (deptVitalList.size() == 0) {
             deptVitalQueryWrapper = new QueryWrapper<>();
             String sql = "select id from icss_dept_info where name='全科' and is_deleted='N'";
             deptVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).