From a100ec22163b46394e0104f3b4b925c9eed1726c Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 24 Dec 2025 10:11:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4group=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Appointment/Services/Implements/AppointmentService.cs | 4 ++-- .../Services/Implements/GainfoOutsourceService.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index 552693eb..38b3cc1b 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -465,13 +465,13 @@ public class AppointmentService : IAppointmentService foreach (var gainfo in todoGainfos) { //获取最近一次通行记录的时间,如果没有则取创建时间 - DateTime? raiseDateTime = await _dbContext.Queryable() + DateTime raiseDateTime = await _dbContext.Queryable() .Where(x => x.UserUniqueNo == gainfo.Code) .WhereIF(uploadLogAdditionalExp != null, uploadLogAdditionalExp) .Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), gainfo.CreateTime)) .SingleAsync(); - var checkDates = GetDaysUntilToday(raiseDateTime.Value); + var checkDates = GetDaysUntilToday(raiseDateTime); var days = checkDates.Count; foreach (var date in checkDates) { diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs index 23f546f9..d5c35bf8 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs @@ -163,10 +163,10 @@ public class GainfoOutsourceService : IGainfoOutsourceService foreach (var outsource in grp) { + //获取最近一次通行记录的时间,如果没有则取创建时间 DateTime raiseDateTime = await _dbContext.Queryable() .Where(x => x.UserUniqueNo == outsource.Code) .Where(x => x.TenantId == grp.Key) //本厂区的 - .GroupBy(x => x.UserUniqueNo) .Select(x => SqlFunc.IsNull(SqlFunc.AggregateMax(x.RaiseDateTime), outsource.CreateTime)) .SingleAsync();