防止生成sql生成GETDATE() 时区导致的问题

IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs

@@ -541,10 +541,13 @@ namespace IRaCIS.Core.Application.Service
 
             var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
 
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
             #region Subejct 维度
 
             Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && u.TrialReadingCriterionId == trialReadingCriterionId &&
-            u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject) && u.DoctorUserId == doctorUserId;
+            u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < appDateTimeNow && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject) && u.DoctorUserId == doctorUserId;
 
 
 
@@ -562,7 +565,7 @@ namespace IRaCIS.Core.Application.Service
             //{
             //    //这里的过滤条件  不能用 where(comonTaskFilter)  会报错，奇怪的问题   只能重新写一遍
             //    visitTaskFilter = visitTaskFilter.And(c => c.Subject.SubjectVisitTaskList.Any(t => t.VisitTaskNum == c.VisitTaskNum + ReadingCommon.TaskNumDic[ReadingCategory.Global] && t.ReadingCategory == ReadingCategory.Global && t.IsAnalysisCreate == false && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned &&
-            //            t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now && (t.ReReadingApplyState == ReReadingApplyState.Default || t.ReReadingApplyState == ReReadingApplyState.Reject)));
+            //            t.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < appDateTimeNow && (t.ReReadingApplyState == ReReadingApplyState.Default || t.ReReadingApplyState == ReReadingApplyState.Reject)));
 
             //}
 
@@ -758,9 +761,12 @@ namespace IRaCIS.Core.Application.Service
 
             var trialId = inQuery.TrialId;
 
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
             Expression<Func<VisitTask, bool>> comonTaskFilter = u => u.TrialId == trialId && u.IsAnalysisCreate == false && u.TaskState == TaskState.Effect && u.ReadingTaskState == ReadingTaskState.HaveSigned && (u.ReReadingApplyState == ReReadingApplyState.Default || u.ReReadingApplyState == ReReadingApplyState.Reject);
 
-            //&& u.TrialReadingCriterionId == trialReadingCriterionId &&u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < DateTime.Now   && u.DoctorUserId == doctorUserId;
+            //&& u.TrialReadingCriterionId == trialReadingCriterionId &&u.SignTime!.Value.AddDays(filterObj.IntervalWeeks * 7) < appDateTimeNow   && u.DoctorUserId == doctorUserId;
 
             Expression<Func<VisitTask, bool>> visitTaskFilter = comonTaskFilter.And(t => t.ReadingCategory == ReadingCategory.Visit);
 
@@ -792,16 +798,16 @@ namespace IRaCIS.Core.Application.Service
 
                                                   MatchSubejctCount = taskConsistentRule.Trial.SubjectList.AsQueryable()
                                                   .Where(t => taskConsistentRule.IsHaveReadingPeriod == false ? t.SubjectVisitTaskList.AsQueryable()
-                                                  .Where(visitTaskFilter).Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < DateTime.Now && t.DoctorUserId == user.Id)
+                                                  .Where(visitTaskFilter).Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < appDateTimeNow && t.DoctorUserId == user.Id)
                                                   .Count() >= taskConsistentRule.PlanVisitCount :
 
                                                   //全局要>计划访视数量后面
                                                     t.SubjectVisitTaskList.AsQueryable().Where(comonTaskFilter)
-                                                    .Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < DateTime.Now && t.DoctorUserId == user.Id)
+                                                    .Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < appDateTimeNow && t.DoctorUserId == user.Id)
                                                     .Where(t => t.ReadingCategory == ReadingCategory.Visit || t.ReadingCategory == ReadingCategory.Global).Any(t => t.ReadingCategory == ReadingCategory.Global && t.VisitTaskNum>taskConsistentRule.PlanVisitCount-1)
                                                     &&
                                                     t.SubjectVisitTaskList.AsQueryable().Where(visitTaskFilter)
-                                                    .Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < DateTime.Now && t.DoctorUserId == user.Id)
+                                                    .Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SignTime!.Value.AddDays(taskConsistentRule.IntervalWeeks * 7) < appDateTimeNow && t.DoctorUserId == user.Id)
                                                     .Count()>= taskConsistentRule.PlanVisitCount
 
                                                     )

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -164,7 +164,6 @@ namespace IRaCIS.Core.Application.Service.Common
                 .WhereIf(queryParam.UserTypeId != null, t => t.UserTypeId == queryParam.UserTypeId)
                 .WhereIf(queryParam.IsGenerateAccount != null, t => t.IsGenerateAccount == queryParam.IsGenerateAccount)
                 .WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
-                //.WhereIf(queryParam.State != null && queryParam.State == TrialSiteUserStateEnum.OverTime, t => t.InviteState == TrialSiteUserStateEnum.HasSend && t.ExpireTime < DateTime.Now)
                 .WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName))
                 .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
                 .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);

IRaCIS.Core.Application/Service/Doctor/DoctorService.cs

@@ -536,10 +536,13 @@ namespace IRaCIS.Application.Services
         [HttpGet("{doctorId:guid}")]
         public async Task<ResumeConfirmDTO> GetAuditState(Guid doctorId)
         {
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
             var doctor = (await _doctorRepository
                 .ProjectTo<ResumeConfirmDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync(t => t.Id == doctorId)).IfNullThrowException();
 
-            doctor.InHoliday = (await _repository.CountAsync<Vacation>(x => x.DoctorId == doctorId && x.EndDate <= DateTime.Now && x.StartDate <= DateTime.Now)) > 0;
+            doctor.InHoliday = (await _repository.CountAsync<Vacation>(x => x.DoctorId == doctorId && x.EndDate <= appDateTimeNow && x.StartDate <= appDateTimeNow)) > 0;
 
             return doctor;
         }

IRaCIS.Core.Application/Service/Doctor/VacationService.cs

@@ -79,7 +79,10 @@ namespace IRaCIS.Application.Services
         [NonDynamicMethod]
         public async Task<IResponseOutput> OnVacation(Guid doctorId)
         {
-            var count = await _vacationRepository.CountAsync(u => u.DoctorId == doctorId && u.EndDate >= DateTime.Now && u.StartDate <= DateTime.Now);
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
+            var count = await _vacationRepository.CountAsync(u => u.DoctorId == doctorId && u.EndDate >= appDateTimeNow && u.StartDate <= appDateTimeNow);
 
             return ResponseOutput.Result(count > 0);
         }

IRaCIS.Core.Application/Service/Management/SystemNoticeService.cs

@@ -27,14 +27,15 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<PageOutput<SystemNoticeView>> GetSystemNoticeList(SystemNoticeQuery querySystemNotice)
         {
-
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
 
             var systemNoticeQueryable = _systemNoticeRepository
                 .WhereIf(querySystemNotice.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == querySystemNotice.ApplicableProjectEnum)
                 .WhereIf(querySystemNotice.NoticeLevelEnum != null, t => t.NoticeLevelEnum == querySystemNotice.NoticeLevelEnum)
                 .WhereIf(querySystemNotice.NoticeModeEnum != null, t => t.NoticeModeEnum == querySystemNotice.NoticeModeEnum)
                 .WhereIf(querySystemNotice.NoticeStateEnum != null && querySystemNotice.NoticeStateEnum != Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == querySystemNotice.NoticeStateEnum)
-               .WhereIf(querySystemNotice.NoticeModeEnum != null && querySystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate !=null && t.EndDate < DateTime.Now)
+               .WhereIf(querySystemNotice.NoticeModeEnum != null && querySystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate !=null && t.EndDate < appDateTimeNow)
                .WhereIf(querySystemNotice.NoticeTypeEnum != null, t => t.NoticeTypeEnum == querySystemNotice.NoticeTypeEnum)
                 .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.FileName), t => t.FileName.Contains(querySystemNotice.FileName))
                 .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.NoticeContent), t => t.NoticeContent.Contains(querySystemNotice.NoticeContent))
@@ -117,13 +118,16 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<PageOutput<SystemNoticeReadDTO>> GetUserSystemNoticeList(SystemNoticeQuery querySystemNotice)
         {
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
             var systemNoticeQueryable = _systemNoticeRepository
                 .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum==Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished)
                 .WhereIf(querySystemNotice.ApplicableProjectEnum != null, t => t.ApplicableProjectEnum == querySystemNotice.ApplicableProjectEnum)
                 .WhereIf(querySystemNotice.NoticeLevelEnum != null, t => t.NoticeLevelEnum == querySystemNotice.NoticeLevelEnum)
                 .WhereIf(querySystemNotice.NoticeModeEnum != null, t => t.NoticeModeEnum == querySystemNotice.NoticeModeEnum)
                 .WhereIf(querySystemNotice.NoticeStateEnum != null && querySystemNotice.NoticeStateEnum != Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == querySystemNotice.NoticeStateEnum)
-                .WhereIf(querySystemNotice.NoticeModeEnum != null && querySystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < DateTime.Now)
+                .WhereIf(querySystemNotice.NoticeModeEnum != null && querySystemNotice.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HaveExpired, t => t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && t.EndDate != null && t.EndDate < appDateTimeNow)
                 .WhereIf(querySystemNotice.NoticeTypeEnum != null, t => t.NoticeTypeEnum == querySystemNotice.NoticeTypeEnum)
                 .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.FileName), t => t.FileName.Contains(querySystemNotice.FileName))
                 .WhereIf(!string.IsNullOrWhiteSpace(querySystemNotice.NoticeContent), t => t.NoticeContent.Contains(querySystemNotice.NoticeContent))
@@ -135,9 +139,12 @@ namespace IRaCIS.Core.Application.Service
 
         public async Task<List<SystemNoticeView>> GetUserNoticeList()
         {
+            //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
+
             var query = _systemNoticeRepository
                   .Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id))
-                  .Where(t=>t.EndDate==null || t.EndDate != null && t.EndDate > DateTime.Now)
+                  .Where(t=>t.EndDate==null || t.EndDate != null && t.EndDate > appDateTimeNow)
                   .ProjectTo<SystemNoticeView>(_mapper.ConfigurationProvider, new { token = _userInfo.UserToken, userId = _userInfo.Id });
 
             return await query.ToListAsync();

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1248,7 +1248,8 @@ namespace IRaCIS.Core.Application
 
             //}    
 
-
+                        //防止生成sql生成GETDATE() 时区导致的问题
+            var appDateTimeNow = DateTime.Now;
 
             var record = new UserToBeDoneRecord()
             {
@@ -1264,7 +1265,7 @@ namespace IRaCIS.Core.Application
 
                 SysNoticeUnReadCount= await _systemNoticeRepository.Where(t => t.NoticeUserTypeList.Any(t => t.UserTypeId == _userInfo.UserTypeId) && t.NoticeStateEnum == Domain.Share.Management.SystemNotice_NoticeStateEnum.HavePublished
                      && !t.NoticeUserReadList.Any(t => t.CreateUserId == _userInfo.Id))
-                    .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > DateTime.Now)
+                    .Where(t => t.EndDate == null || t.EndDate != null && t.EndDate > appDateTimeNow)
                     .CountAsync(),
 
                 #region PM

IRaCIS.Core.Application/Service/TrialSiteUser/TrialDicomAEService.cs

@@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
             _trialRepository = trialRepository;
             _dicomAERepository = dicomAERepository;
         }
-
+        
         [HttpPost]
         public async Task<IResponseOutput<PageOutput<DicomAEView>>> GetDicomAEList(DicomAEQuery inQuery)
         {