From 647095a34d62db02533cf9c121436900b51c757c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 十月 2024 15:07:13 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
index 0a5ac64..a82fd0c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/doctor/DoctorController.java
@@ -136,12 +136,7 @@
     {
         queueService.finishNextPatient(roomId, bedNo);
 
-        List<Byte> queueStatusList = new ArrayList<>();
-        queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
-        queueStatusList.add(QueueStatusEnum.READY.getStatus());
-        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
-        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
-        List<QueueDO> queueDOList = queueService.getBedQueueByStatus(roomId, bedNo, queueStatusList);
+        List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
 
         // 杩囨护鍑�  灏辫瘖涓殑锛屽噯澶囧彨鍙�
         QueueDO onStageItem = queueDOList.stream().filter(item -> Objects.equals(item.getStatus(), QueueStatusEnum.ONSTAGE.getStatus())).findFirst().orElse(null);
@@ -165,12 +160,7 @@
     {
         queueService.finishReceiveNextPatient(roomId, bedNo);
 
-        List<Byte> queueStatusList = new ArrayList<>();
-        queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
-        queueStatusList.add(QueueStatusEnum.READY.getStatus());
-        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
-        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
-        List<QueueDO> queueDOList = queueService.getBedQueueByStatus(roomId, bedNo, queueStatusList);
+        List<QueueDO> queueDOList = queueService.getToBeCheckedPatient(roomId, bedNo);
 
         // 杩囨护鍑�  灏辫瘖涓殑锛屽噯澶囧彨鍙�
         QueueDO onStageItem = queueDOList.stream().filter(item -> Objects.equals(item.getStatus(), QueueStatusEnum.ONSTAGE.getStatus())).findFirst().orElse(null);

--
Gitblit v1.9.3