18339543638 2 年之前
父节点
当前提交
3e76a6bc02

+ 9 - 4
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceService.java

@@ -394,13 +394,18 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
         this.update(new UpdateWrapper<BusDeviceEntity>().lambda()
                 .in(BusDeviceEntity::getDeviceId,deviceIds)
                 .set(BusDeviceEntity::getTenantId,afterTenantId));
-        operators
-                .stream()
-                .filter(Objects::nonNull)
-                .forEach(deviceOperator -> deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID));
         //对进行中的输注进行换绑,其他医院切换到主医院不进行输注换绑
         if ("1".equals(afterTenantId)) {
+            operators
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .forEach(deviceOperator -> deviceOperator.getCache().clear());
             return;
+        }else {
+            operators
+                    .stream()
+                    .filter(Objects::nonNull)
+                    .forEach(deviceOperator -> deviceOperator.getCache().remove(DeviceKeyConstant.TENANT_ID));
         }
         List<PatientMonitorResult> results = patientService.selectAll(new PatientMonitorQuery());
         if(CollectionUtil.isEmpty(results)){