XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-10-21 13:53:14 +08:00
parent 2569ef3828
commit 6892da7dd4
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -113,7 +113,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[NotDefault] [NotDefault]
public Guid CriterionId { get; set; } public Guid CriterionId { get; set; }
public string ParentCode { get; set; } public string ParentCode { get; set; } = string.Empty;
} }

17
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -456,22 +456,9 @@ namespace IRaCIS.Core.Application.Service.RC
public async Task<List<CriterionDictionaryInfo>> GetAssessType(GetAssessTypeInDto inDto) public async Task<List<CriterionDictionaryInfo>> GetAssessType(GetAssessTypeInDto inDto)
{ {
List<CriterionDictionaryInfo> result = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.CriterionId List<CriterionDictionaryInfo> result = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.CriterionId
&& x.ParentCode == inDto.ParentCode
) )
.Select(x => new CriterionDictionaryInfo() .WhereIf(!inDto.ParentCode.IsNullOrEmpty(), x => x.ParentCode ==inDto.ParentCode)
{ .ProjectTo<CriterionDictionaryInfo>(_mapper.ConfigurationProvider).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
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();
return result; return result;
} }