diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 4de2b3f2c..09e7465cb 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -530,6 +530,7 @@ 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 + .Where(x=>x.IsEnable) .Where(x=>x.LanguageType==inDto.LanguageType) .Where(x =>needAddCategory.Contains(x.ReadingCategory) && x.CriterionTypeEnum == criterionInfo.CriterionType) .Select(x => new TrialDataFromSystem() @@ -554,6 +555,7 @@ namespace IRaCIS.Core.Application.Service if (!needList.Any(x => x.ReadingCategory == item)) { needList.AddRange(await _readingMedicineSystemQuestionRepository + .Where(x => x.IsEnable) .Where(x => x.LanguageType == inDto.LanguageType) .Where(x => x.ReadingCategory == item && x.IsGeneral) .Select(x => new TrialDataFromSystem() @@ -561,6 +563,7 @@ namespace IRaCIS.Core.Application.Service ShowOrder = x.ShowOrder, IsEnable = x.IsEnable, + LanguageType = x.LanguageType, IsRequired = x.IsRequired, QuestionName = x.QuestionName,