From 6f0e61a5f61763f43a1968f47ffb0ce983df6d75 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 20 Oct 2022 17:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Interface/IReadingQuestionService.cs      |  2 ++
 .../TrialSiteUser/DTO/TrialConfigDTO.cs       |  5 +++--
 .../TrialSiteUser/TrialConfigService.cs       | 20 +++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
index 2e5d2643..ef838388 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingQuestionService.cs
@@ -15,5 +15,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         Task SynchronizeCriterion(SynchronizeCriterionInDto inDto);
 
+
+
     }
 }
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index f491b796..02e3ffaf 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -1,4 +1,5 @@
-using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Domain.Share;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -768,7 +769,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetGlobalReadingOutDto
     {
-        public List<Guid> GlobalAssessTypeIds { get; set; }
+        public List<GetAssessTypeOutDto> GlobalAssessTypes { get; set; }
 
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 66618c3e..bbeeb2ed 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -206,8 +206,24 @@ namespace IRaCIS.Core.Application
                 IsGlobalReading = trialCriterion.IsGlobalReading,
                 IsSystemCriterion= trialCriterion.ReadingQuestionCriterionSystemId!=null,
                 IsSign=trialCriterion.ReadingInfoSignTime!=null,
-                GlobalAssessTypeIds = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId && x.ParentCode == ReadingCommon.GlobalAssess).Select(x => x.DictionaryId).ToListAsync(),
-            };
+                GlobalAssessTypes = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId
+            && x.ParentCode == ReadingCommon.GlobalAssess
+            )
+            .Select(x => new GetAssessTypeOutDto()
+            {
+                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;
         }