Selaa lähdekoodia

fix 低输注状态判定

A17404李放 3 vuotta sitten
vanhempi
commit
455c992072

+ 5 - 2
nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -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);
+            }
         }
     }
 

+ 5 - 1
nb-system/src/main/java/com/nb/bus/websocket/listener/DeviceInfoListener.java

@@ -320,6 +320,8 @@ public class DeviceInfoListener {
             BusInfusionHistoryEntity originInfusion = infusionHistoryService.getById(originInfusionId);
             if(originInfusion!=null){
                 device.setResetUndo(Boolean.TRUE.equals(originInfusion.getIsUndo()));
+                //判断输注上一个状态是否为低输注状态
+                device.setWarnFlow(FlowStatusEnum.Lowest.equals(originInfusion.getWarnFlow())?FlowStatusEnum.Lowest:null);
             }
         }
         device.setInfusionId(infusionHistory.getId());
@@ -451,8 +453,10 @@ public class DeviceInfoListener {
         hospitalManagerRegister
                 .get(device.getTenantId())
                 .handleDeviceMessage(device);
-        //实时处理
+        //实时处理,镇痛不足
         infusionHistory.setWarnAnalgesicPoor(device.getWarnAnalgesicPoor());
+        //实时处理,低输注
+        infusionHistory.setWarnFlow(device.getWarnFlow());
     }