diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
index 516e1005..313aef9e 100644
--- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
+++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs
@@ -216,7 +216,9 @@ public class AppointmentService : IAppointmentService
             )
             .Where(x => x.IsEnterDoorArea)
             .WhereIF(status.HasValue, x => x.DoorStatus == status)
-            .Where(x => x.DoorStart >= start && x.DoorEnd <= end)
+            .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Wait, x => x.DoorStart >= start && x.DoorStart <= end)
+            .WhereIF(status.HasValue && status == VisitorAppointmentDetailStatusEnumType.Arrived, x => x.DoorStart >= start && x.DoorStart <= end)
+            .WhereIF(!status.HasValue, x => x.DoorStart >= start && x.DoorEnd <= end)
             .WhereIF(search.IsPresent(), x => x.Name.Contains(search) || x.No == search || x.IdNo == search)
             .Select(x => new AppointmentDetailResponse
             {