From 03d61347ca4c5a3c346d55e9d48f7bf69f757a67 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 26 Nov 2025 10:10:33 +0800
Subject: [PATCH] =?UTF-8?q?uat-=E6=A0=87=E6=B3=A8-8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs         | 3 +--
 .../Service/ImageAndDoc/DownloadAndUploadService.cs        | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 19226cbe3..8cf9ea30f 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -269,8 +269,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public AddOrUpdateStudyDto Study { get; set; }
 
-        [NotDefault]
-        public Guid VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
 
         public bool? IsImageSegmentLabel { get; set; }
     }
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 8f1f2eee5..cb08f677d 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -548,9 +548,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             var @uploadLock = _distributedLockProvider.CreateLock($"UploadTaskDicom");
 
+            var visiTaskId = incommand.VisitTaskId.Value;
+
             using (await @uploadLock.AcquireAsync())
             {
-                if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
+                if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, visiTaskId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
                 {
                     //---当前已有人正在上传和归档该检查!
                     return ResponseOutput.NotOk(I18n.T("UploadDownLoad_ArchiveInProgress"));
@@ -558,7 +560,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 else
                 {
                     //在事务未完成前 防止前端重复提交
-                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(1));
+                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, visiTaskId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(1));
                 }
             }
 
@@ -570,7 +572,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 svId = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == incommand.Study.StudyInstanceUid).Select(t => t.SubjectVisitId).FirstOrDefault();
             }
 
-            var visiTaskId = incommand.VisitTaskId;
 
             var modalitys = string.Empty;