diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs index 93e63756f..6950d35d9 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs @@ -121,9 +121,23 @@ namespace IRaCIS.Core.Application.Service var questions = await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); + if (_userInfo.IsEn_Us) + { + questions.ForEach(x => { + x.GroupName = x.GroupEnName; + x.QuestionName = x.QuestionEnName; + }); + } var tableQuestions= await _systemClinicalTableQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); + + if (_userInfo.IsEn_Us) + { + tableQuestions.ForEach(x => { + x.QuestionName = x.QuestionEnName; + }); + } questions.ForEach(x => x.CreateTime = null); var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList(); @@ -146,10 +160,26 @@ namespace IRaCIS.Core.Application.Service { var questions = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync(); + + if (_userInfo.IsEn_Us) + { + questions.ForEach(x => { + x.GroupName = x.GroupEnName; + x.QuestionName = x.QuestionEnName; + }); + } + var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId) .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync(); + if (_userInfo.IsEn_Us) + { + tableQuestions.ForEach(x => { + x.QuestionName = x.QuestionEnName; + }); + } + questions.ForEach(x => x.CreateTime = null); var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).ToList(); diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 0c91f8dc2..f54ef8d61 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -50,7 +50,9 @@ namespace IRaCIS.Core.Application.Service // 预览 CreateMap(); + CreateMap(); + CreateMap(); CreateMap(); #endregion