diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index 78741101..26d1fd17 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -159,8 +159,7 @@ public class AppointmentService : IAppointmentService return await _dbContext.Queryable() .LeftJoin((x, ga) => ga.IdNo == idNo) .Where((x, ga) => ga.IdNo == idNo) - .Where(x => (x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, now) && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait) || - (x.IsEnterWorkplace && SqlFunc.DateIsSame(x.WorkplaceStart, now) && x.WorkplaceStatus == VisitorAppointmentDetailStatusEnumType.Wait)) + .Where(x => (x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, now) && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)) .Where(x => SqlFunc.Subqueryable().Where(p => p.Factory == factory).Where(p => p.No == x.No).Any()) .Select(x => new AppointmentDetailResponse {