From dadd95ea351e9747fb66bcc0e57f3ebcae5de73a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 11 四月 2025 14:57:58 +0800
Subject: [PATCH] update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
index fb0a1b5..1dac181 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
@@ -51,7 +51,7 @@
             " <foreach collection='statusList' separator=',' item='status'>" +
             " #{status} " +
             " </foreach> )" +
-            " order by status desc, seq_num" +
+            " order by status desc, seq_num, book_timeslot" +
             "</script>")
     List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);
 
@@ -173,7 +173,7 @@
             " <foreach collection='statusList' separator=',' item='status'>" +
             "   #{status} " +
             " </foreach> ) " +
-            " order by status desc, seq_num " +
+            " order by status desc, seq_num, book_timeslot " +
             "</script>")
     @Results({
             @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
@@ -265,7 +265,7 @@
             " where id = " +
             "  (select a.id from \n" +
             "    (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} " +
-            "      order by seq_num limit 1" +
+            "      order by seq_num, book_timeslot limit 1" +
             "    ) a" +
             "  )" )
     Integer queueRecalledPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,

--
Gitblit v1.9.3