From 8c389cb0ccb4ba95c0e00536f282e89ae91ef58e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 10:06:26 +0800
Subject: [PATCH] 顺序需求
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 a037c4f..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);
@@ -61,7 +61,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> getQueueByStatus( @Param("statusList")List<Integer> statusList);
@@ -173,14 +173,14 @@
" <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)
})
List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);
- @Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, create_time limit 1")
+ @Select("SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} order by seq_num, book_timeslot, create_time limit 1")
QueueDO getFirstItemByBedAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
// 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
@@ -190,7 +190,7 @@
" <foreach collection='curStatusList' separator=',' item='status'>" +
" #{status} " +
" </foreach> )" +
- " order by seq_num, create_time limit 1 " +
+ " order by seq_num, book_timeslot, create_time limit 1 " +
"</script>" )
QueueDO getFirstItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
@@ -229,7 +229,7 @@
" <foreach collection='curStatusList' separator=',' item='status'>" +
" #{status} " +
" </foreach> )" +
- " order by seq_num, create_time limit 1 " +
+ " order by seq_num, book_timeslot, create_time limit 1 " +
" ) a " +
" )" +
"</script>"
@@ -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