检验检查使用知识图谱

common-service/src/main/java/org/diagbot/common/work/SearchData.java

@@ -29,6 +29,8 @@ public class SearchData {
     protected String diag = "";
     protected String past = "";
     protected String other = "";
+    //大数据推送诊断结果信息
+    protected List<String> pushDiags = new ArrayList<>();
 
     //模型
     protected String algorithmClassifyValue;
@@ -202,4 +204,12 @@ public class SearchData {
     public void setFilters(Map<String, Map<String, String>> filters) {
         this.filters = filters;
     }
+
+    public List<String> getPushDiags() {
+        return pushDiags;
+    }
+
+    public void setPushDiags(List<String> pushDiags) {
+        this.pushDiags = pushDiags;
+    }
 }

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

@@ -52,6 +52,12 @@ public class AlgorithmController extends BaseController {
         Response<ResponseData> response = new Response();
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData);
+        //推送出的诊断信息作为参数传入知识图谱
+        List<String> pushDiags = new ArrayList<>();
+        for (FeatureRate fr : bigDataResponseData.getDis()) {
+            pushDiags.add(fr.getFeatureName());
+        }
+        searchData.setPushDiags(pushDiags);
 
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);
@@ -78,11 +84,11 @@ public class AlgorithmController extends BaseController {
         }
         bigDataResponseData.setTreat(graphResponseData.getTreat());
 
-        //如果页面有诊断传入，直接替换大数据中的检验检查数据
-        if (!StringUtils.isEmpty(searchData.getDiag())) {
-            bigDataResponseData.setLabs(graphResponseData.getLabs());
-            bigDataResponseData.setPacs(graphResponseData.getPacs());
-        }
+        //知识图谱直接替换大数据中的检验检查数据
+//        if (!StringUtils.isEmpty(searchData.getDiag())) {
+        bigDataResponseData.setLabs(graphResponseData.getLabs());
+        bigDataResponseData.setPacs(graphResponseData.getPacs());
+//        }
         response.setData(bigDataResponseData);
         return response;
     }