知识图谱和大数据推送结果合并, 进入调试

algorithm/src/main/resources/algorithm.properties

@@ -1,7 +1,7 @@
 ################################ model basic url ###################################
 
-basicPath=E:/git/push/algorithm/src/main/models/model_version_replacement/model
-#basicPath=/opt/models/dev/models/model_version_replacement/model
+#basicPath=E:/git/push/algorithm/src/main/models/model_version_replacement/model
+basicPath=/opt/models/dev/models/model_version_replacement/model
 #basicPath=E:/models/model_version_replacement/model
 
 ############################### current model version ################################

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

@@ -86,6 +86,7 @@ public class AlgorithmController extends BaseController {
             //大数据推送疾病数据用知识图谱替换
             bigDataResponseData.setDis(graphFeatureRates);
         }
+        bigDataResponseData.setTreat(graphResponseData.getTreat());
         response.setData(bigDataResponseData);
         return response;
     }

push-web/src/main/resources/push.properties

@@ -1,5 +1,5 @@
-#bigdata.http.url=http://192.168.2.234:5001/bigdata-web/algorithm/neural
-#graph.http.url=http://192.168.2.234:5003/graph-web/graph/push
+bigdata.http.url=http://192.168.2.234:5001/bigdata-web/algorithm/neural
+graph.http.url=http://192.168.2.234:5003/graph-web/graph/push
 
-bigdata.http.url=http://192.168.3.180:5001/bigdata-web/algorithm/neural
-graph.http.url=http://192.168.3.180:5003/graph-web/graph/push
+#bigdata.http.url=http://192.168.3.180:5001/bigdata-web/algorithm/neural
+#graph.http.url=http://192.168.3.180:5003/graph-web/graph/push

push-web/src/main/resources/static/dist/js/push.js

@@ -1,9 +1,9 @@
-// var nlp_web_url = "http://192.168.2.234:5002/nlp-web";
-// var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
-// var graph_web_url = "http://192.168.2.234:5003/graph-web";
-// var push_web_url = "http://192.168.2.234:5008/push-web";
+var nlp_web_url = "http://192.168.2.234:5002/nlp-web";
+var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
+var graph_web_url = "http://192.168.2.234:5003/graph-web";
+var push_web_url = "http://192.168.2.234:5008/push-web";
 
-var nlp_web_url = "http://192.168.3.180:5002/nlp-web";
-var bigdata_web_url = "http://192.168.3.180:5001/bigdata-web";
-var graph_web_url = "http://192.168.3.180:5003/graph-web";
-var push_web_url = "http://192.168.3.180:5008/push-web";
+// var nlp_web_url = "http://192.168.3.180:5002/nlp-web";
+// var bigdata_web_url = "http://192.168.3.180:5001/bigdata-web";
+// var graph_web_url = "http://192.168.3.180:5003/graph-web";
+// var push_web_url = "http://192.168.3.180:5008/push-web";

push-web/src/main/resources/static/pages/algorithm/list.html

@@ -344,11 +344,11 @@
         var diag = $("#diag_id").val();
         if (diag == '') {
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '11');
-//            startDiag('/algorithm/page_neural', '#vital_list', '3', resourceType, '31');
-//            startDiag('/algorithm/page_neural', '#lis_list', '4', resourceType, '41');
-//            startDiag('/algorithm/page_neural', '#pacs_list', '5', resourceType, '51');
-//
-//            startDiagMapping('/algorithm/page_neural', '#diag_list', '2', resourceType, '21');
+            startDiag('/algorithm/page_neural', '#vital_list', '3', resourceType, '31');
+            startDiag('/algorithm/page_neural', '#lis_list', '4', resourceType, '41');
+            startDiag('/algorithm/page_neural', '#pacs_list', '5', resourceType, '51');
+
+            startDiagMapping('/algorithm/page_neural', '#diag_list', '2', resourceType, '21');
         } else {
             $('#diag_list').html("");
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '111');