处理字典

2023-03-22 13:28:14 +08:00
parent 8d80545229
commit 24e03d5d3d
2 changed files with 25 additions and 1 deletions
@@ -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