疗效评估接口

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

@@ -70,11 +70,8 @@ public class GraphCalculate {
         List<MedicalIndication> medicalIndicationList = new ArrayList<>();
         MedicalIndication medicalIndication = this.getMedicalIndication(diseaseSet);
         medicalIndicationList.add(medicalIndication);
-        if(medicalIndicationList != null && medicalIndicationList.size()>0){
-            responseData.setMedicalIndications(medicalIndicationList);
-        }
+        responseData.setMedicalIndications(medicalIndicationList);
         //诊断推送
-
         responseData.setDis(featureRates);
         responseData.setInputs(searchData.getInputs());
         return responseData;
@@ -351,13 +348,23 @@ public class GraphCalculate {
         curativeJson.put("rows",itemJson);
         //分级管理
         JSONObject gradeJson = new JSONObject();
-
-
+        List<JSONObject> gradItemJson = new ArrayList<>();
+        JSONObject bigGrad = new JSONObject();
+        bigGrad.put("name","血压控制情况");
+        bigGrad.put("controltype",0);
+        List<JSONObject> gradItemJ = new ArrayList<>();
+        String[] gradItem ={"常规管理","强化管理"};
+        for (String item:gradItem) {
+            JSONObject j =new JSONObject();
+            j.put("detailName",item);
+            j.put("state",0);
+            gradItemJ.add(j);
+        }
+        bigGrad.put("details",gradItemJ);
+        gradItemJson.add(bigGrad);
+        gradeJson.put("rows",gradItemJson);
         mangementMap.put("疗效评估",curativeJson);
-
-
-
-
+        mangementMap.put("糖尿病分级管理",gradeJson);
         mangementEvaluation.setMangementEvaluation(mangementMap);
         return mangementEvaluation;
     }

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

@@ -3,6 +3,7 @@ package org.diagbot.push.controller;
 import org.diagbot.bigdata.work.AlgorithmCore;
 import org.diagbot.common.javabean.Drugs;
 import org.diagbot.common.javabean.Filnlly;
+import org.diagbot.common.javabean.MedicalIndication;
 import org.diagbot.common.javabean.Medicition;
 import org.diagbot.common.work.*;
 import org.diagbot.graphWeb.work.GraphCalculate;
@@ -96,7 +97,12 @@ public class AlgorithmController extends BaseController {
 
         bigDataResponseData.setTreat(graphResponseData.getTreat());
         //量表和指标推送
-        bigDataResponseData.setMedicalIndications(graphResponseData.getMedicalIndications());
+        List<MedicalIndication> medicalIndications = graphResponseData.getMedicalIndications();
+        if(medicalIndications !=null && medicalIndications.size()>0){
+            bigDataResponseData.setMedicalIndications(medicalIndications);
+        }
+        //推送管理评估
+        bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
         //知识图谱直接替换大数据中的检验检查数据
         graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
 //        if (!StringUtils.isEmpty(searchData.getDiag())) {