From 6892da7dd4e5e52da7d1704243e218fd8fe0b46a Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 21 Oct 2022 13:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingQuestionViewModel.cs | 2 +- .../ReadingCriterion/ReadingCriterionService.cs | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index caa6a67b9..1be9a39b4 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto [NotDefault] public Guid CriterionId { get; set; } - public string ParentCode { get; set; } + public string ParentCode { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index 65340aeae..faf060990 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -456,22 +456,9 @@ namespace IRaCIS.Core.Application.Service.RC public async Task> GetAssessType(GetAssessTypeInDto inDto) { List result = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.CriterionId - && x.ParentCode == inDto.ParentCode ) - .Select(x => new CriterionDictionaryInfo() - { - Id = x.Id, - DictionaryId = x.DictionaryId, - ChildGroup = x.Dictionary.ChildGroup, - IsBaseLineUse = x.IsBaseLineUse, - IsFollowVisitUse=x.IsFollowVisitUse, - Code = x.Dictionary.Code, - Description = x.Dictionary.Description, - ShowOrder = x.Dictionary.ShowOrder, - ParentCode = x.Dictionary.Parent.Code, - Value = x.Dictionary.Value, - ValueCN = x.Dictionary.ValueCN - }).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync(); + .WhereIf(!inDto.ParentCode.IsNullOrEmpty(), x => x.ParentCode ==inDto.ParentCode) + .ProjectTo(_mapper.ConfigurationProvider).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync(); return result; }