From ef86458242721792b2f181183811904eddfb8ef5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 11:44:38 +0800
Subject: [PATCH] 大屏显示患者 实现调整

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 bd19244..9b42c14 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
@@ -42,8 +42,8 @@
     @Select("SELECT * FROM lihu.queue where seq_num = #{seqNum}")
     QueueDO getQueueItemBySeqNum(@Param("seqNum")Integer seqNum);
 
-    @Select("SELECT * FROM lihu.queue where pat_id = #{patId}")
-    QueueDO getQueueByPatId(@Param("patId")String patId);
+    @Select("SELECT * FROM lihu.queue where pat_id = #{patId} and book_check_type = #{bookCheckType}")
+    QueueDO getQueueByPatId(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType);
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
@@ -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);
 
@@ -286,8 +286,9 @@
                                 @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
 
     @Update("update lihu.queue set jump_flag = #{jumped} " +
-            " where status = #{curStatus} and pat_id = #{patId}")
-    Integer queueJump(@Param("patId")String patId, @Param("curStatus")Integer curStatus, @Param("jumped")Byte jumped );
+            " where status = #{curStatus} and pat_id = #{patId} and book_check_type=#{bookCheckType}")
+    Integer queueJump(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType,
+                      @Param("curStatus")Integer curStatus, @Param("jumped")Byte jumped );
 
     //@Update("TRUNCATE TABLE lihu.queue")
     @Delete("delete from lihu.queue where TO_DAYS(book_date) != TO_DAYS(NOW())")

--
Gitblit v1.9.3