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 a9b91d08..f2418441 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 @@ -261,7 +261,8 @@ LEFT JOIN adm_patient pinfo ON o.patient_id = pinfo.id p.delete_flag = '0' - AND s.delete_flag = '0' + AND s.delete_flag = '0' + AND p.schedule_date = CAST(#{query.date} AS DATE) @@ -296,7 +297,9 @@ AND o.phone LIKE CONCAT('%', #{query.phone}, '%') - + + AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND s.expect_time >= CAST(CURRENT_TIME AS TIME))) +