From c2514862670a8e872beb20000da5fc0c8d5de9f2 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 21 Aug 2024 14:51:57 +0800
Subject: [PATCH] =?UTF-8?q?pacs=20=E9=AA=8C=E8=AF=81=E5=86=99=E5=8F=8D?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Visit/PatientService.cs                  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
index fe360a831..471d97fe5 100644
--- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs
@@ -313,7 +313,7 @@ namespace IRaCIS.Application.Services
                     {
 
                         // $"当前访视检查时间{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")!] });
+                        result.Add(new VerifySCPStudyUploadResult() { SCPStudyId = waitUploadItem.Id, ErrorMesseage = _localizer["Study_VisitBeforePrevError", waitUploadItem.StudyDate?.ToString("yyyy-MM-dd")!, before?.ToString("yyyy-MM-dd")!] });
                         continue; // 跳过当前迭代
                     }
 
@@ -323,14 +323,14 @@ 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() { SCPStudyId = waitUploadItem.Id, 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() { SCPStudyId=waitUploadItem.Id};
+                var currentStudyResult = new VerifySCPStudyUploadResult() { SCPStudyId = waitUploadItem.Id };
 
 
                 //数据库不存在该检查  允许上传
@@ -382,7 +382,7 @@ namespace IRaCIS.Application.Services
         [UnitOfWork]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> SubmitVisitStudyBinding(SubmitVisitStudyBindingCommand inCommand,
-            [FromServices]IRepository<DicomStudy> _dicomstudyRepository,
+            [FromServices] IRepository<DicomStudy> _dicomstudyRepository,
             [FromServices] IRepository<DicomSeries> _dicomSeriesRepository,
              [FromServices] IRepository<DicomInstance> _dicomInstanceRepository)
         {
@@ -396,7 +396,7 @@ namespace IRaCIS.Application.Services
             var allowUploadList = verifyResult.Where(u => u.AllowUpload == true).Select(t => t.SCPStudyId).ToList();
             var allowReUploadList = verifyResult.Where(u => u.AllowReUpload == true).Select(t => t.SCPStudyId).ToList();
 
-            if (inCommand.SCPStudyIdList.All(t => allowUploadList.Contains(t)) && inCommand.ReUploadSCPStudyIdList.All(t => allowReUploadList.Contains(t)))
+            if (!(inCommand.SCPStudyIdList.All(t => allowUploadList.Contains(t)) && inCommand.ReUploadSCPStudyIdList.All(t => allowReUploadList.Contains(t))))
             {
                 throw new BusinessValidationFailedException("对接提示：  前端提交的检查有不能上传的，请刷新页面调用验证接口重试！");
             }
@@ -474,7 +474,7 @@ namespace IRaCIS.Application.Services
 
                     var instanceIdList = _dicomInstanceRepository.Where(t => t.Id == scpStudyId).Select(t => t.Id).ToList();
 
-                    var scpStudy = _scpStudyRepository.Where(t => t.Id == scpStudyId).Include(t=>t.SeriesList).ThenInclude(t=>t.SCPInstanceList).FirstOrDefault();
+                    var scpStudy = _scpStudyRepository.Where(t => t.Id == scpStudyId).Include(t => t.SeriesList).ThenInclude(t => t.SCPInstanceList).FirstOrDefault();
 
                     //以最后一次为准
                     study.IsFromPACS = true;