添加日志打印

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

@@ -214,13 +214,12 @@ public class GraphCalculate {
     /**
      * 推送化验，辅检，体征
      */
-    public ResponseData getLisPacs(HttpServletRequest request, SearchData searchData) throws Exception {
+    public Map<String, List<FeatureRate>> getLisPacs(HttpServletRequest request, SearchData searchData) {
 
-        ResponseData responseData = new ResponseData();
         Map<String, List<FeatureRate>> lisPacs = neo4jAPI.getLisPacs(searchData);
-        responseData.setLabs(lisPacs.get("lisList"));
-        responseData.setPacs(lisPacs.get("pacsList"));
-        responseData.setVitals(lisPacs.get("vitalResultList"));
-        return responseData;
+//        responseData.setLabs(lisPacs.get("lisList"));
+//        responseData.setPacs(lisPacs.get("pacsList"));
+//        responseData.setVitals(lisPacs.get("vitalResultList"));
+        return lisPacs;
     }
 }

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

@@ -1657,7 +1657,7 @@ public class Neo4jAPI {
                 bigGrad.put("details", gradItemJ);
                 gradItemJson.add(bigGrad);
                 gradeJson.put("rows", gradItemJson);
-                mangementMap.put("风险因素评估", curativeJson);
+                mangementMap.put("疗效评估", curativeJson);
                 mangementMap.put("糖尿病分级管理", gradeJson);
                 mangementEvaluation.setMangementEvaluation(mangementMap);
 //            }
@@ -1844,6 +1844,7 @@ public class Neo4jAPI {
                 featureRate.setFeatureName(l);
                 lisFeature.add(featureRate);
             }
+            logger.info("最终返回的化验为："+newLis);
         }
         if (pacs != null && pacs.size() > 0 && featureList.contains("5")) {
             List<String> newPacs = new ArrayList<>();
@@ -1861,7 +1862,9 @@ public class Neo4jAPI {
                 featureRate.setFeatureName(p);
                 pacsFeature.add(featureRate);
             }
+            logger.info("最终返回的辅检为 :"+newPacs);
         }
+
         if(vitalReultSet.size() > 0){
             List<String> newVitalRes = new ArrayList<>();
             if(vitalReultSet.size()>searchData.getLength()){
@@ -1878,6 +1881,7 @@ public class Neo4jAPI {
                 featureRate.setFeatureName(p);
                 vitalFeature.add(featureRate);
             }
+            logger.info("最终返回的体征为："+newVitalRes);
         }
         lisPacsFeature.put("lisList", lisFeature);
         lisPacsFeature.put("pacsList", pacsFeature);

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

@@ -199,15 +199,15 @@ public class AlgorithmController extends BaseController {
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
 
         //知识图谱直接替换大数据中的检验检查数据
-        graphResponseData = graphCalculate.getLisPacs(request,searchData);
-        bigDataResponseData.setLabs(graphResponseData.getLabs());
-        bigDataResponseData.setPacs(graphResponseData.getPacs());
+        Map<String, List<FeatureRate>> lisPacs = graphCalculate.getLisPacs(request, searchData);
+        bigDataResponseData.setLabs(lisPacs.get("lisList"));
+        bigDataResponseData.setPacs(lisPacs.get("pacsList"));
 
 
         //体征结果和指标推送
         Map<String, String> vitalCache = CacheUtil.getVitalCache();
         List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
-        List<FeatureRate> vitals = graphResponseData.getVitals();
+        List<FeatureRate> vitals = lisPacs.get("vitalResultList");
         if (featureList.contains(Constants.feature_type_vital_index) && this.getVital(vitalCache, vitals).size() > 0) {
             bigDataResponseData.setVitals(this.getVital(vitalCache, vitals));