修改

2023-03-30 13:36:42 +08:00
parent 432a2bca21
commit 2923d9e761
6 changed files with 56 additions and 63 deletions
@@ -175,16 +175,23 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                BlindName = x.TaskBlindName,
                IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
                VisitTaskId = x.Id,
-                CrterionDictionaryGroup= x.CrterionDictionaryGroup,
+             
                TaskName = x.TaskName,
                LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null,
                VisitTaskNum = x.VisitTaskNum,
                IsConvertedTask=x.IsConvertedTask,
                BeforeConvertedTaskId=x.BeforeConvertedTaskId,
+                //CrterionDictionaryGroup = x.CrterionDictionaryGroup,
                IsCurrentTask = x.Id == visitTaskId,
                 
            }).ToListAsync();

+
+            taskInfoList.ForEach(x =>
+            {
+                x.CrterionDictionaryGroup = ReadingCommon.GetCrterionDictionaryGroup(x.IsConvertedTask);
+            });
+
            var taskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();

            var isHaveAdditionalTaskIds = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId) && isAdditionalQuestionId.Contains(x.ReadingQuestionTrialId)).Select(x => x.VisitTaskId).Distinct().ToListAsync();