From 7ed54e3be3d4b660a892292ccbc7f2bb27c996ca Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 25 Sep 2024 15:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DownloadAndUploadService.cs      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 998e6c8bc..1fd4b224e 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -254,12 +254,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         {
 
             //重阅任务排除
-            var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && t.VisitTask.TaskState==TaskState.Effect && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
+            var notAllowedUidList1 = _taskStudyRepository.Where(t => t.TrialId == inCommand.TrialId && t.VisitTask.TaskState == TaskState.Effect && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
             {
                 t.StudyInstanceUid,
                 t.SubjectId,
                 SubejectCode = t.VisitTask.IsAnalysisCreate ? t.VisitTask.BlindSubjectCode : t.Subject.Code,
-                VisitTaskId=(Guid?)t.VisitTaskId
+                VisitTaskId = (Guid?)t.VisitTaskId
             }).ToList();
 
             var notAllowedUidList2 = _dicomStudyRepository.Where(t => t.TrialId == inCommand.TrialId && inCommand.StudyInstanceUidList.Contains(t.StudyInstanceUid)).Select(t => new
@@ -287,6 +287,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         {
                             result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
                         }
+                        //在原始crc 里面上传了
+                        else if (inCommand.VisitTaskId != null && findStudy.VisitTaskId == null)
+                        {
+                            result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = false, IsAllowUpload = false });
+                        }
                         else
                         {
                             result.Add(new TaskStudyArchiveConfirmResult() { StudyInstanceUid = studyUid, IsAllowReUpload = true });