fix 调整语法生成

Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs

@@ -182,7 +182,7 @@ public class AppointmentService : IAppointmentService
 
     public async Task FocusLeaveAsync(long id, string reason)
     {
-       // 根据访客预约详情ID获取记录，若不存在则抛出异常
+        // 根据访客预约详情ID获取记录，若不存在则抛出异常
         var detail = await _dbContext.Queryable<VisitorAppointmentDetailEntity>().Where(x => x.Id == id).SingleAsync();
         detail.ThrowIfNull("数据不存在");
 
@@ -276,30 +276,32 @@ public class AppointmentService : IAppointmentService
 
     public async Task<AppointmentSummaryResponse> GetSummaryAsync(string factory, DateTime start, DateTime end)
     {
+        start = start.Date;
+
         var total = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
-            .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, start))
+            .Where(x => x.IsEnterDoorArea && x.DoorStart >= start && x.DoorStart <= end)
             .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
             .CountAsync();
 
         var @in = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
-            .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.ArrivedTime, start) && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            .Where(x => x.IsEnterDoorArea && x.ArrivedTime >= start && x.ArrivedTime <= end && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
             .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
             .CountAsync();
 
         var notIn = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
-            .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorStart, start))
+            .Where(x => x.IsEnterDoorArea && x.DoorStart >= start && x.DoorStart <= end)
             .Where(x => x.IsEnterDoorArea && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Wait)
             .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
             .CountAsync();
 
         var leave = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
-            .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorEnd, start))
+            .Where(x => x.IsEnterDoorArea && x.DoorEnd >= start && x.DoorEnd <= end)
             .Where(x => x.IsEnterDoorArea && (x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Leave || x.DoorStatus == VisitorAppointmentDetailStatusEnumType.FocusLeave))
             .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
             .CountAsync();
 
         var notLeave = await _dbContext.Queryable<VisitorAppointmentDetailEntity>()
-            .Where(x => x.IsEnterDoorArea && SqlFunc.DateIsSame(x.DoorEnd, start) && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
+            .Where(x => x.IsEnterDoorArea && x.DoorEnd >= start && x.DoorEnd <= end && x.DoorStatus == VisitorAppointmentDetailStatusEnumType.Arrived)
             .Where(x => SqlFunc.Subqueryable<VisitorAppointmentEntity>().Where(p => p.No == x.No).Where(p => p.Factory == factory).Any())
             .CountAsync();