diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c4468a69c..f465875b6 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -17516,17 +17516,17 @@ - ���� + 质疑 - һ���Ժ˲� + 一致性核查 - ���� + 复制 @@ -20265,11 +20265,12 @@ - + 获取项目下的 site 下拉框数据 CRC只看到他负责的 + diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs index 81b167427..54b981c3d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/Interface/ITrialSiteService.cs @@ -13,6 +13,6 @@ namespace IRaCIS.Core.Application.Interfaces Task> GetSiteCRCList(SiteCrcQueryDTO param); Task> > GetSiteCRCSimpleList(SiteCrcQueryDTO param); Task> GetTrialSiteScreeningList(TrialSiteQuery trialSiteQuery); - Task> GetTrialSiteSelect(Guid trialId); + Task> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable); } } \ No newline at end of file diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs index 615440f8f..8efbe7415 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs @@ -268,13 +268,21 @@ namespace IRaCIS.Core.Application.Services /// 获取项目下的 site 下拉框数据 CRC只看到他负责的 /// /// + /// /// [HttpGet("{trialId:guid}")] - public async Task> GetTrialSiteSelect(Guid trialId) + public async Task> GetTrialSiteSelect(Guid trialId, bool? ignoreDisable) { //CRC只看到他负责的 - var list = await _trialSiteRepository.Where(t => t.TrialId == trialId) + var query = _trialSiteRepository.Where(t => t.TrialId == trialId); + + if (ignoreDisable == true) + { + query = query.IgnoreQueryFilters(); + } + + var list = await query .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.UserRoleId)) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(t => t.TrialSiteCode).ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index 083474c56..17a78b217 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -74,7 +74,7 @@ namespace IRaCIS.Core.Application.Service public async Task UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand) { subjectStatusChangeCommand.IsSubjectQuit = subjectStatusChangeCommand.Status == SubjectStatus.EndOfVisit; - await _subjectRepository.UpdateFromDTOAsync(subjectStatusChangeCommand, true); + await _subjectRepository.UpdateFromDTOAsync(subjectStatusChangeCommand,true, false); return ResponseOutput.Ok(); }