diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index 540bfa910..c1208f3b0 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -19,6 +19,45 @@ namespace IRaCIS.Core.Application.ViewModel public Guid CreateUserId { get; set; } } + public class OrganDictionary + { + + public string ChildGroup { get; set; } + + public int ChildCodeEnum { get; set; } + + + public DicDataTypeEnum DataTypeEnum { get; set; } + + + + public string Value { get; set; } = string.Empty; + + + public string ValueCN { get; set; } = string.Empty; + + + + public string Description { get; set; } = string.Empty; + + public int ShowOrder { get; set; } + + + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + + + public string Code { get; set; } + + public Guid? ParentId { get; set; } + + public bool IsEnable { get; set; } + + public Guid? ConfigTypeId { get; set; } + + } public class GetCriterionLesionTypeInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs index 2581aed3b..c7315f8b6 100644 --- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs @@ -47,7 +47,7 @@ namespace IRaCIS.Core.Application.Service /// /// [HttpPost] - public async Task> GetCriterionLesionType(GetCriterionLesionTypeInDto inDto) + public async Task> GetCriterionLesionType(GetCriterionLesionTypeInDto inDto) { var dicNums = new List(); if (inDto.IsSystem) @@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application.Service var dictionaryId = await _dictionaryRepository.Where(x => x.Code == "LesionType").Select(x => x.Id).FirstOrDefaultAsync(); - var result = await _dictionaryRepository.Where(x => x.ParentId == dictionaryId && dicNums.Contains(int.Parse(x.Code))).ToListAsync(); + var result = await _dictionaryRepository.Where(x => x.ParentId == dictionaryId && dicNums.Contains(int.Parse(x.Code))).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); return result; } diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index 4b72db7a3..afa51fcd7 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -59,6 +59,8 @@ namespace IRaCIS.Core.Application.Service CreateMap(); + CreateMap(); + CreateMap() .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));