From 41b1d47bbae721962ee1e42e558d8348a265e053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <guanyu@his.local>
Date: Thu, 9 Apr 2026 09:42:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8C=BB=E7=94=9F=E4=BD=99=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89schedule=5Fdate=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=A4=9A=E6=97=A5=E6=9C=9F=E4=BD=99?=
 =?UTF-8?q?=E5=8F=B7=E7=B4=AF=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/administration/ScheduleSlotMapper.xml  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
index 06d91ec2..a9b91d08 100644
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml
@@ -354,6 +354,7 @@
         SELECT
             p.doctor_id AS doctorId,
             p.doctor_name AS doctorName,
+            p.schedule_date AS scheduleDate,
             COALESCE(
                 SUM(
                     GREATEST(
@@ -363,6 +364,7 @@
                 ),
                 0
             ) AS available,
+            COUNT(DISTINCT p.id) AS poolCount,
             CASE
                 WHEN MAX(
                     CASE
@@ -407,8 +409,10 @@
         </where>
         GROUP BY
             p.doctor_id,
-            p.doctor_name
+            p.doctor_name,
+            p.schedule_date
         ORDER BY
+            p.schedule_date ASC,
             p.doctor_name ASC
     </select>