From 6f9f5260a6ccf2fb653707f54b44bc5f111d684a Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 20 九月 2024 14:58:34 +0800
Subject: [PATCH] 移除 已不用的字段

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/queueMapper.java |   56 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 17 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 64fed4b..0f917c6 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,6 +40,37 @@
     Integer getMaxSeqNum();
 
     @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" +
+            "</script>")
+    List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Byte> statusList);
+
+    @Select("<script>" +
+            "SELECT * FROM lihu.queue " +
+            "where status in (" +
+            " <foreach collection='statusList' separator=',' item='status'>" +
+            "  #{status} " +
+            " </foreach> )" +
+            " order by status desc, seq_num" +
+            "</script>")
+    List<QueueDO> getQueueByStatus( @Param("statusList")List<Byte> statusList);
+
+    @Select("<script>" +
+            "SELECT * FROM lihu.queue " +
+            "where id >= #{from} and status in (" +
+            " <foreach collection='statusList' separator=',' item='status'>" +
+            "  #{status} " +
+            " </foreach> )" +
+            " limit #{size} " +
+            " order by id" +
+            "</script>")
+    List<QueueDO> getPartialQueueByStatus( @Param("statusList")List<Byte> statusList, @Param("from") Integer from, @Param("size") Integer size);
+
+    @Select("<script>" +
             "SELECT count(1) as total_in_status FROM lihu.queue where status in (" +
             " <foreach collection='statusList' separator=',' item='status'>" +
             "  #{status} " +
@@ -63,30 +94,20 @@
             "</script>")
     List<BedQueueStatisticDO> bedQueueStatistic(@Param("roomId")Long roomId, @Param("bedNo")String bedNo);
 
-    @Update("update lihu.queue set status = #{newStatus} 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 bed_no = #{bedNo} and status = #{curStatus}) a )")
-    Integer updateQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("curStatus")Byte curStatus, @Param("newStatus")Byte newStatus);
-
-    @Select("<script>" +
-            "SELECT * FROM lihu.queue " +
-            "where room_id = #{roomId} and status in (" +
-            " <foreach collection='statusList' separator=',' item='status'>" +
-            " #{status} " +
-            " </foreach> )" +
-            " order by seq_num" +
-            "</script>")
-    List<QueueDO> getRoomQueueByStatus(@Param("roomId")Long roomId, @Param("statusList")List<Byte> 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 seq_num" +
+            " order by status desc, seq_num" +
             "</script>")
     List<QueueDO> getDoctorQueueByStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("statusList")List<Byte> statusList);
+
+    @Update("update lihu.queue set status = #{newStatus} 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 bed_no = #{bedNo} and status = #{curStatus}) a )")
+    Integer updateQueueStatus(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @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" +
@@ -111,7 +132,8 @@
             " where status = #{curStatus} and pat_id = #{patId}")
     Integer queueJump(@Param("patId")String patId, @Param("curStatus")Byte curStatus, @Param("jumped")Byte jumped );
 
+    //@Update("TRUNCATE TABLE lihu.queue")
     @Delete("delete from lihu.queue where TO_DAYS(book_date) != TO_DAYS(NOW())")
-    Integer clearQueue();
+    void clearQueue();
 }
 

--
Gitblit v1.9.3