diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs index b07e79eb1..94eb0108a 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs @@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Infra.EFCore.Common; +using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Application.Service { @@ -95,10 +96,22 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialClinicalGroupQuestionList(GetTrialGroupDto inDto) { - return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId) + return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId&&x.ClinicalQuestionTypeEnum== ClinicalQuestionType.Group) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); } + /// + /// 获取项目标准其他问题 + /// + /// + /// + [HttpPost] + public async Task> GetTrialClinicalOtherQuestionList(GetTrialGroupDto inDto) + { + return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.ClinicalQuestionTypeEnum == ClinicalQuestionType.Select) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + } + #endregion @@ -158,9 +171,24 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetSystemClinicalGroupQuestionList(GetSystemGroupDto inDto) { - return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId) + return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.ClinicalQuestionTypeEnum == ClinicalQuestionType.Group) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); } + + + /// + /// 获取系统其他问题 + /// + /// + /// + [HttpPost] + public async Task> GetSystemClinicalOtherQuestionList(GetSystemGroupDto inDto) + { + return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.ClinicalQuestionTypeEnum == ClinicalQuestionType.Select) + .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + } + + #endregion #region 系统表格问题