From fce96ef468291fb9a0e6a4d34ab371315e9485d4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 03 十月 2026 00:59:44 +0800
Subject: [PATCH] ai优化

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |  386 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 340 insertions(+), 46 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 4da0f9c..485c620 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
@@ -27,7 +27,7 @@
                 .eqIfPresent(QueueDO::getBookTimeslot, reqVO.getBookTimeslot())
                 .eqIfPresent(QueueDO::getBookCheckType, reqVO.getBookCheckType())
                 .eqIfPresent(QueueDO::getSeqNum, reqVO.getSeqNum())
-                .eqIfPresent(QueueDO::getStatus, reqVO.getStatus())
+                .inIfPresent(QueueDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(QueueDO::getPassed, reqVO.getPassed())
                 .eqIfPresent(QueueDO::getExpired, reqVO.getExpired())
                 .eqIfPresent(QueueDO::getRoomId, reqVO.getRoomId())
@@ -39,28 +39,114 @@
     @Select("SELECT max(seq_num) FROM lihu.queue")
     Integer getMaxSeqNum();
 
-    @Select("SELECT * FROM lihu.queue where pat_id = #{patId}")
-    QueueDO getQueueByPatId(@Param("patId")String patId);
+    @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 deleted = 0 and status in (
+                 <foreach collection='statusList' separator=',' item='status'>
+                   #{status} 
+                 </foreach> )
+                order by case
+                           when status = 30 then 0
+                           when status in (3, 5) then 1
+                           else 2
+                         end,
+                         seq_num, book_timeslot
+            </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);
+
+    /**
+     * 澶у睆鍙栨暟銆�
+     * <p>
+     * 鎺掑簭瑙勫垯锛堥渶姹�8锛夛細**灏辫瘖涓�(30) 缃《 鈫� 杩囧彿(3/5) 涓庣瓑鍊�(10/15/20/12) 鎸夋帓闃熷簭鍙� seq_num 鍗囧簭娣锋帓**銆�
+     * 鍘熷厛鐢� {@code order by status desc}锛屼細鎶婅繃鍙�(3/5)鎺掑埌姣忎竴鍒楁渶搴曢儴锛�
+     * 鍦� {@code overflow-y:auto} 鐨勫垪閲屾粴涓嶅埌锛岀瓑鍚屼簬"杩囧彿涓嶆樉绀�"銆�
+     * <p>
+     * 鍚屾椂琛ヤ笂 {@code deleted = 0}锛氭湰鏂规硶鏄嚜瀹氫箟 {@code @Select}锛�
+     * 浼氱粫杩� MyBatis-Plus 鐨� {@code @TableLogic} 閫昏緫鍒犻櫎杩囨护銆�
+     */
+    @Select("""
+            <script>
+                SELECT * FROM lihu.queue
+                where deleted = 0 and status in (
+                 <foreach collection='statusList' separator=',' item='status'>
+                   #{status} 
+                 </foreach> )
+                order by case
+                           when status = 30 then 0
+                           when status in (3, 5) then 1
+                           else 2
+                         end,
+                         seq_num, book_timeslot
+            </script>
+            """)
+    @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 " +
-            "where room_id = #{roomId} and status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            " #{status} " +
-            " </foreach> )" +
-            " order by status desc, seq_num" +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='checkType'>" +
+            "      #{checkType} " +
+            "    </foreach> )" +
+            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
-    List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Byte> statusList);
+    @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>" +
             "SELECT * FROM lihu.queue " +
-            "where status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            "  #{status} " +
-            " </foreach> )" +
-            " order by status desc, seq_num" +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+            "      #{_checkType} " +
+            "    </foreach> ) " +
+            "  and status = #{status} " +
+            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
-    List<QueueDO> getQueueByStatus( @Param("statusList")List<Byte> statusList);
+    @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>" +
+            "SELECT * FROM lihu.queue " +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+            "      #{_checkType} " +
+            "    </foreach> ) " +
+            "  and status in (" +
+            "    <foreach collection='statusList' separator=',' item='_status'>" +
+            "      #{_status} " +
+            "    </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>" +
             "SELECT * FROM lihu.queue " +
@@ -71,7 +157,10 @@
             " limit #{size} " +
             " order by id" +
             "</script>")
-    List<QueueDO> getPartialQueueByStatus( @Param("statusList")List<Byte> statusList, @Param("from") Integer from, @Param("size") Integer size);
+    @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>" +
             "SELECT count(1) as total_in_status FROM lihu.queue where status in (" +
@@ -79,7 +168,21 @@
             "  #{status} " +
             " </foreach> );" +
             "</script>")
-    Integer statusStatistic(@Param("statusList")List<Byte> statusList);
+    Integer statusStatistic(@Param("statusList")List<Integer> statusList);
+
+    @Select("<script>" +
+            "SELECT count(1) as total_in_status FROM lihu.queue where " +
+            " deleted = 0 and book_date = CURDATE() and " +
+            " status in ( " +
+            " <foreach collection='statusList' separator=',' item='status'>" +
+            "  #{status} " +
+            " </foreach> ) " +
+            " and book_check_type in ( " +
+            " <foreach collection='checkTypes' separator=',' item='checkType'>" +
+            "  #{checkType} " +
+            " </foreach> ) " +
+            "</script>")
+    Integer checkTypeAndStatusStatistic( @Param("checkTypes")Integer[] checkTypes, @Param("statusList")List<Integer> statusList );
 
     @Select("<script>" +
             "SELECT room_id, bed_no, count(1) as total_in_status FROM lihu.queue where status in (" +
@@ -88,63 +191,254 @@
             " </foreach> )" +
             " group by room_id, bed_no; "
             +"</script>")
-    List<QueueStatisticDO> queueStatistic(@Param("statusList")List<Byte> statusList);
+    List<QueueStatisticDO> queueStatistic(@Param("statusList")List<Integer> statusList);
 
     @Select("<script>" +
             "SELECT status, count(1) as total_in_status FROM lihu.queue where " +
+            " deleted = 0 and book_date = CURDATE() and " +
             " room_id = #{roomId} and bed_no = #{bedNo} " +
             " group by status " +
             "</script>")
     List<BedQueueStatisticDO> bedQueueStatistic(@Param("roomId")Long roomId, @Param("bedNo")String bedNo);
 
     @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" +
+            "SELECT status, count(1) as total_in_status FROM lihu.queue where " +
+            " deleted = 0 and book_date = CURDATE() and " +
+            " room_id = #{roomId} " +
+            " group by status " +
             "</script>")
-    List<QueueDO> getBedQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Byte> statusList);
+    List<BedQueueStatisticDO> roomQueueStatistic(@Param("roomId")Long roomId);
 
-    @Update("update lihu.queue set status = #{newStatus} where seq_num = \n" +
+    @Select("<script>" +
+            "SELECT count(1) FROM lihu.queue " +
+            "where deleted = 0 and book_date = CURDATE() and " +
+            " room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
+            " <foreach collection='statusList' separator=',' item='status'>" +
+            "   #{status} " +
+            " </foreach> )" +
+            "</script>")
+    Integer bedQueueStatisticByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Integer> statusList);
+
+    @Select("""
+            <script>
+                SELECT * FROM lihu.queue 
+                where deleted = 0 and 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>
+            """)
+    @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 limit 1
+            """)
+    QueueDO getBedFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus);
+
+    /**
+     * 銆愰渶姹�2 鐩稿叧缂洪櫡淇銆戞寜銆屽伐浣� + 鎮ｈ�� + 妫�鏌ョ被鍨� + 鐘舵�併��**绮剧‘**瀹氫綅闃熷垪琛屻��
+     * <p>
+     * 鐢ㄤ簬鏇夸唬 {@link #getBedFirstQueueItemByStatus}锛氬悗鑰呭彧鎸�"宸ヤ綅 + 鐘舵�佸彇 seq_num 鏈�灏忕殑涓�鏉�"锛�
+     * 褰撳尰鐢熷厛鐐�"鏀惧純妫�鏌�"锛堜細鎶婅鎮ｈ�呯疆涓� 40锛夊悗鍐嶇偣"妫�鏌ュ畬鎴�"鏃讹紝
+     * 浼氬彇鍒�**涓嬩竴浣嶆偅鑰�**骞舵妸浠栬缃负宸插畬鎴愶紙璇﹁ DevRentServiceImpl.routineFinishOperation锛夈��
+     */
+    @Select("""
+            SELECT * from lihu.queue
+            where room_id = #{roomId} and bed_no = #{bedNo}
+              and status = #{curStatus}
+              and pat_id = #{patId}
+              and book_check_type = #{checkType}
+              and TO_DAYS(book_date) = TO_DAYS(NOW())
+            order by seq_num limit 1
+            """)
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
+    QueueDO getBedQueueItemByPatAndStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                          @Param("patId")String patId, @Param("checkType")Integer checkType,
+                                          @Param("curStatus")Integer curStatus);
+
+    /**
+     * 鎸夊伐浣� + 鐘舵�� + 浠婃棩鍙�**鏈�杩戞洿鏂�**鐨勪竴鏉°��
+     * <p>
+     * 姣斻�宻eq_num 鏈�灏忋�嶆洿璐村悎"褰撳墠姝ｅ湪灏辫瘖/瑁呮満鐨勯偅浣嶆偅鑰�"锛歴eq_num 鏈�灏忔槸鏈椂娈垫渶鏃╂帓闃熺殑锛�
+     * 鑰� update_time 鏈�鏂版墠鏄垰琚彨鍙锋帹杩涘埌璇ョ姸鎬佺殑銆�
+     */
+    @Select("""
+            SELECT * from lihu.queue
+            where room_id = #{roomId} and bed_no = #{bedNo}
+              and status = #{curStatus}
+              and TO_DAYS(book_date) = TO_DAYS(NOW())
+            order by update_time desc, seq_num limit 1
+            """)
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
+    QueueDO getBedLatestQueueItemByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                          @Param("curStatus")Integer curStatus);
+
+    @Select("""
+            SELECT * from lihu.queue where apply_no = #{applyNo} and status = #{curStatus}  order by seq_num, book_timeslot limit 1
+            """)
+    QueueDO getBedFirstQueueItemByApplyNo(@Param("applyNo")String applyNo, @Param("curStatus")Integer curStatus);
+
+    // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
+    // 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
+    @Select("<script> " +
+            "select * from lihu.queue where room_id = #{roomId} and status in ( " +
+            "       <foreach collection='curStatusList' separator=',' item='status'>" +
+            "           #{status} " +
+            "       </foreach> )" +
+            "       order by seq_num, book_timeslot limit 1 " +
+            "</script>" )
+    QueueDO getRoomFirstQueueItemByStatus(@Param("roomId")Long roomId, @Param("curStatusList")List<Integer> curStatusList);
+
+    @Select("<script> " +
+            "select * from lihu.queue where appoint_id in ( " +
+            "       <foreach collection='appointIdList' separator=',' item='appointId'>" +
+            "           #{appointId} " +
+            "       </foreach> )" +
+            "</script>" )
+    List<QueueDO> selectBookSeqNumByAppointIdList(@Param("appointIdList") List<Long> appointIdList);
+
+/*
+    @Select("select * from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
+            " and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    QueueDO XXX(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                       @Param("patId")String patId, @Param("checkType")Integer checkType,
+                                       @Param("curStatus")Integer curStatus);
+*/
+
+    @Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and book_check_type = #{checkType} and status = #{curStatus}; " )
+    Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("checkType")Integer checkType, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
+    @Update("update lihu.queue set status = #{newStatus} where status = #{curStatus} and seq_num = \n" +
             "(select a.min_seq_num from \n" +
             " (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus}) a )")
-    Integer updateBedQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
+    Integer updateBedQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
 
-    // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙浜哄憳 鎶㈠崰
-    @Update("update lihu.queue set status = #{newStatus}, bed_no = #{bedNo} where seq_num = \n" +
-            "(select a.min_seq_num from \n" +
-            " (select min(seq_num) as min_seq_num from lihu.queue where room_id = #{roomId} and status = #{curStatus}) a )")
-    Integer preemptReceivedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
+    // 寮冪敤鍘熷洜锛氶渶瑕佸厛鑾峰彇锛屽垽鏂�昏緫澶勭悊鍚庯紝鍐嶆洿鏂�
+    // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙ [宸插彫鍥�-瀹夎] 浜哄憳 鎶㈠崰, 浼氭洿鏂� [宸ヤ綅鍙穄
+    // 娌℃湁闄愬畾妫�鏌ョ被鍨嬶紝涓嶈浣跨敤鏃堕棿妲�
+    @Update("<script> " +
+            "update lihu.queue set status = #{newStatus}, bed_no = #{bedNo} where id = \n" +
+            "  (select a.id from \n" +
+            "    (select id from lihu.queue where room_id = #{roomId} " +
+            "       and status in ( " +
+            "           <foreach collection='curStatusList' separator=',' item='status'>" +
+            "             #{status} " +
+            "           </foreach> )" +
+            "       order by seq_num, book_timeslot limit 1 " +
+            "    ) a " +
+            "  )" +
+            "</script>"
+    )
+    Integer preemptToBeInstalledPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatusList")List<Integer> curStatusList, @Param("newStatus")Integer newStatus);
 
-    @Update("update lihu.queue set status = #{newStatus} where pat_id = #{patId} and status = #{curStatus}")
-    Integer updatePatientQueueStatus(@Param("patId")String patId, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
-
-    // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 鎶㈠崰
+    // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰
     @Update("update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
             " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
             "  (select a.id from \n" +
             "    (select id from lihu.queue where status = #{curStatus} and book_check_type= #{checkType} order by jump_flag desc, book_timeslot, create_time limit 1) a)")
     Integer preemptWaitingPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
-                                  @Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus,
+                                  @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
                                   @Param("checkType")Integer checkType);
 
-    @Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum}, passed = 1 " +
+    // 鏁翠釜绯荤粺鑼冨洿鍐� [鎺掗槦涓璢浜哄憳 [琚伐浣嶅尰鐢焆鎶㈠崰 鏍规嵁 澶氫釜妫�鏌ラ」鐩�
+    @Update("<script>" +
+            "update lihu.queue set status = #{newStatus}, room_id = #{roomId}, room_name = #{roomName}, \n" +
+            " bed_no = #{bedNo}, seq_num = #{seqNum} where id = \n" +
+            "  (select a.id from \n" +
+            "    (select id from lihu.queue where status = #{curStatus} " +
+            "       and book_check_type in ( " +
+            "           <foreach collection='checkTypeArray' separator=',' item='_checkType'>" +
+            "             #{_checkType} " +
+            "           </foreach> )" +
+            "       order by jump_flag desc, book_timeslot, create_time limit 1) a) " +
+            "</script>")
+    Integer preemptWaitingPatientWithBedCheckTypes(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
+                                  @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus,
+                                  @Param("checkTypeArray")Integer[] checkTypeArray);
+
+    @Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum} " +
             " 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) a)")
+            "    (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} " +
+            "      order by seq_num, book_timeslot limit 1" +
+            "    ) a" +
+            "  )" )
     Integer queueRecalledPatient(@Param("roomId")Long roomId, @Param("roomName")String roomName, @Param("bedNo")String bedNo,
-                                 @Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
+                                 @Param("seqNum")Integer seqNum, @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
 
-    @Update("update lihu.queue set status = #{newStatus} " +
-            " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} ")
-    Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("patId")String patId,
-                                @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
+    // 甯歌妫�鏌� 鎴� 棰嗙敤 鐨勬偅鑰呭彫鍥�, 鍘熷伐浣嶅鐞�
+    @Update("update lihu.queue set status = #{newStatus}, passed = 1 " +
+            " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    Integer recallPassedPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                @Param("patId")String patId, @Param("checkType")Integer checkType,
+                                @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
+    // 瑁呮満鍖荤敓 鍏佽鎶㈠崰 鏈瀹� [瀹夎杩囧彿] 鐨勬偅鑰�
+    @Update("update lihu.queue set status = #{newStatus}, bed_no = #{bedNo}, passed = 1 " +
+            " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} and book_check_type=#{checkType}")
+    Integer recallPassedInstallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                       @Param("patId")String patId, @Param("checkType")Integer checkType,
+                                @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")Byte 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 );
+
+    // ==================== 闇�姹�2锛氳鐐广�屽彨鍙� / 妫�鏌ュ畬鎴愩�嶇殑鎾ら攢 ====================
+
+    /**
+     * 鎾ら攢銆屾鏌ュ畬鎴愩�嶏細鎶婃湰宸ヤ綅浠婃棩鐨�**鎸囧畾鎮ｈ��**浠� 宸插氨璇�(40) 閫�鍥� 鍊欒瘖涓�(20)銆�
+     * <p>
+     * 蹇呴』鎸� {@code pat_id + book_check_type + 浠婃棩} 绮剧‘瀹氫綅锛�**涓嶈兘**鍙寜
+     * "宸ヤ綅 + status=40 鍙栫涓�鏉�"鈥斺�旈偅浼氬湪鏈熼棿宸插彨涓嬩竴浣嶆偅鑰呮椂璇敼浠栦汉锛堣
+     * {@code DevRentServiceImpl.routineFinishOperation} 鐨勬棦鏈夌己闄凤級銆�
+     * <p>
+     * {@code passed = 0} 鏄负浜嗚鎮ｈ�呴噸鏂板洖鍒版甯稿�欒瘖搴忓垪锛堥潪"杩囧彿"鎬侊級銆�
+     */
+    @Update("update lihu.queue set status = #{newStatus}, passed = 0 " +
+            " where room_id = #{roomId} and bed_no = #{bedNo} and status = #{curStatus} " +
+            "   and pat_id = #{patId} and book_check_type = #{checkType} " +
+            "   and TO_DAYS(book_date) = TO_DAYS(NOW())")
+    Integer undoFinishPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                              @Param("patId")String patId, @Param("checkType")Integer checkType,
+                              @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
+    /**
+     * 鎾ら攢銆岃鐐瑰彨鍙枫�嶏細鎶婃湰宸ヤ綅褰撳墠 灏辫瘖涓�(30) 鐨勬偅鑰呴��鍥� 鍊欒瘖涓�(20)銆�
+     * <p>
+     * 浠呮寜宸ヤ綅+鐘舵�佸畾浣嶏紙"褰撳墠姝ｅ湪灏辫瘖鐨勯偅涓�浣�"锛夛紝涓嶄娇鐢� seq_num 瀛愭煡璇紝
+     * 閬垮厤涓� {@code updateBedQueueStatus} 鐨勫啓娉曟贩娣嗐��
+     */
+    @Update("update lihu.queue set status = #{newStatus} " +
+            " where id = " +
+            "  (select a.id from " +
+            "    (select id from lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
+            "       and status = #{curStatus} and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+            "       order by seq_num, book_timeslot limit 1) a)")
+    Integer undoCallPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                            @Param("curStatus")Integer curStatus, @Param("newStatus")Integer newStatus);
+
+    /**
+     * 鍙栨湰宸ヤ綅浠婃棩**鏈�杩戜竴浣嶅凡瀹屾垚**鐨勬偅鑰咃紙鐢ㄤ簬鐣岄潰鎻愮ず"鍙挙閿�鐨勬槸璋�"锛夈��
+     */
+    @Select("SELECT * FROM lihu.queue where room_id = #{roomId} and bed_no = #{bedNo} " +
+            " and status = #{status} and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+            " order by update_time desc, seq_num desc limit 1")
+    @Results({
+            @Result(property = "patDetails", column = "pat_details", typeHandler=com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler.class)
+    })
+    QueueDO getBedLastFinishedQueueItem(@Param("roomId")Long roomId, @Param("bedNo")String bedNo,
+                                        @Param("status")Integer status);
 
     //@Update("TRUNCATE TABLE lihu.queue")
     @Delete("delete from lihu.queue where TO_DAYS(book_date) != TO_DAYS(NOW())")

--
Gitblit v1.9.3