1、push-web增加危急值推送提醒

common-push/src/main/java/org/diagbot/common/push/bean/ResponseData.java

@@ -31,7 +31,7 @@ public class ResponseData {
     private List<String> diffDiag;//鉴别诊断
     private List<String> excludeDiag; //排除诊断
 
-    private List<CrisisDetail> crisisDetails = new ArrayList<>();
+    private Map<String, List<CrisisDetail>> crisisDetails = new HashMap<>();
 
     public List<String> getDiffDiag() {
         return diffDiag;
@@ -163,11 +163,11 @@ public class ResponseData {
         this.beforeCombineDis = beforeCombineDis;
     }
 
-    public List<CrisisDetail> getCrisisDetails() {
+    public Map<String, List<CrisisDetail>> getCrisisDetails() {
         return crisisDetails;
     }
 
-    public void setCrisisDetails(List<CrisisDetail> crisisDetails) {
+    public void setCrisisDetails(Map<String, List<CrisisDetail>> crisisDetails) {
         this.crisisDetails = crisisDetails;
     }
 }

push-web/pom.xml

@@ -67,6 +67,12 @@
 			<version>0.0.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.diagbot</groupId>
+			<artifactId>rule</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>

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

@@ -10,6 +10,7 @@ import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.common.push.bean.neo4j.*;
 import org.diagbot.common.push.cache.CacheUtil;
 import org.diagbot.common.push.filter.ClassifyDiag;
+import org.diagbot.common.push.filter.rule.PretreatmentRule;
 import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.nlp.util.Constants;
@@ -19,6 +20,7 @@ import org.diagbot.pub.jdbc.MysqlJdbc;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;
 import org.diagbot.pub.web.BaseController;
+import org.diagbot.rule.crisis.CrisisApplication;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -120,6 +122,15 @@ public class AlgorithmController extends BaseController {
         ResponseData responseData = new ResponseData();
         logger.info("开始推送服务......");
         Response<ResponseData> response = new Response();
+
+        //数据预处理
+        PretreatmentRule pretreatmentRule = new PretreatmentRule();
+        pretreatmentRule.rule(searchData);
+        //危机值
+        CrisisApplication crisisApplication = new CrisisApplication();
+        responseData.setCrisisDetails(crisisApplication.crisisContent(searchData));
+
+        //大数据推送
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData, responseData);
 

rule/pom.xml

@@ -36,5 +36,23 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.json</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
+        <finalName>rule</finalName>
     </build>
 </project>