From 24e03d5d3d69fa8acb8dc97fb00045df800897ce Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 22 Mar 2023 13:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  3 +++
 .../ReadingGlobalTaskService.cs               | 23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e7f70131e..81659e689 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1123,6 +1123,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
             }
         }
 
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
         public List<GlobalQuestionInfo> BeforeQuestionList { get; set; }
 
         public List<GlobalQuestionInfo> AgreeOrNot { get; set; }
@@ -1226,6 +1227,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 是否是裁判问题
         /// </summary>
         public bool IsJudgeQuestion { get; set; } = true;
+
+        public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
     }
 
     public class GetReadingImgOutDto
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index a46afeba1..b5db6c607 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -228,7 +228,7 @@ namespace IRaCIS.Application.Services
                     VisitNum = x.SourceSubjectVisit.VisitNum,
                     IsBaseLine=x.SourceSubjectVisit.IsBaseLine,
                     VisitId = x.SourceSubjectVisitId.Value,
-                   
+                    CrterionDictionaryGroup=  x.CrterionDictionaryGroup,
                     BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder)
                   .Select(y => new GlobalQuestionInfo()
                   {
@@ -449,6 +449,27 @@ namespace IRaCIS.Application.Services
               ValueCN = x.Dictionary.ValueCN
           }).OrderBy(x => x.ParentCode).ThenBy(x => x.ShowOrder).ToListAsync();
             result.AssessTypeList = assessTypeList;
+
+
+            // 返回之前处理字典
+            result.TaskList.ForEach(x =>
+            {
+                x.AfterQuestionList.ForEach(y =>
+                {
+                    y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
+                });
+
+                x.BeforeQuestionList.ForEach(y =>
+                {
+                    y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
+                });
+
+                x.AgreeOrNot.ForEach(y =>
+                {
+                    y.CrterionDictionaryGroup = x.CrterionDictionaryGroup;
+                });
+            });
+
             return result;
         }
         #endregion