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 @@ GROUP BY p.doctor_id, - p.doctor_name + p.doctor_name, + p.schedule_date ORDER BY + p.schedule_date ASC, p.doctor_name ASC