add 智能泵加档、减档校验

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

@@ -105,27 +105,27 @@ public class DeviceInfoListener {
             //处理输注参数
             BusInfusionHistoryEntity infusionHistory = handleInfusionHistory(device, deviceOperator, cacheOperation);
             if(log.isDebugEnabled()){
-                log.debug("消息【{}】,设备号【{}】处理输注参数成功",device.getMsgId(),device.getDeviceId());
+                log.debug("消息【{}】,设备号【{}】处理输注参数成功,处理后结果为【{}】",device.getMsgId(),device.getDeviceId(),JSONUtil.toJsonStr(device));
             }
             //格式化病号
             formatPatientCode(device);
             if(log.isDebugEnabled()){
-                log.debug("消息【{}】,设备号【{}】格式化病号",device.getMsgId(),device.getDeviceId());
+                log.debug("消息【{}】,设备号【{}】格式化病号,处理后结果为【{}】",device.getMsgId(),device.getDeviceId(),JSONUtil.toJsonStr(device));
             }
             //处理输注修改参数，处理病人信息
             handleInfusionModify(device,deviceOperator,cacheOperation);
             if(log.isDebugEnabled()){
-                log.debug("消息【{}】,设备号【{}】处理输注修改参数、病人信息成功",device.getMsgId(),device.getDeviceId());
+                log.debug("消息【{}】,设备号【{}】处理输注修改参数、病人信息成功,处理后结果为【{}】",device.getMsgId(),device.getDeviceId(),JSONUtil.toJsonStr(device));
             }
             //处理历史运行数据
             BusDeviceHistoryEntity history=handleRunningHistory(device);
             if(log.isDebugEnabled()){
-                log.debug("消息【{}】,设备号【{}】处理历史运行数据成功",device.getMsgId(),device.getDeviceId());
+                log.debug("消息【{}】,设备号【{}】处理历史运行数据成功,处理后结果为【{}】",device.getMsgId(),device.getDeviceId(),JSONUtil.toJsonStr(device));
             }
             //处理报警、提醒信息
             handleAlarmOrWarn(history,deviceOperator,cacheOperation);
             if(log.isDebugEnabled()){
-                log.debug("消息【{}】,设备号【{}】处理报警、提醒信息成功",device.getMsgId(),device.getDeviceId());
+                log.debug("消息【{}】,设备号【{}】处理报警、提醒信息成功,处理后结果为【{}】",device.getMsgId(),device.getDeviceId(),JSONUtil.toJsonStr(device));
             }
             //根据功能配置进行最后的一些状态处理
             handleHospitalConfigLast(device,infusionHistory);
@@ -349,8 +349,6 @@ 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());