|
|
@@ -21,6 +21,7 @@ import com.nb.common.util.RedissonUtil;
|
|
|
import lombok.Builder;
|
|
|
import lombok.Data;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.intellij.lang.annotations.Flow;
|
|
|
import org.redisson.api.RDelayedQueue;
|
|
|
import java.util.Date;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
@@ -75,7 +76,7 @@ public class HospitalFunctionExtraConfigHandler extends AbstractHospitalConfig
|
|
|
if (config.getNoSignal()!=null&&config.getNoSignal()>0) {
|
|
|
judgeNoSignal(source,config.getNoSignal());
|
|
|
}
|
|
|
- if (config.getLowInfusion()!=null&&config.getLowInfusion()>0) {
|
|
|
+ if (config.getLowInfusion()!=null&&config.getLowInfusion()>0&&!DeviceStatusEnum.StartUp.equals(source.getRunState())) {
|
|
|
judgeLowInfusion(source,config.getLowInfusion());
|
|
|
}
|
|
|
}
|
|
|
@@ -193,7 +194,9 @@ public class HospitalFunctionExtraConfigHandler extends AbstractHospitalConfig
|
|
|
if(lastLowInfusionWarn!=null){
|
|
|
lowInfusionDelay.remove(lastLowInfusionWarn);
|
|
|
}
|
|
|
- source.setWarnLowBattery(false);
|
|
|
+ if(FlowStatusEnum.Lowest.equals(source.getWarnFlow())){
|
|
|
+ source.setWarnFlow(null);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|