diff --git a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs index a2e37a6e..a43d8918 100644 --- a/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs +++ b/Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentService.cs @@ -3,6 +3,7 @@ using Dlhis.Basic.Appointment.Response; using Dlhis.Basic.Common.Message.Requests; using Dlhis.Basic.Common.Message.Services; using Dlhis.Basic.Organization.Request; +using Dlhis.Basic.Organization.Response; using Dlhis.Basic.Organization.Services; using Dlhis.Dh.Api; using Dlhis.Dh.Api.Requests; @@ -367,10 +368,15 @@ public class AppointmentService : IAppointmentService //获取外部人员 var externals = await _dbContext.Queryable() .Where(x => x.Type == GainfoUserTypeEnumType.External) + .Where(x => x.Code == "EXT059373") .Select(x => new { x.Id, x.Code, x.Factory, x.CreateTime }) .ToListAsync(); - var settings = await _factorySettingService.GetListAsync(false); + var settings = new List() { new FactorySettingResponse + { + Factory= "502", + NoRecordAutoResignExternalDays = 3 + } };//await _factorySettingService.GetListAsync(false); //todo 临时处理循环依赖 var gainfoService = _serviceProvider.GetService(); @@ -463,7 +469,7 @@ public class AppointmentService : IAppointmentService if (start > today) return new List(); var days = new List(); - for (var d = start; d <= today; d = d.AddDays(1)) + for (var d = start; d < today; d = d.AddDays(1)) { days.Add(d); } diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs index 0b7a829a..04443dd1 100644 --- a/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs +++ b/Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs @@ -221,7 +221,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService if (start > today) return new List(); var days = new List(); - for (var d = start; d <= today; d = d.AddDays(1)) + for (var d = start; d < today; d = d.AddDays(1)) { days.Add(d); }