更新图谱对化验和辅检的推送

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

@@ -12,8 +12,8 @@ import java.util.List;
 import java.util.Map;
 
 public class LisPacsCalculate {
-    public Response<ResponseData> getLisPacs(HttpServletRequest request, SearchData searchData) throws Exception {
-        Response<ResponseData> objectResponse = new Response<ResponseData>();
+    public ResponseData getLisPacs(HttpServletRequest request, SearchData searchData) throws Exception {
+
         ResponseData responseData = new ResponseData();
         PropertiesUtil propertiesUtil = new PropertiesUtil("url.properties");
         //调用图谱API
@@ -21,6 +21,10 @@ public class LisPacsCalculate {
         Response lisPacsResponse = api.doPost(propertiesUtil.getProperty("lisPacs.http.url"), searchData,
                 Response.class);
 
-        return lisPacsResponse;
+        Map data = (Map<String, Map>)lisPacsResponse.getData();
+        responseData.setLabs((List)data.get("labs"));
+        responseData.setPacs((List)data.get("pacs"));
+
+        return responseData;
     }
 }

graph-web/src/main/resources/url.properties

@@ -1,3 +1,4 @@
 highrisk.http.url=http://192.168.3.112:8080/knowledge/getHighRisk
-lisPacs.http.url=http://192.168.3.112:8080/knowledge/getLisPacs
+lisPacs.http.url=http://192.168.2.234:8080/knowledge/getLisPacs
+#lisPacs.http.url=http://192.168.3.9:8080/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:8080/knowledge/getHighRisk

graphdb/src/main/resources/application.yml

@@ -26,4 +26,11 @@ spring:
 
 mybatis:
   type-aliases-package: org.diagbot.entity
-  mapper-locations: classpath:mapper/**/*.xml
+  mapper-locations: classpath:mapper/**/*.xml
+
+#logging:
+#  pattern: #配置日志格式 %d：日期 , %msg：日志信息 ，%n换行
+#    console: "%d - %msg%n" #设置控制台打印格式
+#    path: ../logs #设置log文件路径 默认名称：spring.log
+#    file: ../logs/graphdb_service.log #设置log文件路径 设置日志文件名称cell.log
+#    level: INFO #指定输出某个类的日志级别

graphdb/src/main/resources/logback-spring.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="user-service"/>
+    <property name="APPDIR" value="graphdb"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_PATH" value="../logs"/>
+    <property name="LOG_PATH" value="./logs"/>
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->

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

@@ -6,6 +6,7 @@ import org.diagbot.common.javabean.Filnlly;
 import org.diagbot.common.javabean.Medicition;
 import org.diagbot.common.work.*;
 import org.diagbot.graphWeb.work.GraphCalculate;
+import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;
@@ -59,6 +60,8 @@ public class AlgorithmController extends BaseController {
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData);
 
+        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
+
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);
 
@@ -93,7 +96,7 @@ public class AlgorithmController extends BaseController {
 
         bigDataResponseData.setTreat(graphResponseData.getTreat());
         //知识图谱直接替换大数据中的检验检查数据
-        graphResponseData = graphCalculate.getLisPacs(request, searchData);
+        graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
 //        if (!StringUtils.isEmpty(searchData.getDiag())) {
         bigDataResponseData.setLabs(graphResponseData.getLabs());
         bigDataResponseData.setPacs(graphResponseData.getPacs());

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

@@ -78,8 +78,9 @@ public class GraphController extends BaseController {
         ResponseData responseData = graphCalculate.getLisPacs(request, searchData);
         response.setData(responseData);
         LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
-        Response<ResponseData> lisPacs = lisPacsCalculate.getLisPacs(request, searchData);
-        return lisPacs;
+        ResponseData lisPacs = lisPacsCalculate.getLisPacs(request, searchData);
+        response.setData(lisPacs);
+        return response;
     }
 
     @RequestMapping(value = "/scale", method = RequestMethod.POST)