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(); 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, 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 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) 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)