From 7d88f49e68e70dfbc8c6749d92ac73d77f21ef00 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Dec 2025 10:39:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A2=AB=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=B8=BANE=E7=9A=84=E5=8D=95=E4=B8=AA=E9=9D=B6=E7=97=85?= =?UTF-8?q?=E7=81=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 3 ++- .../Service/ReadingCalculate/LuganoCalculateService.cs | 3 ++- .../ReadingCalculate/LuganoWithoutPETCalculateService.cs | 3 ++- .../Service/ReadingCalculate/MRECISTHCCCalculateService.cs | 3 ++- .../ReadingCalculate/RECIST1Point1CalculateService.cs | 5 ++++- .../ReadingCalculate/RECIST1Point1_BMCalculateService.cs | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 3636894fa..e9ac5155d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -1110,7 +1110,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 386c06524..58876c832 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -1563,7 +1563,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs index 7dbf62e26..610d83594 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs @@ -1563,7 +1563,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index 8dddf77d0..77e516d4c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -1070,7 +1070,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 71c105a3a..c93824f17 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -912,7 +912,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); + return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 1f656df30..cb3934cc9 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -912,7 +912,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return ExistOrNA.NA.GetEnumInt(); } - var result = inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.NE)); + var result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList().Any(x => x.TableQuestionList.Any(y => + y.QuestionMark == QuestionMark.State && y.Answer.EqEnum(TargetState.UnableEvaluate))); return result ? ExistOrNA.Exist.GetEnumInt() : ExistOrNA.NotExist.GetEnumInt(); }