From 4beca9497b8a103862e447f4999229cd72eb8169 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 11:10:45 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=87=8C=E9=9D=A2=E5=86=99?= =?UTF-8?q?=E6=AD=BB=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialService.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index c36157147..76f6cdacc 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -159,12 +159,7 @@ namespace IRaCIS.Application.Services public virtual async Task> AddOrUpdateTrial(TrialCommand trialAddModel) { - // 到时候 策略授权 统一改 归类 - if (!(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SuperAdmin)) - { - //---只有PM/APM拥有操作权限! - throw new BusinessValidationFailedException(_localizer["Trial_PMApmPermission"]); - } + //测试用户 只能创建非正式项目 if (_userInfo.IsTestUser && trialAddModel.TrialType != TrialType.NoneOfficial) From e5faf00df9837c9ba385c43a47c939a713edfbfb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 11:33:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=8F=90=E4=BA=A41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCListService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index b5a41f3d9..d30a85fb4 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -24,9 +24,9 @@ namespace IRaCIS.Core.Application.Image.QA private IReadingImageTaskService _IReadingImageTaskService; public QCListService( - IRepository subjectVisitRepository, - IRepository trialRepository, - IRepository clinicalDataTrialSet, + IRepository subjectVisitRepository, + IRepository trialRepository, + IRepository clinicalDataTrialSet, IRepository trialQCQuestionAnswerRepository, IRepository trialQCQuestionRepository, IReadingImageTaskService IReadingImageTaskService, From e996557b5150bcdea0fcc0469c8238eec300bf80 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 11:34:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=8F=90=E4=BA=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index a9d9ca9c6..2f382f67a 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -45,7 +45,7 @@ namespace IRaCIS.Core.Application.Image.QA IRepository dicomStudyRepository, IRepository dicomSeriesrepository, IRepository subjectRepository, - IRepository readingClinicalDataRepository, + IRepository readingClinicalDataRepository, IRepository qCChallengeDialogrepository, IRepository checkChallengeDialogrepository, IVisitTaskHelpeService visitTaskHelpeService From 00b48695f667be2d0a27474d492a22b8684974c7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 13:34:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/PersonalWorkstation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 4eb79a67f..2a992f2ad 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -333,14 +333,14 @@ namespace IRaCIS.Core.Application } /// - /// 重阅审批 + /// SPM 重阅审批 /// /// /// /// /// [HttpPost] - public async Task>> GetReReadingApprovalToBeDoneToBeDoneList(ReReadingApprovalToBeDoneQuery inQuery, + public async Task>> GetSPMReReadingApprovalToBeDone(ReReadingApprovalToBeDoneQuery inQuery, [FromServices] IRepository _visitTaskReReadingRepository, [FromServices] IRepository _trialRepository) From 04762b3f7e9738bfb6498152cc496b260ad3e823 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 13:34:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/PersonalWorkstation.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 4eb79a67f..61a9dcec5 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -333,14 +333,14 @@ namespace IRaCIS.Core.Application } /// - /// 重阅审批 + /// SPM 重阅审批 /// /// /// /// /// [HttpPost] - public async Task>> GetReReadingApprovalToBeDoneToBeDoneList(ReReadingApprovalToBeDoneQuery inQuery, + public async Task>> GetSPMReReadingApprovalToBeDoneList(ReReadingApprovalToBeDoneQuery inQuery, [FromServices] IRepository _visitTaskReReadingRepository, [FromServices] IRepository _trialRepository) From 4a70ba0134191d544b277788576c84c4eb2de557 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 3 Jul 2023 14:00:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=B1=95=E7=A4=BA=E5=85=B7?= =?UTF-8?q?=E4=BD=93=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/DTO/UserTypeRoleModel.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs index ef13f0288..f29a43272 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs @@ -9,6 +9,7 @@ namespace IRaCIS.Core.Application.Contracts /// UserTypeRoleView 列表视图模型 public class UserTypeRoleView : UserTypeMenuAddOrEdit { + public UserTypeEnum UserTypeEnum { get; set; } public List UserTypeGroupList { get; set; } = new List(); public new List UserTypeGroupIdList => UserTypeGroupList.Select(t=>t.DictionaryId).ToList();