修改pacs 反馈提示+中心调研bug

IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs

@@ -35,8 +35,6 @@ namespace IRaCIS.Core.Application.Filter
           
         }
 
-        StaticData
-
         //优先选择异步的方法
         public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
         {

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -13315,7 +13315,7 @@
         </member>
         <member name="M:IRaCIS.Application.Services.BackGroundJob.IRaCISCHangfireJob.MemoryCacheTrialStatusAsync">
             <summary>
-            缓存项目状态
+            缓存项目状态--之前是启动的时候就获取所有的项目进行缓存，加上定时任务刷新，现在的话，改为是按照需要进行缓存请求数据库
             </summary>
             <returns></returns>
         </member>

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -398,7 +398,7 @@ namespace IRaCIS.Core.Application.Contracts
             var result = await _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId && t.TrialId == trialId).IgnoreQueryFilters()
                 .ProjectTo<LoginReturnDTO>(_mapper.ConfigurationProvider, new {  isEn_Us = _userInfo.IsEn_Us }).FirstOrDefaultAsync().IfNullThrowException();
 
-            var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).Select(t => t.Trial.TrialExtraConfigJsonStr).FirstOrDefault()??string.Empty;
+            var siteSurveryConfig = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).IgnoreQueryFilters().Select(t => t.Trial.TrialExtraConfigJsonStr).FirstOrDefault()??string.Empty;
 
             result.SiteSurveyFiledConfig = JsonConvert.DeserializeObject<TrialExtraConfig>(siteSurveryConfig) ?? new TrialExtraConfig();
             return result;

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -303,6 +303,7 @@ namespace IRaCIS.Application.Services
 
             foreach (var waitUploadItem in scpStudyList)
             {
+
                 if (isVerifyVisitImageDate)
                 {
                     //小于当前访视 最近的最晚拍片
@@ -312,7 +313,8 @@ namespace IRaCIS.Application.Services
                     {
 
                         // $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能早于前序访视检查时间{before?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误",
-                        result.Add(new VerifySCPStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, before?.ToString("yyyy-MM-dd")!] });
+                        result.Add(new VerifySCPStudyUploadResult() {SCPStudyId=waitUploadItem.Id, ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, before?.ToString("yyyy-MM-dd")!] });
+                        continue; // 跳过当前迭代
                     }
 
                     //大于当前访视 最近的最早拍片日期  
@@ -321,13 +323,15 @@ namespace IRaCIS.Application.Services
                     if (after != null && waitUploadItem.StudyDate != null && after < waitUploadItem.StudyDate)
                     {
                         // $"当前访视检查时间{waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")}不能晚于该访视之后的检查时间{after?.ToString("yyyy-MM-dd")}，请核对检查数据是否有误"
-                        result.Add(new VerifySCPStudyUploadResult() { ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, after?.ToString("yyyy-MM-dd")!]});
+                        result.Add(new VerifySCPStudyUploadResult() { SCPStudyId = waitUploadItem.Id, ErrorMesseage = _localizer["Study_VisitAfterSubseqError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, after?.ToString("yyyy-MM-dd")!]});
+                        continue; // 跳过当前迭代
                     }
                 }
 
                 var verifyStudyInfo = _repository.Where<DicomStudy>(t => t.TrialId == trialId && t.Id == waitUploadItem.Id).ProjectTo<VerifyStudyDto>(_mapper.ConfigurationProvider).FirstOrDefault();
 
-                var currentStudyResult = new VerifySCPStudyUploadResult();
+                var currentStudyResult = new VerifySCPStudyUploadResult() { SCPStudyId=waitUploadItem.Id};
+
 
                 //数据库不存在该检查  允许上传
                 if (verifyStudyInfo == null)