|
|
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.google.common.cache.Cache;
|
|
|
import com.google.common.cache.CacheBuilder;
|
|
|
+import com.nb.web.api.bean.UndoDeviceConfig;
|
|
|
import com.nb.web.api.entity.BusClinicEntity;
|
|
|
import com.nb.web.service.bus.entity.*;
|
|
|
import com.nb.web.service.bus.listener.event.bean.HisEvent;
|
|
|
@@ -291,7 +292,8 @@ public class HisScriptSession {
|
|
|
publish.add(source);
|
|
|
}
|
|
|
}
|
|
|
- publish=publish.stream().sorted(Comparator.comparing(
|
|
|
+ publish=publish.stream()
|
|
|
+ .sorted(Comparator.comparing(
|
|
|
BusClinicEntity::getStartTime))
|
|
|
.peek(source->{
|
|
|
source.setTenantId(hospitalId);
|
|
|
@@ -301,6 +303,13 @@ public class HisScriptSession {
|
|
|
}else {
|
|
|
source.setMonitorType(false);
|
|
|
}
|
|
|
+ //查看是否结束管理
|
|
|
+ if (ObjectUtil.isNotNull(source.getFinishTime())) {
|
|
|
+ source.setFinished(Boolean.TRUE);
|
|
|
+ UndoDeviceConfig undo = new UndoDeviceConfig();
|
|
|
+ undo.setUndoTime(source.getFinishTime());
|
|
|
+ source.setUndoConfig(undo);
|
|
|
+ }
|
|
|
})
|
|
|
.collect(Collectors.toList());
|
|
|
|