From 24d089b245ba29013da295605c32abb4c7bb6429 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 18 Aug 2022 15:42:37 +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

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs | 39 +++++++++++++++++++
 .../Service/Reading/OrganInfoService.cs       |  4 +-
 .../Service/Reading/_MapConfig.cs             |  2 +
 3 files changed, 43 insertions(+), 2 deletions(-)

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
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<List<Dictionary>> GetCriterionLesionType(GetCriterionLesionTypeInDto inDto)
+        public async Task<List<OrganDictionary>> GetCriterionLesionType(GetCriterionLesionTypeInDto inDto)
         {
             var dicNums = new List<int>();
             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<OrganDictionary>(_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<ReadingQuestionTrial, ReadingQuestionSystem>();
 
+            CreateMap<Dictionary, OrganDictionary>();
+
             CreateMap<ReadingQuestionSystem, ReadingQuestionSystemData>()
                   .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));