From 4859fd301a87db1180c76aea18d60a1886867bb5 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 23 May 2023 14:55:07 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs index 7a843b8c0..9030a1cf3 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadModuleView.cs @@ -161,6 +161,11 @@ namespace IRaCIS.Core.Domain.Models /// /// 标准名称 /// - public string CriterionName { get; set; } + public string CriterionName { get; set; } + + /// + /// 阅片配置的类型 + /// + public ReadingSetType ReadingSetType { get; set; } } } From 5c760a83d6f65b0dec5efdc5274f4f9bca3b1438 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 23 May 2023 15:00:46 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs | 2 +- .../Service/Reading/ReadingPeriod/ReadModuleService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs index ea2b17a0d..28fef0344 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs @@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 模块名称 /// - public string ModuleName { get; set; } + public string Name { get; set; } } public class GetSubjectReadVisitsInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index 9c43b2430..df4abf28e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -117,7 +117,7 @@ namespace IRaCIS.Application.Services { await _readModuleRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new ReadModule() { SubjectVisitId=inDto.SubjectVisitIdId, - ModuleName=inDto.ModuleName, + ModuleName=inDto.Name, }); return await _readModuleRepository.SaveChangesAsync(); From fc9969570d25c12b1719b8d4cc9d5009585666b9 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 23 May 2023 15:20:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 2 +- .../Service/Reading/ReadingPeriod/ReadModuleService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index f2e613a74..596fd8d33 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -2634,7 +2634,7 @@ 受试者ID - + 模块名称 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs index df4abf28e..e5dff07f2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs @@ -82,7 +82,7 @@ namespace IRaCIS.Application.Services && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ReadingCategory == ReadingCategory.Visit && x.SubjectId == inDto.SubjectId - && x.TaskState == TaskState.Effect).MaxAsync(x => x.VisitTaskNum); + && x.TaskState == TaskState.Effect).OrderByDescending(x => x.VisitTaskNum).Select(x=> x.VisitTaskNum).FirstOrDefaultAsync(); var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null && !x.IsLostVisit); From 1678f9a021c303d7ed5e835cd593cc6fb7b1d294 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 23 May 2023 17:47:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/IRECIST1Point1CalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 8fcfa0e0e..83673fae0 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -799,7 +799,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State ).Where(x => (x.ReadingQuestionTrial.LesionType==LesionType.TargetLesion && x.Answer == TargetState.UnableEvaluate.GetEnumInt()) - || (x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.Answer == NewTargetLesionState.NotEvaluable.GetEnumInt()) + || (x.ReadingQuestionTrial.LesionType == LesionType.NewLesions && x.Answer == NewLesionState.UnableEvaluate.GetEnumInt()) || (x.ReadingQuestionTrial.LesionType == LesionType.NonTargetLesions && x.Answer == NoTargetState.UnableEvaluate.GetEnumInt()) || (x.ReadingQuestionTrial.LesionType == LesionType.NewTargetLesion && x.Answer == NewTargetLesionState.NotEvaluable.GetEnumInt()) || (x.ReadingQuestionTrial.LesionType == LesionType.NewNonTargetLesion && x.Answer == NewNoTargetLesionState.NotEvaluable.GetEnumInt()) From dda82466c95cceb12864e5f7b503c97bbd1c271f Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 09:26:55 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 83673fae0..b72c26268 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -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条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))) /// { /// 靶病灶疗效为 iUPD /// } else if (有任一靶病灶为NE状态) @@ -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条件 && ((比整体访视期间最低点SOD增加≥20 % && 比整体访视期间最低点SOD绝对增加值≥5 mm)|| (前一访视评估为iCR && 当前访视至少有一个“存在”状态的靶病灶))) + else if (resultData.MeetRECISTPD && ((resultData.LowSodAddGreaterThan20Percent && resultData.LowSodAddGreaterThan5) || (resultData.LastTaskTarget.EqEnum(TargetAssessment.iCR) && resultData.HaveExistLesion))) { // 靶病灶疗效为 iUPD result = TargetAssessment.iUPD; @@ -2547,7 +2547,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 疗效为 iUPD /// } - /// else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND)) + /// else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND)|| (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND)) /// { /// 疗效为 iCR /// } @@ -2647,7 +2647,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate result = OverallAssessment.iUPD; } // - // else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) && (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND)) + // else if ((靶病灶评估为iCR && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为ND && 非靶病灶评估为iCR && 新病灶评估为ND) || (靶病灶评估为iCR && 非靶病灶评估为ND && 新病灶评估为ND)) else if ( (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iCR)) From 714f48deb770bfcd446e0c2b34ead6bae25f0a77 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 11:03:28 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/IRECIST1Point1CalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index b72c26268..17d24183e 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2616,7 +2616,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } // else if (上一访视评估为iUPD或iCPD&&靶病灶评估、非靶病灶评估或新病灶评估任一项从前一访视非iUPD结果评估为当前访视iUPD) - if (data.LastTaskLesioniUPDOriCPD + else if (data.LastTaskLesioniUPDOriCPD && ( ( lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && !x.Answer.EqEnum(TargetAssessment.iUPD)) From 22d3d542aea40eaeffa6e3c0bf93ff8a4e15db7d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 11:38:57 +0800 Subject: [PATCH 7/9] =?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 | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 17d24183e..9dba23312 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2616,24 +2616,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } // else if (上一访视评估为iUPD或iCPD&&靶病灶评估、非靶病灶评估或新病灶评估任一项从前一访视非iUPD结果评估为当前访视iUPD) - else if (data.LastTaskLesioniUPDOriCPD - && ( + else if (data.LastTaskLesioniUPDOriCPD + && ( + ( + lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && !x.Answer.EqEnum(TargetAssessment.iUPD)) + && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iUPD)) + ) + || ( - lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && !x.Answer.EqEnum(TargetAssessment.iUPD)) - && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iUPD)) + lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && !x.Answer.EqEnum(NoTargetAssessment.iUPD)) + && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iUPD)) ) - || - ( - lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && !x.Answer.EqEnum(NoTargetAssessment.iUPD)) - && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iUPD)) - ) - || - ( - lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && !x.Answer.EqEnum(NewLesionAssessment.iUPD))) - && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.iUPD)) - ) - ) - + || + ( + lastTaskCalculateDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && !x.Answer.EqEnum(NewLesionAssessment.iUPD))) + && inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.iUPD)) + ) + ) + { // 疗效为 iCPD result = OverallAssessment.iCPD; @@ -2724,7 +2724,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate && (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iCR)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iNN)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.NE)) - + ) && ( inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.ND)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.Suspected)) @@ -2794,18 +2794,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return result == null ? string.Empty : ((OverallAssessment)result).GetEnumInt(); } - #endregion - #endregion + #endregion + #endregion - #region 转化时计算 + #region 转化时计算 - #region 获取转化的靶病灶评估 - /// - /// 获取转化的靶病灶评估 - /// - /// - /// - public async Task GetConvertingTargetLesionEvaluate(ReadingCalculateDto inDto) + #region 获取转化的靶病灶评估 + /// + /// 获取转化的靶病灶评估 + /// + /// + /// + public async Task GetConvertingTargetLesionEvaluate(ReadingCalculateDto inDto) { var beforeConvertedAnswer = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.BeforeConvertedTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefaultAsync(); From 26421f78e23afa9d58933e5868208202d39732cc Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 14:25:58 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 9dba23312..939ece680 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -1831,7 +1831,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 非靶病灶疗效为 iCPD /// } - /// else if (任一非靶病灶状态评估为“显著增大（iUPD）”) + /// else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”) /// { /// 非靶病灶疗效为 iUPD /// } @@ -1917,8 +1917,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 非靶病灶疗效为 iCPD result = NoTargetAssessment.iCPD; } - // else if ( 任一非靶病灶状态评估为“显著增大（iUPD）”) - else if ( data.ExistiUPD) + // else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大（iUPD）”) + else if (data.RECISTPD && data.ExistiUPD) { // 非靶病灶疗效为 iUPD result = NoTargetAssessment.iUPD; From 0e1655004a965dd255e00c501380eb676e41323d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 24 May 2023 15:15:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 939ece680..fa24b9f0b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2336,7 +2336,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 疗效为 iUPD /// } - /// else if (新靶病灶、新非靶病灶、其它既往新病灶任一项评估为NE) + /// else if (新靶病灶、新非靶病灶、其它既往新病灶,触发iRECIST后新病灶 任一项评估为NE) /// { /// 疗效为 NE /// } @@ -2439,10 +2439,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 疗效为 iUPD result = NewLesionAssessment.iUPD; } - // else if (新靶病灶、新非靶病灶、其它既往新病灶任一项评估为NE) + // else if (新靶病灶、新非靶病灶、其它既往新病灶,触发iRECIST后新病灶 任一项评估为NE) else if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewTargetLesion && x.Answer.EqEnum(NewTargetLesionAssessment.NE)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewNoTargetLesion && x.Answer.EqEnum(NewNoTargetLesionAssessment.NE)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.OtherNewTargetLesion && x.Answer.EqEnum(OtherPreviousNewLesionAssessment.NE)) + || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.IRECISTNewTargetLesion && x.Answer.EqEnum(NewLesionAfterTriggeringiRECSITAssessment.NE)) ) { // 疗效为 NE @@ -2555,7 +2556,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 疗效为 iPR /// } - /// else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为否或疑似或NE) + /// else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为ND或疑似或NE) /// { /// 疗效为 iPR /// } @@ -2685,7 +2686,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 疗效为 iPR result = OverallAssessment.iPR; } - // else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为否或疑似或NE) + // else if (靶病灶评估为iCR && 非靶病灶评估为iNN或NE && 新病灶评估为ND或疑似或NE) else if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.TargetLesion && x.Answer.EqEnum(TargetAssessment.iCR)) && (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.iNN)) || inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.NE))