|
@@ -211,7 +211,8 @@ public class OtherTipProcess {
|
|
|
List<ItemExt> transfusionList = wordCrfDTO.getTransfusion();
|
|
|
if (ListUtil.isNotEmpty(transfusionList)) {
|
|
|
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) {
|
|
|
RuleVO ruleVO = getRuleVO(bean, RuleTypeEnum.transfusion.getKey());
|
|
@@ -221,7 +222,7 @@ public class OtherTipProcess {
|
|
|
if (ruleExtDTO == null) {
|
|
|
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);
|
|
|
if (dateFlag != 1) {
|
|
|
continue;
|
|
@@ -229,8 +230,8 @@ public class OtherTipProcess {
|
|
|
List<RuleConditionDTO> ruleConditionDTOList = ruleExtDTO.getRuleConditionDTOList();
|
|
|
for (RuleConditionDTO ruleConditionDTO : ruleConditionDTOList) {
|
|
|
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);
|
|
|
}
|
|
|
}
|
|
|
}
|