diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 9dc418ac2..fe0f3be1a 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -80,7 +80,7 @@ namespace IRaCIS.Application.Contracts public class GetBasicDataAllSelectInDto { - public Guid? CriterionId { get; set; } + public Guid? TrialReadingCriterionId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index ee16f8e9f..f42845ee9 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -230,13 +230,13 @@ namespace IRaCIS.Application.Services var result = searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList()); - if (inDto.CriterionId == null) + if (inDto.TrialReadingCriterionId == null) { return result; } else { - var criterionDictionList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.CriterionId).Select(x => new BasicDicSelect() + var criterionDictionList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId).Select(x => new BasicDicSelect() { ChildGroup = x.Dictionary.ChildGroup, Code = x.Dictionary.Code,