From 70813984be60a4088107895747371babdf5fabcd Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 10:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E7=AB=AF=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FinancialChangeController.cs | 2 +- .../Controllers/UploadDownLoadController.cs | 6 +-- IRaCIS.Core.API/Startup.cs | 2 +- .../IRaCIS.Core.Application.xml | 27 +++++++++++ .../Service/Document/TrialDocumentService.cs | 4 +- .../Service/QC/QCOperationService.cs | 48 +++++++++---------- .../Service/QC/TrialQCQuestionService.cs | 6 +-- .../TrialSiteUser/TrialConfigService.cs | 12 ++--- .../TrialSiteUser/TrialExternalUserService.cs | 6 +-- .../TrialSiteUser/TrialMaintenanceService.cs | 4 +- .../Service/TrialSiteUser/TrialSiteService.cs | 8 ++-- .../Service/Visit/SubjectService.cs | 6 +-- .../Service/Visit/SubjectVisitService.cs | 6 +-- .../Service/Visit/VisitPlanService.cs | 4 +- .../Service/WorkLoad/DoctorWorkloadService.cs | 12 ++--- .../Service/WorkLoad/EnrollService.cs | 10 ++-- 16 files changed, 95 insertions(+), 68 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs index ec6b350de..0b3b13468 100644 --- a/IRaCIS.Core.API/Controllers/FinancialChangeController.cs +++ b/IRaCIS.Core.API/Controllers/FinancialChangeController.cs @@ -52,7 +52,7 @@ namespace IRaCIS.Core.API.Controllers.Special /// /// 鏂拌褰旾d [HttpPost, Route("trial/addOrUpdateTrial")] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task> AddOrUpdateTrial(TrialCommand param) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index 0a4a2ca26..b3e4cde44 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -446,7 +446,7 @@ namespace IRaCIS.Core.API.Controllers /// [HttpPost("ClinicalData/UploadVisitClinicalData/{trialId:guid}/{subjectVisitId:guid}")] [DisableRequestSizeLimit] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task UploadVisitClinicalData(Guid subjectVisitId) @@ -684,7 +684,7 @@ namespace IRaCIS.Core.API.Controllers [RequestSizeLimit(1_073_741_824)] [HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}/{studyMonitorId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, Guid studyMonitorId, [FromServices] IRepository _noneDicomStudyRepository, [FromServices] IRepository _studyMonitorRepository) { @@ -741,7 +741,7 @@ namespace IRaCIS.Core.API.Controllers /// [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task UploadVisitCheckExcel(Guid trialId) { diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index 92d6dd52f..886e443fc 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -136,7 +136,7 @@ namespace IRaCIS.Core.API //IP 限流 可设置白名单 或者黑名单 //services.AddIpPolicyRateLimitSetup(_configuration); // 用户类型 策略授权 - services.AddAuthorizationPolicySetup(_configuration); + //services.AddAuthorizationPolicySetup(_configuration); services.AddJsonConfigSetup(_configuration); //转发头设置 获取真实IP diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 349f351ff..9484ed445 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2529,6 +2529,13 @@ + + + 鑾峰彇CRC纭鍒楄〃 + + + + 涓村簥鏁版嵁闂 @@ -2675,6 +2682,16 @@ + + + 涓村簥绾у埆 + + + + + 鏈鏅氭媿鐗囨棩鏈 + + VisitId @@ -3010,6 +3027,16 @@ 鏄惁蹇呭～ + + + 鍏宠仈Value + + + + + 鍏宠仈ID + + 鐖堕棶棰業d diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 01a758271..3a9acc25e 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -407,7 +407,7 @@ namespace IRaCIS.Core.Application.Services } [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM)] + //[Authorize(Policy = IRaCISPolicy.PM)] public async Task AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument) { if (addOrEditTrialDocument.Id == null) @@ -477,7 +477,7 @@ namespace IRaCIS.Core.Application.Services /// /// [HttpDelete("{trialId:guid}/{trialDocumentId:guid}")] - [Authorize(Policy = IRaCISPolicy.PM)] + //[Authorize(Policy = IRaCISPolicy.PM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task DeleteTrialDocument(Guid trialDocumentId, Guid trialId) { diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index d716abeae..a9d9ca9c6 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -68,7 +68,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpGet("{trialId:guid}/{subjectVisitId:guid}/{currentQCType:int}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task VerifyQCCanAddChallenge(Guid subjectVisitId, [FromRoute] CurrentQC currentQCType) { await VerifyIsCanQCAsync(null, subjectVisitId); @@ -92,7 +92,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}/{trialQCProcess:int}/{currentQCType:int}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task AddOrUpdateQCChallenge(QCChallengeCommand qaQuestionCommand, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType) { await VerifyIsCanQCAsync(null, qaQuestionCommand.SubjectVisitId); @@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPut] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task CloseQCChallenge(CloseQCChallengeInDto input) { @@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task DeleteQCChallenge(Guid qcChallengeId) { @@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC_IQC)] + // [Authorize(Policy = IRaCISPolicy.CRC_IQC)] public async Task AddQCChallengeReply(QADialogCommand qaDialogCommand) { var qaReply = _mapper.Map(qaDialogCommand); @@ -269,7 +269,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_CRC)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC)] public async Task AddCheckChallengeReply(CheckChallengeDialogCommand checkDialogCommand) { @@ -309,7 +309,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task CloseCheckChallenge(CloseCheckChallengeDto input) { @@ -345,7 +345,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [UnitOfWork] public async Task SetCheckPass(SetCheckPassDt data) { @@ -392,7 +392,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task CRCRequstCheckBack(Guid subjectVisitId) { var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException(); @@ -436,7 +436,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task RejectCheckBack(Guid subjectVisitId) { @@ -471,7 +471,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [UnitOfWork] public async Task CheckBack(Guid subjectVisitId) { @@ -550,7 +550,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{trialQCProcess:int}/{currentQCType:int}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task AddOrUpdateQCQuestionAnswerList(QCQuestionAnswerCommand[] qcQuestionAnswerCommands, Guid trialId, Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType) { //楠岃瘉鏄惁鑳芥搷浣 @@ -622,7 +622,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{studyId:guid}/{seriesId:guid}/{state:int}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task SetSeriesState(Guid subjectVisitId, Guid studyId, Guid seriesId, int state) { @@ -689,7 +689,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC_IQC)] + // [Authorize(Policy = IRaCISPolicy.CRC_IQC)] public async Task UpdateModality(UpdateModalityCommand updateModalityCommand) { if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC) @@ -770,7 +770,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPost, Route("{trialId:guid}/{subjectVisitId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.CRC_IQC)] + // [Authorize(Policy = IRaCISPolicy.CRC_IQC)] public async Task DeleteStudyList(Guid[] ids, Guid subjectVisitId, Guid trialId) { @@ -853,7 +853,7 @@ namespace IRaCIS.Core.Application.Image.QA /// 鏇挎崲褰撳墠棰嗗彇浜 [HttpPut("{trialId:guid}/{subjectVisitId:guid}")] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task ReplaceQCTaskActionUser(Guid trialId, Guid subjectVisitId) { @@ -888,7 +888,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{obtaionOrCancel:bool}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task ObtainOrCancelQCTask(Guid trialId, Guid subjectVisitId, bool obtaionOrCancel) { @@ -1111,7 +1111,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand) { @@ -1418,7 +1418,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{auditState:int}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] [UnitOfWork] public async Task QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState) { @@ -1657,7 +1657,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{setOrCancel:bool}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task SetVisitUrgent(Guid trialId, Guid subjectVisitId, bool setOrCancel) { var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException(); @@ -1695,7 +1695,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] public async Task SetNeedReupload(Guid trialId, Guid qcChallengeId) { @@ -1796,7 +1796,7 @@ namespace IRaCIS.Core.Application.Image.QA /// [HttpPost] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task SetReuploadFinished(CRCReuploadFinishedCommand cRCReuploadFinishedCommand) { @@ -1874,7 +1874,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task CRCRequestReUpload(Guid qcChallengeId) { var qcChallenge = (await _qcChallengeRepository.FirstOrDefaultAsync(t => t.Id == qcChallengeId)).IfNullThrowException(); @@ -1959,7 +1959,7 @@ namespace IRaCIS.Core.Application.Image.QA [HttpPost("{trialId:guid}")] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task ForwardSVDicomImage(Guid[] subjectVisitIdList) { diff --git a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs index c46d9550a..54b65d983 100644 --- a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs +++ b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs @@ -141,7 +141,7 @@ namespace IRaCIS.Core.Application.Contracts /// /// [HttpPost("{trialId:guid}")] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task BatchAddTrialQCQuestionConfigure(List batchList, Guid trialId) { @@ -248,7 +248,7 @@ namespace IRaCIS.Core.Application.Contracts return childList; } - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task AddOrUpdateTrialQCQuestionConfigure(TrialQCQuestionAddOrEdit addOrEditTrialQCQuestionConfigure) { @@ -273,7 +273,7 @@ namespace IRaCIS.Core.Application.Contracts [HttpDelete("{trialId:guid}/{trialQCQuestionConfigureId:guid}")] - [Authorize(Policy = IRaCISPolicy.IQC)] + //[Authorize(Policy = IRaCISPolicy.IQC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task DeleteTrialQCQuestionConfigure(Guid trialQCQuestionConfigureId, Guid trialId) { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index 1ca1349a8..8298f8838 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -830,7 +830,7 @@ namespace IRaCIS.Core.Application /// 绛惧悕纭 鍖呮嫭椤圭洰鐨勪笁缁勯厤缃 + QC闂纭 鍚庝慨鏀圭姸鎬 (閫傜敤浜庝笉浼氬洖閫鐨勶紝椤圭洰搴熼櫎銆佺姸鎬佷慨鏀癸紝 瀛樺湪鍥為 涓嶅湪杩欓噷寮勶紝鎻愪緵鍗曠嫭鎺ュ彛淇敼鐘舵) /// /// - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task TrialConfigSignatureConfirm(SignConfirmDTO signConfirmDTO) { await VerifyOnlyInOngoingOrInitialIzingOptAsync(signConfirmDTO.TrialId); @@ -912,7 +912,7 @@ namespace IRaCIS.Core.Application /// /// [HttpPut] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task ConfigTrialBasicInfo(BasicTrialConfig trialConfig) { @@ -936,7 +936,7 @@ namespace IRaCIS.Core.Application /// /// [HttpPut] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task ConfigTrialProcessInfo(TrialProcessConfig trialConfig) { @@ -1052,7 +1052,7 @@ namespace IRaCIS.Core.Application /// /// [HttpPut] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task ConfigTrialUrgentInfo(TrialUrgentConfig trialConfig) { @@ -1101,7 +1101,7 @@ namespace IRaCIS.Core.Application /// [HttpPut("{trialId:guid}/{trialStatusStr}/{reason?}")] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.PM)] + //[Authorize(Policy = IRaCISPolicy.PM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task UpdateTrialState(Guid trialId, string trialStatusStr, string? reason) { @@ -1176,7 +1176,7 @@ namespace IRaCIS.Core.Application /// /// [HttpPut("{trialId:guid}/{isAbandon:bool}")] - [Authorize(Policy = IRaCISPolicy.PM)] + //[Authorize(Policy = IRaCISPolicy.PM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] public async Task AbandonTrial(Guid trialId, /*Guid? signId,*/ bool isAbandon) { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs index aaebe9c38..94bb318c3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs @@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Service /// /// /// - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [UnitOfWork] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task AddOrUpdateTrialExternalUser(TrialExternalUserAddAndSendEmail addOrEditTrialExternalUser) @@ -218,7 +218,7 @@ namespace IRaCIS.Core.Application.Service [HttpDelete("{trialExternalUserId:guid}/{isSystemUser:bool}/{systemUserId}")] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task DeleteTrialExternalUser(Guid trialExternalUserId, bool isSystemUser, Guid systemUserId) { var trialExternalUser = await _trialExternalUseRepository.FirstOrDefaultAsync(t => t.Id == trialExternalUserId); @@ -243,7 +243,7 @@ namespace IRaCIS.Core.Application.Service //New 鐪佹帀閭璇锋祦绋 [HttpPost] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] public async Task SendExternalUserJoinEmail(TrialExternalUserSendEmail sendEmail) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 4a3c94108..314e578c2 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -157,7 +157,7 @@ namespace IRaCIS.Application.Services //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddTrialStaff)] [HttpPost] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task AddTrialUsers(TrialUserAddCommand[] userTrialCommands) { @@ -179,7 +179,7 @@ namespace IRaCIS.Application.Services [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [HttpPut] public async Task UpdateTrialUser(UpdateTrialUserCommand updateTrialUserCommand) { diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs index 2171c3c04..cea1dd379 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs @@ -212,7 +212,7 @@ namespace IRaCIS.Core.Application.Services /// Setting椤甸潰 Site鎵归噺娣诲姞 [HttpPost] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task AddTrialSites(List trialSites) { @@ -232,7 +232,7 @@ namespace IRaCIS.Core.Application.Services /// /// [HttpPut] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task EditTrialSite(EditTrialSiteCommand editTrialSiteCommand) { @@ -289,7 +289,7 @@ namespace IRaCIS.Core.Application.Services /// 鎵归噺娣诲姞Site涓 CRC鐨勮礋璐ｄ汉 [HttpPost] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task AssignSiteCRC(List trialSiteCRCList) { var addArray = _mapper.Map>(trialSiteCRCList); @@ -303,7 +303,7 @@ namespace IRaCIS.Core.Application.Services /// 鍒犻櫎CRC浜哄憳 [HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task DeleteSiteCRC(Guid id, bool isDelete) { diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index c27d90ac2..58872405f 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -28,7 +28,7 @@ namespace IRaCIS.Application.Services [TrialAudit(AuditType.SubjectAudit, AuditOptType.AddOrUpdateSubject)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)] public async Task> AddOrUpdateSubject([FromBody] SubjectCommand subjectCommand) { var svlist = new List(); @@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services [HttpPut] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand) { @@ -87,7 +87,7 @@ namespace IRaCIS.Application.Services [HttpDelete("{trialId:guid}/{id:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.PM_APM_CRC)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC)] public async Task DeleteSubject(Guid id) { diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index a9c07be8f..76af9b63e 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Services [HttpPost] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [UnitOfWork] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task> AddOrUpdateSV(SubjectVisitCommand svCommand) { @@ -202,7 +202,7 @@ namespace IRaCIS.Core.Application.Services [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{isUrgent:bool}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_IQC)] + //[Authorize(Policy = IRaCISPolicy.PM_IQC)] public async Task SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent) { await _subjectVisitRepository.UpdatePartialFromQueryAsync(subjectVisitId, u => new SubjectVisit() { IsUrgent = isUrgent }, true); @@ -214,7 +214,7 @@ namespace IRaCIS.Core.Application.Services [HttpDelete, Route("{trialId:guid}/{id:guid}")] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.CRC)] + //[Authorize(Policy = IRaCISPolicy.CRC)] public async Task DeleteSV(Guid id) { if (await _repository.AnyAsync(t => t.SubjectVisitId == id)) diff --git a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs index 63c55f958..252eb8c2f 100644 --- a/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs +++ b/IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs @@ -103,7 +103,7 @@ namespace IRaCIS.Application.Services /// 娣诲姞鎴栨洿鏂拌瑙嗚鍒掓煇椤 [UnitOfWork] [HttpPost] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task AddOrUpdateVisitStage(VisitPlanCommand visitPlan) @@ -214,7 +214,7 @@ namespace IRaCIS.Application.Services [UnitOfWork] [HttpPost("{trialId:guid}")] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })] //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task ConfirmTrialVisitPlan(Guid trialId) diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs index 4c44f29b0..dc0998e93 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs @@ -59,7 +59,7 @@ namespace IRaCIS.Application.Services //[HttpPost("{trialId}")] //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.PM_APM)] + ////[Authorize(Policy = IRaCISPolicy.PM_APM)] //public async Task UploadReviewerAckSOW(Guid trialId, // ReviewerAckDTO attachmentViewModel) //{ @@ -89,7 +89,7 @@ namespace IRaCIS.Application.Services //[HttpDelete, Route("{trialId}/{doctorId}/{attachmentId}")] //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - //[Authorize(Policy = IRaCISPolicy.PM_APM)] + ////[Authorize(Policy = IRaCISPolicy.PM_APM)] //public async Task DeleteReviewerAckSOW(Guid trialId, Guid doctorId, Guid attachmentId) //{ // var success1 = await _attachmentRepository.BatchDeleteNoTrackingAsync(a => a.Id == attachmentId); @@ -113,7 +113,7 @@ namespace IRaCIS.Application.Services /// /// /// - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task SetEnrollReadingCategory(SetEnrollReadingCategoryInDto inDto) { @@ -167,7 +167,7 @@ namespace IRaCIS.Application.Services /// /// /// - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] public async Task UpdateTrialReviewerState(SetEnrollEnableCommand inCommand) { @@ -183,7 +183,7 @@ namespace IRaCIS.Application.Services /// [HttpPost("{trialId}/{doctorId}/{type}")] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task UpdateReviewerReadingType(Guid trialId, Guid doctorId, int type) { var success2 = await _enrollRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == trialId && t.DoctorId == doctorId, u => @@ -545,7 +545,7 @@ namespace IRaCIS.Application.Services /// /// 娣诲姞鎴栨洿鏂板伐浣滈噺 /// - [Authorize(Policy = IRaCISPolicy.PM_APM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM)] public async Task AddOrUpdateWorkload(WorkloadCommand workLoadAddOrUpdateModel, Guid userId) { diff --git a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs index cddcbe244..1fc3c3e04 100644 --- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs +++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs @@ -135,7 +135,7 @@ namespace IRaCIS.Application.Services [HttpPost("{trialId:guid}")] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] public async Task SelectReviewers(Guid trialId, Guid[] doctorIdArray) { var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId); @@ -188,7 +188,7 @@ namespace IRaCIS.Application.Services [HttpPost("{trialId:guid}/{commitState:int}")] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] public async Task SubmitReviewer(Guid trialId, Guid[] doctorIdArray, int commitState) { @@ -269,7 +269,7 @@ namespace IRaCIS.Application.Services [HttpPost("{trialId:guid}/{auditState:int}")] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] public async Task ApproveReviewer(Guid trialId, Guid[] doctorIdArray, int auditState) { @@ -355,7 +355,7 @@ namespace IRaCIS.Application.Services [HttpPost] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)] [UnitOfWork] public async Task ConfirmReviewer(ConfirmReviewerCommand confirmReviewerCommand, [FromServices] IRepository _trialUserRepository, @@ -476,7 +476,7 @@ namespace IRaCIS.Application.Services /// [HttpPost("{trialId:guid}/{doctorId:guid}/{optType:int}")] [TypeFilter(typeof(TrialResourceFilter),Arguments = new object[] { "AfterStopCannNotOpt" })] - [Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM)] + //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM)] [Obsolete] public async Task EnrollBackOrOut(Guid trialId, Guid doctorId, int optType, DateTime? outEnrollTime) {