From 7cf7537009b3add8ce851b56163f43ed15000041 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 15 十月 2024 14:12:40 +0800
Subject: [PATCH] 装机 过号&召回 逻辑 update

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 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 86b13fb..55e490f 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
@@ -141,11 +141,20 @@
             " (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);
 
-    // 鏌愪釜璇婂鑼冨洿鍐� [宸查鐢╙浜哄憳 鎶㈠崰
-    @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 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 in ( " +
+            "           <foreach collection='curStatusList' separator=',' item='status'>" +
+            "             #{status} " +
+            "           </foreach> )" +
+            "    ) a " +
+            "  )" +
+            "</script>"
+    )
+    Integer preemptToBeInstalledPatient(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatusList")List<Byte> curStatusList, @Param("newStatus")Byte 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);
@@ -159,18 +168,28 @@
                                   @Param("seqNum")Integer seqNum, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus,
                                   @Param("checkType")Integer checkType);
 
-    @Update("update lihu.queue set status = #{newStatus}, seq_num = #{seqNum}, passed = 1 " +
+    @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 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);
 
-    @Update("update lihu.queue set status = #{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} ")
     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}, bed_no = #{bedNo}, passed = 1 " +
+            " where room_id = #{roomId} and status = #{curStatus} and pat_id = #{patId} ")
+    Integer recallPassedInstallPatient(@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 jump_flag = #{jumped} " +
             " where status = #{curStatus} and pat_id = #{patId}")
     Integer queueJump(@Param("patId")String patId, @Param("curStatus")Byte curStatus, @Param("jumped")Byte jumped );

--
Gitblit v1.9.3