diff --git a/IRaCIS.Core.Application/Helper/CacheHelper.cs b/IRaCIS.Core.Application/Helper/CacheHelper.cs
index f2135ea9b..3cafbc58a 100644
--- a/IRaCIS.Core.Application/Helper/CacheHelper.cs
+++ b/IRaCIS.Core.Application/Helper/CacheHelper.cs
@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Helper
 
         public static string TrialStudyUidDBLock(Guid trialId, string studyUid) => $"TrialStudyUidDBLock:{trialId}_{studyUid}";
 
-
+        public static string TrialTaskStudyUidDBLock(Guid trialId, Guid visiTaskId, string studyUid) => $"TrialTaskStudyUidDBLock:{trialId}_{visiTaskId}_{studyUid}";
 
         public static string SystemAnonymization => $"SystemAnonymization";
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 874fad30a..68add7e6b 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -326,7 +326,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             using (await @uploadLock.AcquireAsync())
             {
-                if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialStudyUidDBLock(incommand.TrialId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
+                if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
                 {
                     //---当前已有人正在上传和归档该检查!
                     return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
@@ -334,7 +334,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 else
                 {
                     //在事务未完成前 防止前端重复提交
-                    await _fusionCache.SetAsync(CacheKeys.TrialStudyUidDBLock(incommand.TrialId, incommand.Study.StudyInstanceUid), _userInfo.Id, TimeSpan.FromMinutes(3));
+                    await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid), _userInfo.Id, TimeSpan.FromMinutes(3));
                 }
             }
 
@@ -442,10 +442,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             await _taskInstanceRepository.AddAsync(isntance);
                         }
                     }
-
-
-
-
                 }
                 else
                 {
@@ -535,7 +531,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             }
             finally
             {
-                await _fusionCache.RemoveAsync(CacheKeys.TrialStudyUidUploading(incommand.TrialId, incommand.Study.StudyInstanceUid));
+                await _fusionCache.RemoveAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid));
             }
 
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index ef6d6c0c9..5cb6b03ee 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -103,9 +103,17 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
         [HttpGet]
-        public async Task<IResponseOutput> DicomUploadInProgress(Guid trialId, string studyInstanceUid)
+        public async Task<IResponseOutput> DicomUploadInProgress(Guid trialId,   string studyInstanceUid,Guid? visitTaskId)
         {
-            await _fusionCache.SetAsync(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(15));
+            if(visitTaskId != null)
+            {
+                await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(trialId, visitTaskId.Value, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(15));
+            }
+            else
+            {
+                await _fusionCache.SetAsync(CacheKeys.TrialStudyUidUploading(trialId, studyInstanceUid), _userInfo.Id, TimeSpan.FromSeconds(15));
+
+            }
 
             return ResponseOutput.Ok();