fix

nb-common/src/main/java/com/nb/common/notice/wechat/EnterpriseWeChatNotify.java

@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
  * @createTime 2022年07月19日 15:21:00
  */
 @Component
-//@Profile("prod")
+@Profile("prod")
 public class EnterpriseWeChatNotify {
     @Autowired
     private DiskSpaceHealthIndicator spaceHealthIndicator;

nb-system/src/main/java/com/nb/bus/controller/BusPatientController.java

@@ -251,19 +251,6 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
         }
         //泵切换完成后，对病号报警解除
         infusionService.undo(undoConfig,false);
-        PatientOperator operator = patientRegistry.getOperator(undoConfig.getTenantId(), patient.getOriginCode());
-        //判断当前病号下是否还存在副泵
-        long count = infusionService.count(new QueryWrapper<BusInfusionHistoryEntity>().lambda()
-                .eq(BusInfusionHistoryEntity::getClinicId, operator.getClinicId())
-                .eq(BusInfusionHistoryEntity::getFinished,false)
-                .eq(BusInfusionHistoryEntity::getIsUndo,false));
-        //处理缓存信息
-        if(count==1){
-            patientService.update(new UpdateWrapper<BusPatientEntity>().lambda()
-                    .eq(BusPatientEntity::getId,patient.getId())
-                    .set(BusPatientEntity::getAlarm, PatientAlarmEnum.NONE));
-            wsPublishUtils.publishDeviceRepeat(undoConfig.getTenantId());
-        }
         wsPublishUtils.publishPatientMonitor(patient.getId(),undoConfig.getTenantId());
         return R.success();
     }

nb-system/src/main/java/com/nb/bus/service/LocalBusInfusionHistoryService.java

@@ -19,6 +19,7 @@ import com.nb.bus.mapper.BusInfusionHistoryMapper;
 import com.nb.bus.registry.device.DeviceOperator;
 import com.nb.bus.registry.device.DeviceRegistry;
 import com.nb.bus.service.dto.*;
+import com.nb.bus.utils.WsPublishUtils;
 import com.nb.common.crud.BaseService;
 import com.nb.common.exception.CustomException;
 import lombok.extern.slf4j.Slf4j;
@@ -62,6 +63,9 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
     @Lazy
     private LocalBusInfusionModifyService modifyService;
 
+    @Autowired
+    @Lazy
+    private WsPublishUtils wsPublishUtils;
     @Override
     public void validateBeforeSave(BusInfusionHistoryEntity entity) {
 
@@ -260,12 +264,14 @@ public class LocalBusInfusionHistoryService extends BaseService<BusInfusionHisto
                             .set(BusInfusionHistoryEntity::getWitnesses,undo.getWitnesses()));
 
                     long runningInfusionCount = getRunningInfusionCount(patient.getId());
-
                     patientService.update(new UpdateWrapper<BusPatientEntity>()
                             .lambda()
                             .eq(BusPatientEntity::getId,patient.getId())
-                            .set(runningInfusionCount>0,BusPatientEntity::getAlarm,PatientAlarmEnum.DEVICE_REPEAT)
+                            .set(runningInfusionCount==1,BusPatientEntity::getAlarm,PatientAlarmEnum.NONE)
+                            .set(runningInfusionCount>1,BusPatientEntity::getAlarm,PatientAlarmEnum.DEVICE_REPEAT)
                             .set(runningInfusionCount==0,BusPatientEntity::getAlarm,PatientAlarmEnum.NONE));
+                    wsPublishUtils.publishDeviceRepeat(manualUndoConfig.getTenantId());
+                    wsPublishUtils.publishDeviceNone(manualUndoConfig.getTenantId());
                 }
             }