Просмотр исходного кода

add 智能泵加档受限在非减档状态下一直存在

A17404李放 3 лет назад
Родитель
Сommit
d175a9510e

+ 4 - 3
nb-system/src/main/java/com/nb/bus/listener/DeviceInfoListener.java

@@ -202,6 +202,7 @@ public class DeviceInfoListener {
      * @return void
      */
     private void handleIntelligent(BusDeviceRunningEntity device, DeviceOperator deviceOperator, List<Supplier<?>> cacheOperation) {
+        //开机数据不进行加减档判定
         if (!DeviceStatusEnum.StartUp.equals(device.getRunState())) {
             if(DeviceTypeEnum.intelligent.equals(device.getType())
                     &&null==device.getWarnFlow()
@@ -227,9 +228,6 @@ public class DeviceInfoListener {
                 if(FlowStatusEnum.Down.equals(device.getWarnFlow())){
                     deviceOperator.setFlowLimit(false);
                 }
-                if(FlowStatusEnum.Limited.equals(device.getWarnFlow())){
-                    deviceOperator.setFlowLimit(true);
-                }
                 return null;
             });
         }else {
@@ -389,6 +387,9 @@ public class DeviceInfoListener {
                 deviceOperator.setStartTime(infusionHistory.getStartTime());
                 deviceOperator.setInfusionTenantId(device.getTenantId());
             }
+            if(ObjectUtil.equal(FlowStatusEnum.Limited,device.getWarnFlow())) {
+                deviceOperator.setFlowLimit(true);
+            }
             patientOperator.setExist(true);
             return null;
         });