From c7ef738dd99e2378b45e22b12048e1ba68e73061 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 17 Jan 2023 19:10:36 +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 --- .../ReadingGlobalTaskService.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 190350f19..be7cd25bd 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -190,6 +190,7 @@ namespace IRaCIS.Application.Services BeforeQuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.GlobalReadingShowType!=GlobalReadingShowType.NotShow).OrderBy(y => y.ReadingQuestionTrial.ShowOrder) .Select(y => new GlobalQuestionInfo() { + QuestionId = y.ReadingQuestionTrialId, QuestionName = y.ReadingQuestionTrial.QuestionName.LanguageName(y.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), AnswerGroup = y.ReadingQuestionTrial.AnswerGroup, @@ -204,7 +205,7 @@ namespace IRaCIS.Application.Services TypeValue = y.ReadingQuestionTrial.TypeValue, ValueType = y.ReadingQuestionTrial.ValueType, IsJudgeQuestion =y.ReadingQuestionTrial.IsJudgeQuestion, - Answer = y.Answer + Answer =y.GlobalChangeAnswer==string.Empty|| y.GlobalChangeAnswer ==null? y.Answer: y.GlobalChangeAnswer, }).ToList() }).ToListAsync(); @@ -212,18 +213,18 @@ namespace IRaCIS.Application.Services var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync(); var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync(); - if (criterionType == CriterionType.PCWG3) - { - result.TaskList.ForEach(x => - { + //if (criterionType == CriterionType.PCWG3) + //{ + // result.TaskList.ForEach(x => + // { - x.BeforeQuestionList.ForEach(y => - { - var globalAnswer = globalReadingQuestion.Where(z => z.QuestionId == y.QuestionId).Select(z => z.Answer).FirstOrDefault(); - y.Answer = globalAnswer.IsNullOrEmpty() ? y.Answer : globalAnswer; - }); - }); - } + // x.BeforeQuestionList.ForEach(y => + // { + // var globalAnswer = globalReadingQuestion.Where(z => z.QuestionId == y.QuestionId).Select(z => z.Answer).FirstOrDefault(); + // y.Answer = globalAnswer.IsNullOrEmpty() ? y.Answer : globalAnswer; + // }); + // }); + //} result.TaskList.ForEach(x => {