From e9d720e1a5265abb39e4f3a26e1025a5a8309f7a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 21 Aug 2024 13:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pacs=20=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA+=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessFilter/TrialResourceFilter.cs            | 12 ------------
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml  |  2 +-
 .../Service/SiteSurvey/TrialSiteSurveyService.cs     |  2 +-
 .../Service/Visit/PatientService.cs                  | 10 +++++++---
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
index f7dfe2583..c1e238e3f 100644
--- a/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
@@ -35,18 +35,6 @@ namespace IRaCIS.Core.Application.Filter
           
         }
 
-
-
-        //public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo)
-        //{
-        //    _provider = provider;
-        //    _userInfo = userInfo;
-        //}
-
-
-
-
-
         //优先选择异步的方法
         public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
         {
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4d68334dc..c8a35ad7e 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -13362,7 +13362,7 @@
         </member>
         <member name="M:IRaCIS.Application.Services.BackGroundJob.IRaCISCHangfireJob.MemoryCacheTrialStatusAsync">
             <summary>
-            缓存项目状态
+            缓存项目状态--之前是启动的时候就获取所有的项目进行缓存，加上定时任务刷新，现在的话，改为是按照需要进行缓存请求数据库
             </summary>
             <returns></returns>
         </member>
diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
index 2665746ff..5affbbd80 100644
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/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;
diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index f812315b5..fe360a831 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/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)