From 8cef5428fbeda836463463344eef4a5c5ef1cd3e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 09:59:05 +0800
Subject: [PATCH] 获取小屏显示患者列表
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 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 747faea..09d3508 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
@@ -78,25 +78,12 @@
{
String reqIp = ServletUtil.getClientIP(request);
- List<Integer> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
- queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
- queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
- List<QueueDO> queueDOList = callingScreenService.getRoomQueue(reqIp, queueStatusList);
-
-// 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());
+ List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp);
+ List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp);
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(1, BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class));
+ mapVO.put(2, BeanUtils.toBean(queueDOList2, ScreenQueueRespVO.class));
return success( mapVO );
}
--
Gitblit v1.9.3