From 7ceca5d802548d717c7ba99dee538951bbb71038 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 5 Jan 2026 18:01:07 +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 --- .../General/ReadingCalculateService.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 2b792748e..a120a38f2 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -486,7 +486,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate Evaluation = new List>() { } }; - + var visitAnswerType = QuestionType.Tumor; + if (criterion.CriterionType == CriterionType.PCWG3) + { + visitAnswerType = QuestionType.SiteVisitForTumorEvaluation; + } + + result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { Value=x }).ToList()); @@ -504,7 +510,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var r1data = r1.TaskQuestions .SelectMany(x => x.Childrens) - .Where(x => x.QuestionType == QuestionType.Tumor) + .Where(x => x.QuestionType == visitAnswerType) .SelectMany(x => x.Answer.Select(a => new EvaluationValue { DictionaryCode = x.DictionaryCode, @@ -535,7 +541,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var r2data = r2.TaskQuestions .SelectMany(x => x.Childrens) - .Where(x => x.QuestionType == QuestionType.Tumor) + .Where(x => x.QuestionType == visitAnswerType) .SelectMany(x => x.Answer.Select(a => new EvaluationValue { DictionaryCode = x.DictionaryCode,