Ver código fonte

fix用户删除后删除相应的关联角色

A17404李放 3 anos atrás
pai
commit
0799269b05

+ 18 - 4
nb-system/src/main/java/com/nb/bus/service/LocalBusPatientService.java

@@ -15,6 +15,7 @@ import com.nb.bus.enums.DeviceStatusEnum;
 import com.nb.bus.enums.PatientAlarmEnum;
 import com.nb.bus.hospital.HospitalManager;
 import com.nb.bus.hospital.HospitalManagerRegister;
+import com.nb.bus.hospital.config.HospitalDeviceAutoUndoConfigHandler;
 import com.nb.bus.hospital.his.HisScriptSession;
 import com.nb.bus.hospital.his.strategy.HisStrategyEnum;
 import com.nb.bus.service.dto.*;
@@ -413,11 +414,24 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
 
         BusInfusionHistoryEntity originMasterInfusion = infusionHistoryService.getById(originInfusionId);
 
-        hospitalManagerRegister.get(shiftConfig.getTenantId())
-                .getAutoUndoConfigHandler().handler(masterInfusion.toRunningEntity());
+        //自动结束管理
+        HospitalDeviceAutoUndoConfigHandler autoUndoConfigHandler = hospitalManagerRegister.get(shiftConfig.getTenantId())
+                .getAutoUndoConfigHandler();
+        if(DeviceStatusEnum.NoSignal.equals(masterInfusion.getRunState())){
+            autoUndoConfigHandler.judgeNoSignalAutoUndo(masterInfusion.getDeviceId(),masterInfusion.getPatientId(),masterInfusion.getTenantId(),masterInfusion.getId(),masterInfusion.getLastUploadTime());
+        }else if(DeviceStatusEnum.Shutdown.equals(masterInfusion.getRunState())){
+            autoUndoConfigHandler.handler(masterInfusion.toRunningEntity());
+        }
+
 
-        hospitalManagerRegister.get(shiftConfig.getTenantId())
-                .getAutoUndoConfigHandler().handler(originMasterInfusion.toRunningEntity());
+        //自动撤泵处理
+        HospitalDeviceAutoUndoConfigHandler deviceAutoUndoConfigHandler = hospitalManagerRegister.get(shiftConfig.getTenantId())
+                .getAutoUndoConfigHandler();
+        if(DeviceStatusEnum.NoSignal.equals(originMasterInfusion.getRunState())){
+            deviceAutoUndoConfigHandler.judgeNoSignalAutoUndo(originMasterInfusion.getDeviceId(),originMasterInfusion.getPatientId(),originMasterInfusion.getTenantId(),originMasterInfusion.getId(),originMasterInfusion.getLastUploadTime());
+        }else if(DeviceStatusEnum.Shutdown.equals(originMasterInfusion.getRunState())){
+            deviceAutoUndoConfigHandler.handler(originMasterInfusion.toRunningEntity());
+        }
     }
 
     public BusPatientEntity findByFormatCode(String patientCode, String tenantId) {