x

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -227,6 +227,7 @@ namespace IRaCIS.Core.API.Controllers
         }
 
         [HttpPost, Route("Study/PreArchiveStudy")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
         public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
              [FromServices] IStudyService _studyService,
              [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
@@ -265,7 +266,7 @@ namespace IRaCIS.Core.API.Controllers
         [DisableFormValueModelBinding]
         [DisableRequestSizeLimit]
         [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
-        public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId,
+        public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId,Guid studyMonitorId,
              [FromServices] ILogger<UploadDownLoadController> _logger,
              [FromServices] IEasyCachingProvider _provider,
              [FromServices] IStudyService _studyService,
@@ -289,6 +290,7 @@ namespace IRaCIS.Core.API.Controllers
 
             var archiveStudyCommand = new ArchiveStudyCommand() { AbandonStudyId = abandonStudyId, StudyInstanceUid = studyInstanceUid, SubjectVisitId = subjectVisitId };
 
+            //archiveStudyCommand.StudyMonitorId = studyMonitorId;
 
             string studycode = string.Empty;
 
@@ -305,7 +307,7 @@ namespace IRaCIS.Core.API.Controllers
 
             //到了接口，代表上传结束了
 
-            var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == archiveStudyCommand.StudyMonitorId);
+            var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId);
 
             studyMonitor.UploadFinishedTime = DateTime.Now;