diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs index 730a1fec2..763e4b7f9 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs @@ -92,12 +92,15 @@ namespace IRaCIS.Core.Application.ViewModel public Guid SystemQuestionId { get; set; } } - public class AddDefaultQuestionsInDto + + public class AddDefaultQuestionsInDto { public Guid TrialId { get; set; } [NotDefault] public Guid TrialReadingCriterionId { get; set; } + + public bool IsEnglish { get; set; } } public class AddTrialDataFromSystemInDto diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 31252ff65..4432c0499 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -522,8 +522,8 @@ namespace IRaCIS.Core.Application.Service var maxOrder = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId).OrderByDescending(x => x.ShowOrder).Select(x => x.ShowOrder).FirstOrDefaultAsync(); List needList = await _readingMedicineSystemQuestionRepository - .WhereIf(_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.English) - .WhereIf(!_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.Chinese) + .WhereIf(inDto.IsEnglish, x => x.LanguageType == LanguageType.English) + .WhereIf(!inDto.IsEnglish, x => x.LanguageType == LanguageType.Chinese) .Where(x => x.CriterionTypeEnum == criterionInfo.CriterionType && needAddCategory.Contains(x.ReadingCategory)) .Select(x => new TrialDataFromSystem() {