From 22881a1dd395aa0d83025842ed57764b4e15b5bf Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 14 十月 2024 10:40:38 +0800
Subject: [PATCH] BugFix: 领用 & 发放 统计

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 eb8dfef..86b13fb 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
@@ -83,8 +83,7 @@
 
     @Select("<script>" +
             "SELECT count(1) as total_in_status FROM lihu.queue where " +
-            " room_id = #{roomId} and bed_no = #{bedNo} " +
-            " and status in ( " +
+            " status in ( " +
             " <foreach collection='statusList' separator=',' item='status'>" +
             "  #{status} " +
             " </foreach> ) " +
@@ -93,8 +92,7 @@
             "  #{checkType} " +
             " </foreach> ) " +
             "</script>")
-
-    Integer checkTypeAndStatusStatistic( @Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("checkTypes")Integer[] checkTypes, @Param("statusList")List<Byte> statusList);
+    Integer checkTypeAndStatusStatistic( @Param("checkTypes")Integer[] checkTypes, @Param("statusList")List<Byte> statusList );
 
     @Select("<script>" +
             "SELECT room_id, bed_no, count(1) as total_in_status FROM lihu.queue where status in (" +
@@ -113,6 +111,13 @@
     List<BedQueueStatisticDO> bedQueueStatistic(@Param("roomId")Long roomId, @Param("bedNo")String bedNo);
 
     @Select("<script>" +
+            "SELECT status, count(1) as total_in_status FROM lihu.queue where " +
+            " room_id = #{roomId} " +
+            " group by status " +
+            "</script>")
+    List<BedQueueStatisticDO> roomQueueStatistic(@Param("roomId")Long roomId);
+
+    @Select("<script>" +
             "SELECT count(1) FROM lihu.queue " +
             "where room_id = #{roomId} and bed_no = #{bedNo} and status in (" +
             " <foreach collection='statusList' separator=',' item='status'>" +

--
Gitblit v1.9.3