From 09ca7cb697e37207e38842adcba1006344ae897c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 16 十月 2024 11:59:44 +0800
Subject: [PATCH] 诊间屏 过号不独立显示
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
index f372601..76b050d 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
@@ -62,16 +62,17 @@
queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
queueStatusList.add(QueueStatusEnum.READY.getStatus());
queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+ queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
List<QueueDO> queueDOList = callingScreenService.getRoomQueue(reqIp, queueStatusList);
- List<QueueDO> passedList = queueDOList.stream().filter(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus()).toList();
- queueDOList.removeIf(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus());
+// List<QueueDO> passedList = queueDOList.stream().filter(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus() || queue.getStatus() == QueueStatusEnum.PASSED_INSTALL.getStatus()).toList();
+// queueDOList.removeIf(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus());
Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
mapVO.put(1, BeanUtils.toBean(queueDOList, ScreenQueueRespVO.class));
- mapVO.put(2, BeanUtils.toBean(passedList, ScreenQueueRespVO.class));
+// mapVO.put(2, BeanUtils.toBean(passedList, ScreenQueueRespVO.class));
return success( mapVO );
}
--
Gitblit v1.9.3