From f10d1b0a9ea40577e2a991f38821a59d5844fac7 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 15:44:59 +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 --- .../IRECIST1Point1CalculateService.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index fa24b9f0b..4330ed6f6 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -1666,7 +1666,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 靶病灶疗效为 ND /// } - /// else if (上一访视评估为iCPD && 本次访视满足RECIST1.1的PD条件&&比整体访视期间最低点SOD增加≥20%&&比整体访视期间最低点SOD绝对增加值≥5 mm) + /// else if (上一访视评估为iCPD && 本次访视满足RECIST1.1的PD条件) /// { /// 靶病灶疗效为 ICPD /// } @@ -1674,7 +1674,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 靶病灶疗效为 ICPD /// } - /// else if (本次访视满足RECIST1.1的PD条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))) + /// else if (本次访视满足RECIST1.1的PD条件 ) /// { /// 靶病灶疗效为 iUPD /// } else if (有任一靶病灶为NE状态) @@ -1765,8 +1765,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 靶病灶疗效为 ND result = TargetAssessment.ND; } - // else if (上一访视评估为iCPD && 本次访视满足RECIST1.1的PD条件&&比整体访视期间最低点SOD增加≥20%&&比整体访视期间最低点SOD绝对增加值≥5 mm) - else if (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCPD) && resultData.MeetRECISTPD && resultData.LowSodAddGreaterThan20Percent && resultData.LowSodAddGreaterThan5) + // else if (上一访视评估为iCPD && 本次访视满足RECIST1.1的PD条件) + else if (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCPD) && resultData.MeetRECISTPD) { // 靶病灶疗效为 ICPD result = TargetAssessment.iCPD; @@ -1777,8 +1777,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 靶病灶疗效为 ICPD result = TargetAssessment.iCPD; } - // } else if (本次访视满足RECIST1.1的PD条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))) - else if (resultData.MeetRECISTPD && ((resultData.LowSodAddGreaterThan20Percent && resultData.LowSodAddGreaterThan5) || (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCR) && resultData.HaveExistLesion))) + // } else if (本次访视满足RECIST1.1的PD条件 ) + else if (resultData.MeetRECISTPD) { // 靶病灶疗效为 iUPD result = TargetAssessment.iUPD; @@ -1831,7 +1831,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 非靶病灶疗效为 iCPD /// } - /// else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”) + /// else if (满足RECIST1.1的PD标准) /// { /// 非靶病灶疗效为 iUPD /// } @@ -1917,8 +1917,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 非靶病灶疗效为 iCPD result = NoTargetAssessment.iCPD; } - // else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”) - else if (data.RECISTPD && data.ExistiUPD) + // else if (满足RECIST1.1的PD标准) + else if (data.RECISTPD) { // 非靶病灶疗效为 iUPD result = NoTargetAssessment.iUPD; @@ -3237,7 +3237,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableQuestions = tableRows.SelectMany(x => x.TableQuestionList).ToList(); //任意单个病灶 / 病灶组评估为“显著增大” - if (tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && x.Answer.EqEnum(NoTargetState.Increase))) + if (tableQuestions.Any(x => x.QuestionMark == QuestionMark.State && (x.Answer.EqEnum(NoTargetState.Increase)|| x.Answer.EqEnum(NoTargetState.IUPD)))) { result = NoTargetAssessment.PD; }