修改拦截

2023-01-05 15:20:36 +08:00
parent 6fcd163988
commit 225cd8c949
17 changed files with 159 additions and 77 deletions
@@ -51,6 +51,7 @@ namespace IRaCIS.Core.API.Controllers.Special
        /// <returns>新记录Id</returns>
        [HttpPost, Route("trial/addOrUpdateTrial")]
        [Authorize(Policy = IRaCISPolicy.PM_APM)]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput<Trial>>  AddOrUpdateTrial(TrialCommand param)
        {
            var userId = Guid.Parse(User.FindFirst("id").Value);
@@ -112,6 +112,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns> 
        [HttpPost, Route("Inspection/ReadingImageTask/SubmitOncologyReadingInfo")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> SetOncologyReadingInfo(DataInspectionDto<SubmitOncologyReadingInfoInDto> opt)
        {
@@ -127,6 +129,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns> 
        [HttpPost, Route("Inspection/ReadingImageTask/SubmitDicomVisitTask")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> SubmitDicomVisitTask(DataInspectionDto<SubmitDicomVisitTaskInDto> opt)
        {
@@ -144,6 +148,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns> 
        [HttpPost, Route("Inspection/ReadingImageTask/SubmitGlobalReadingInfo")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> SubmitGlobalReadingInfo(DataInspectionDto<SubmitGlobalReadingInfoInDto> opt)
        {
@@ -161,6 +167,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns> 
        [HttpPost, Route("Inspection/configTrialBasicInfo/TrialReadingInfoSign")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> TrialReadingInfoSign(DataInspectionDto<TrialReadingInfoSignInDto> opt)
        {
@@ -178,6 +186,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/ReadingMedicalReview/FinishMedicalReview")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> FinishMedicalReview(DataInspectionDto<FinishMedicalReviewInDto> opt)
        {
@@ -193,6 +203,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/ReadingMedicineQuestion/ConfirmReadingMedicineQuestion")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> ConfirmReadingMedicineQuestion(DataInspectionDto<ConfirmReadingMedicineQuestionInDto> opt)
        {
@@ -209,6 +221,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/ReadingImageTask/SubmitVisitTaskQuestions")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> SubmitVisitTaskQuestions(DataInspectionDto<SubmitVisitTaskQuestionsInDto> opt)
        {
@@ -225,6 +239,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/ReadingImageTask/SubmitJudgeVisitTaskResult")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        [UnitOfWork]
        public async Task<IResponseOutput> SubmitJudgeVisitTaskResult(DataInspectionDto<SaveJudgeVisitTaskResult> opt)
        {
@@ -318,6 +334,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/QCOperation/CRCRequestToQC")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> CRCRequestToQC(DataInspectionDto<CRCRequestToQCCommand> opt)
        {
@@ -332,6 +349,7 @@ namespace IRaCIS.Core.API.Controllers
        /// 设置QC 通过或者不通过   7:QC failed  8：QC passed  
        /// </summary>
        [HttpPost, Route("Inspection/QCOperation/QCPassedOrFailed")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> QCPassedOrFailed(DataInspectionDto<QCPassedOrFailedDto> opt)
        {
@@ -345,6 +363,7 @@ namespace IRaCIS.Core.API.Controllers
        /// 一致性核查 回退  对话记录不清除  只允许PM回退
        /// </summary>
        [HttpPost, Route("Inspection/QCOperation/CheckBack")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> CheckBack(DataInspectionDto<IDDto> opt)
        {
@@ -361,7 +380,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/ReadClinicalData/ReadClinicalDataSign")]
-      
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> ReadClinicalDataSign(DataInspectionDto<ReadingClinicalDataSignIndto> opt)
        {
@@ -376,6 +395,7 @@ namespace IRaCIS.Core.API.Controllers
        /// CRC  设置已经重传完成
        /// </summary>
        [HttpPost, Route("Inspection/QCOperation/SetReuploadFinished")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
        {
@@ -391,6 +411,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="opt"></param>
        /// <returns></returns>
        [HttpPost, Route("Inspection/TrialConfig/updateTrialState")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]
        public async Task<IResponseOutput> UpdateTrialState(DataInspectionDto<UpdateTrialStateDto> opt)
        {
@@ -424,6 +445,7 @@ namespace IRaCIS.Core.API.Controllers
        /// </summary>
        /// <returns></returns>
        [HttpPost, Route("Inspection/VisitTask/ConfirmReReading")]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [UnitOfWork]

        public async Task<IResponseOutput> ConfirmReReading(DataInspectionDto<ConfirmReReadingCommand> opt , [FromServices] IVisitTaskHelpeService _visitTaskCommonService,[FromServices] IVisitTaskService _visitTaskService)
@@ -137,54 +137,54 @@ namespace IRaCIS.Core.API.Controllers
        public virtual async Task DicomFileUploadAsync(Func<string, Stream, int, Task> filePathFunc, string boundary)
        {

-             var fileCount = 0;
+            var fileCount = 0;

-                var reader = new MultipartReader(boundary, HttpContext.Request.Body);
+            var reader = new MultipartReader(boundary, HttpContext.Request.Body);

-                var section = await reader.ReadNextSectionAsync();
+            var section = await reader.ReadNextSectionAsync();

-                while (section != null)
+            while (section != null)
+            {
+                var hasContentDispositionHeader = ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition);
+
+                if (hasContentDispositionHeader)
                {
-                    var hasContentDispositionHeader = ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition);

-                    if (hasContentDispositionHeader)
+                    var fileName = contentDisposition.FileName.Value ?? String.Empty;
+
+                    string mediaType = section.ContentType ?? String.Empty;
+
+
+                    //处理压缩文件
+                    if (fileName.Contains(".Zip", StringComparison.OrdinalIgnoreCase) || fileName.Contains(".rar", StringComparison.OrdinalIgnoreCase))
                    {
+                        var archive = ArchiveFactory.Open(section.Body);

-                        var fileName = contentDisposition.FileName.Value ?? String.Empty;
-
-                        string mediaType = section.ContentType ?? String.Empty;
-
-
-                        //处理压缩文件
-                        if (fileName.Contains(".Zip", StringComparison.OrdinalIgnoreCase) || fileName.Contains(".rar", StringComparison.OrdinalIgnoreCase))
+                        foreach (var entry in archive.Entries)
                        {
-                            var archive = ArchiveFactory.Open(section.Body);
-
-                            foreach (var entry in archive.Entries)
-                            {
-                                if (!entry.IsDirectory)
-                                {
-                                    ++fileCount;
-
-                                    await filePathFunc(entry.Key, entry.OpenEntryStream(), fileCount);
-                                }
-                            }
-                        }
-                        //普通单个文件
-                        else
-                        {
-                            if (mediaType.Contains("octet-stream") || mediaType.Contains("dicom"))
+                            if (!entry.IsDirectory)
                            {
                                ++fileCount;

-                                await filePathFunc(fileName, section.Body, fileCount);
+                                await filePathFunc(entry.Key, entry.OpenEntryStream(), fileCount);
                            }
-
                        }
                    }
-                    section = await reader.ReadNextSectionAsync();
+                    //普通单个文件
+                    else
+                    {
+                        if (mediaType.Contains("octet-stream") || mediaType.Contains("dicom"))
+                        {
+                            ++fileCount;
+
+                            await filePathFunc(fileName, section.Body, fileCount);
+                        }
+
+                    }
                }
-     
+                section = await reader.ReadNextSectionAsync();
+            }
+


        }
@@ -228,7 +228,7 @@ namespace IRaCIS.Core.API.Controllers
        [HttpPost, Route("Study/ArchiveStudy")]
        [DisableFormValueModelBinding]
        [DisableRequestSizeLimit]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId,
             [FromServices] ILogger<UploadDownLoadController> _logger,
             [FromServices] IEasyCachingProvider _provider,
@@ -240,7 +240,7 @@ namespace IRaCIS.Core.API.Controllers
        {


-            if (_provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value==null  )
+            if (_provider.Get<List<SystemAnonymization>>(StaticData.Anonymize.Anonymize_AddFixedFiled).Value == null)
            {
                await _mediator.Send(new AnonymizeCacheRequest());
            }
@@ -261,7 +261,7 @@ namespace IRaCIS.Core.API.Controllers

            var startTime = DateTime.Now;

-            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}" ))
+            if (_provider.Exists($"StudyUid_{trialId}_{archiveStudyCommand.StudyInstanceUid}"))
            {
                return ResponseOutput.NotOk("当前已有人正在上传和归档该检查!");
            }
@@ -368,7 +368,7 @@ namespace IRaCIS.Core.API.Controllers
                else
                {
                    studyMonitor.IsSuccess = false;
-                    studyMonitor.Note = JsonConvert.SerializeObject(archiveResult);                 
+                    studyMonitor.Note = JsonConvert.SerializeObject(archiveResult);
                }


@@ -415,6 +415,8 @@ namespace IRaCIS.Core.API.Controllers
        [HttpPost("ClinicalData/UploadVisitClinicalData/{trialId:guid}/{subjectVisitId:guid}")]
        [DisableRequestSizeLimit]
        [Authorize(Policy = IRaCISPolicy.CRC)]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        public async Task<IResponseOutput> UploadVisitClinicalData(Guid subjectVisitId)
        {
            await QCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId);
@@ -451,6 +453,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <returns></returns>
        [HttpPost("ClinicalData/UploadClinicalTemplate")]
        [DisableRequestSizeLimit]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+

        public async Task<IResponseOutput<List<FileDto>>> UploadClinicalTemplate(Guid? trialId)
        {
@@ -489,6 +493,8 @@ namespace IRaCIS.Core.API.Controllers
        /// <returns></returns>
        [HttpPost("ClinicalData/UploadClinicalData/{trialId:guid}/{subjectId:guid}/{readingId:guid}")]
        [DisableRequestSizeLimit]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
        public async Task<IResponseOutput<List<FileDto>>> UploadReadClinicalData(Guid trialId, Guid subjectId, Guid readingId)
        {
            var filerelativePath = string.Empty;
@@ -523,7 +529,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="visitTaskId"></param>
        /// <returns></returns>
        [HttpPost("VisitTask/UploadReadingAnswerImage/{trialId:guid}/{visitTaskId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput<FileDto>> UploadReadingAnswerImage(Guid trialId, Guid visitTaskId)
        {

@@ -548,7 +554,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="visitTaskId"></param>
        /// <returns></returns>
        [HttpPost("VisitTask/UploadJudgeTaskImage/{trialId:guid}/{visitTaskId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput<FileDto>> UploadJudgeTaskImage(Guid trialId, Guid visitTaskId)
        {

@@ -576,7 +582,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="taskMedicalReviewId"></param>
        /// <returns></returns>
        [HttpPost("TaskMedicalReview/UploadMedicalReviewImage/{trialId:guid}/{taskMedicalReviewId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        public async Task<IResponseOutput<FileDto>> UploadMedicalReviewImage(Guid trialId, Guid taskMedicalReviewId)
        {
            string path = string.Empty;
@@ -615,7 +621,7 @@ namespace IRaCIS.Core.API.Controllers
        //[DisableRequestSizeLimit]
        [RequestSizeLimit(1_073_741_824)]
        [HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [Authorize(Policy = IRaCISPolicy.CRC)]
        public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository)
        {
@@ -676,7 +682,7 @@ namespace IRaCIS.Core.API.Controllers
        /// <param name="trialId"></param>
        /// <returns></returns>
        [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [Authorize(Policy = IRaCISPolicy.PM_APM)]
        public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId)
        {
@@ -953,7 +959,7 @@ namespace IRaCIS.Core.API.Controllers
        public async Task<IResponseOutput<UploadFileInfoDTO>> DownloadOfficialResume(int language, Guid[] doctorIds)
        {

-            var path = await  _fileService.CreateDoctorsAllAttachmentZip(doctorIds);
+            var path = await _fileService.CreateDoctorsAllAttachmentZip(doctorIds);
            return ResponseOutput.Ok(new UploadFileInfoDTO
            {
                FilePath = await _fileService.CreateOfficialResumeZip(language, doctorIds),
@@ -982,7 +988,7 @@ namespace IRaCIS.Core.API.Controllers


        [HttpPost, Route("enroll/downloadResume/{trialId:guid}/{language}")]
-         [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
        [AllowAnonymous]
        public async Task<IResponseOutput<string>> DownloadResume(int language, Guid trialId, Guid[] doctorIdArray)
        {