Browse Source

血常规不判断时间间隔,设为无限大

zhoutg 3 years ago
parent
commit
e806c66f34
1 changed files with 5 additions and 4 deletions
  1. 5 4
      src/main/java/com/diagbot/process/OtherTipProcess.java

+ 5 - 4
src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -211,7 +211,8 @@ public class OtherTipProcess {
         List<ItemExt> transfusionList = wordCrfDTO.getTransfusion();
         List<ItemExt> transfusionList = wordCrfDTO.getTransfusion();
         if (ListUtil.isNotEmpty(transfusionList)) {
         if (ListUtil.isNotEmpty(transfusionList)) {
             Long dateInterval = redisUtil.getByKeyAndField(RedisEnum.dateInterval.getName(), RedisEnum.dateInterval.getField().get(1));
             Long dateInterval = redisUtil.getByKeyAndField(RedisEnum.dateInterval.getName(), RedisEnum.dateInterval.getField().get(1));
-            Long minute = (-1L == dateInterval) ? 99999999999L : 60L * dateInterval;
+            Long maxMinute = 99999999999L;
+            Long minute = (-1L == dateInterval) ? maxMinute : 60L * dateInterval;
 
 
             for (ItemExt bean : transfusionList) {
             for (ItemExt bean : transfusionList) {
                 RuleVO ruleVO = getRuleVO(bean, RuleTypeEnum.transfusion.getKey());
                 RuleVO ruleVO = getRuleVO(bean, RuleTypeEnum.transfusion.getKey());
@@ -221,7 +222,7 @@ public class OtherTipProcess {
                     if (ruleExtDTO == null) {
                     if (ruleExtDTO == null) {
                         continue;
                         continue;
                     }
                     }
-                    // int dateFlag = CoreUtil.compareTime(ruleExtDTO.getFinishDateValue(), "2022-01-25 15:00:00", minute, false, false);
+                    // int dateFlag = CoreUtil.compareTime(ruleExtDTO.getFinishDateValue(), "2022-01-27 12:00:01", minute, false, false);
                     int dateFlag = CoreUtil.compareTime(ruleExtDTO.getFinishDateValue(), DateUtil.formatDateTime(DateUtil.now()), minute, false, false);
                     int dateFlag = CoreUtil.compareTime(ruleExtDTO.getFinishDateValue(), DateUtil.formatDateTime(DateUtil.now()), minute, false, false);
                     if (dateFlag != 1) {
                     if (dateFlag != 1) {
                         continue;
                         continue;
@@ -229,8 +230,8 @@ public class OtherTipProcess {
                     List<RuleConditionDTO> ruleConditionDTOList = ruleExtDTO.getRuleConditionDTOList();
                     List<RuleConditionDTO> ruleConditionDTOList = ruleExtDTO.getRuleConditionDTOList();
                     for (RuleConditionDTO ruleConditionDTO : ruleConditionDTOList) {
                     for (RuleConditionDTO ruleConditionDTO : ruleConditionDTOList) {
                         List<RuleBaseDTO> ruleBaseDTOList = ruleConditionDTO.getRuleBaseDTOList();
                         List<RuleBaseDTO> ruleBaseDTOList = ruleConditionDTO.getRuleBaseDTOList();
-                        // 2、规则匹配
-                        lisRule.otherTransfusionLis(bean, ruleBaseDTOList, ruleConditionDTO.getMsg(), otherList, wordCrfDTO, minute);
+                        // 2、规则匹配,不判断时间间隔
+                        lisRule.otherTransfusionLis(bean, ruleBaseDTOList, ruleConditionDTO.getMsg(), otherList, wordCrfDTO, maxMinute);
                     }
                     }
                 }
                 }
             }
             }