Parcourir la source

修改危急值提醒代码

hujing il y a 5 ans
Parent
commit
585d8a4d92

+ 9 - 4
rule/src/main/java/org/diagbot/rule/crisis/CrisisApplication.java

@@ -1,5 +1,6 @@
 package org.diagbot.rule.crisis;
 
+import org.diagbot.common.push.bean.CrisisDetail;
 import org.diagbot.common.push.bean.Rule;
 import org.diagbot.common.push.bean.RuleApp;
 import org.diagbot.common.push.bean.SearchData;
@@ -16,11 +17,11 @@ import java.util.Map;
 public class CrisisApplication {
     private static String[] itemTypes = { "symptom", "vital", "lis", "pacs" };
 
-    public Map<String, List<String>> crisisContent(SearchData searchData) {
+    public Map<String, List<CrisisDetail>> crisisContent(SearchData searchData) {
         //<"symptom",["严重低钠血症,此项检验指标高危"]>
         //<"vital",["严重代谢性碱中毒,此项检验指标高危"]>
-        Map<String, List<String>> crisisMap = new HashMap<>();
-        List<String> crisisList = null;
+        Map<String, List<CrisisDetail>> crisisMap = new HashMap<>();
+        List<CrisisDetail> crisisList = null;
         Map<String, RuleApp> ruleApps = ApplicationCacheUtil.getKl_rule_app_filter_map();
         Map<String, List<Rule>> rules = searchData.getRules();
         for (String itemType : itemTypes) {
@@ -28,12 +29,16 @@ public class CrisisApplication {
             for (Rule rule : detailRules) {
                 if (ruleApps.containsKey(rule.getId())) {
                     if ("0".equals(ruleApps.get(rule.getId()).getType_id())) {
+                        CrisisDetail crisisDetail = new CrisisDetail();
+                        crisisDetail.setRemindText(ruleApps.get(rule.getId()).getRemind());
+                        crisisDetail.setStandardText(rule.getPub_name());
+                        crisisDetail.setOriginText(rule.getOriginText());
                         if (crisisMap.get(itemType) == null) {
                             crisisList = new ArrayList<>();
                         } else {
                             crisisList = crisisMap.get(itemType);
                         }
-                        crisisList.add(ruleApps.get(rule.getId()).getRemind());
+                        crisisList.add(crisisDetail);
                         crisisMap.put(itemType, crisisList);
                     }
                 }