From c04653a6df7a4f9d3bd593f51ae9a8cd7ee93122 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 四月 2025 15:17:18 +0800
Subject: [PATCH] 患者顺序 处理

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   83 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 31 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 9eb47ac..5817ea8 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
@@ -40,30 +40,31 @@
     Integer getMaxSeqNum();
 
     @Select("SELECT * FROM lihu.queue where seq_num = #{seqNum}")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     QueueDO getQueueItemBySeqNum(@Param("seqNum")Integer seqNum);
 
     @Select("SELECT * FROM lihu.queue where pat_id = #{patId} and book_check_type = #{bookCheckType}")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     QueueDO getQueueByPatId(@Param("patId")String patId, @Param("bookCheckType")Integer bookCheckType);
 
-    @Select("<script>" +
-            "SELECT * FROM lihu.queue " +
-            "where room_id = #{roomId} and status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            " #{status} " +
-            " </foreach> )" +
-            " order by status desc, seq_num, book_timeslot" +
-            "</script>")
+    @Select("""
+            <script>
+                SELECT * FROM lihu.queue
+                where room_id = #{roomId} and status in (
+                 <foreach collection='statusList' separator=',' item='status'>
+                   #{status} 
+                 </foreach> )
+                order by status desc, seq_num, create_time
+            </script>
+            """)
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);
-
-    @Select("<script>" +
-            "SELECT * FROM lihu.queue " +
-            "where room_id = #{roomId} and status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            " #{status} " +
-            " </foreach> )" +
-            " order by status desc, seq_num, create_time" +
-            "</script>")
-    List<QueueDO> getRoomInstallQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Integer> statusList);
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
@@ -73,7 +74,10 @@
             " </foreach> )" +
             " order by status desc, seq_num, book_timeslot" +
             "</script>")
-    List<QueueDO> getQueueByStatus( @Param("statusList")List<Integer> statusList);
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
+    List<QueueDO> getBigScreenQueueByStatus(@Param("statusList")List<Integer> statusList);
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
@@ -84,6 +88,9 @@
             "    </foreach> )" +
             "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<QueueDO> getCurPatGivenCheckTypes(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType);
 
     @Select("<script>" +
@@ -96,6 +103,9 @@
             "  and status = #{status} " +
             "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<QueueDO> getCurPatGivenCheckTypesAndStatus(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("status")Integer status);
 
     @Select("<script>" +
@@ -111,6 +121,9 @@
             "    </foreach> ) " +
             "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<QueueDO> getCurPatGivenCheckTypesAndStatusList(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("statusList")List<Integer> statusList);
 
     @Select("<script>" +
@@ -122,6 +135,9 @@
             " limit #{size} " +
             " order by id" +
             "</script>")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
     List<QueueDO> getPartialQueueByStatus( @Param("statusList")List<Integer> statusList, @Param("from") Integer from, @Param("size") Integer size);
 
     @Select("<script>" +
@@ -177,21 +193,26 @@
             "</script>")
     Integer bedQueueStatisticByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);
 
-    @Select("<script>" +
-            "SELECT * FROM lihu.queue " +
-            "where room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            "   #{status} " +
-            " </foreach> ) " +
-            " order by status desc, seq_num, book_timeslot " +
-            "</script>")
+    @Select("""
+            <script>
+                SELECT * FROM lihu.queue 
+                where room_id = #{roomId} and bed_no = #{bedNo} and status in (
+                  <foreach collection='statusList' separator=',' item='status'>
+                    #{status} 
+                  </foreach> ) 
+                order by status desc, seq_num, create_time 
+            </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, book_timeslot, create_time limit 1")
-    QueueDO getFirstItemByBedAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
+    @Select("""
+            SELECT * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo}
+               and status = #{curStatus} order by seq_num, create_time limit 1
+            """)
+    QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
 
     // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
     // 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
@@ -202,7 +223,7 @@
             "       </foreach> )" +
             "       order by seq_num, create_time limit 1 " +
             "</script>" )
-    QueueDO getFirstInstallItemByRoomAndStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
+    QueueDO getRoomFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
 
     @Select("<script> " +
             "select * from lihu.queue where appoint_id in ( " +
@@ -239,7 +260,7 @@
             "           <foreach collection='curStatusList' separator=',' item='status'>" +
             "             #{status} " +
             "           </foreach> )" +
-            "       order by seq_num, book_timeslot, create_time limit 1 " +
+            "       order by seq_num, create_time limit 1 " +
             "    ) a " +
             "  )" +
             "</script>"

--
Gitblit v1.9.3