From ac406ac6f3f964e5685c0f5d3bcd982f5175dc78 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 26 May 2023 17:22:31 +0800 Subject: [PATCH 1/6] =?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 636b6fccc..5593c059a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2105,7 +2105,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate result = NewTargetLesionAssessment.iCPD; } // else if (上一访视新靶病灶评估为“iCPD”&& （当有“存在”状态的淋巴结新靶病灶||当有“存在”或“太小”状态的非淋巴结新靶病灶）) - else if (data.LastTaskNewTargetLesion.EqEnum(NewTargetLesionAssessment.iCPD) && data.ExixtsLymphTarget && data.ExixtsOrLessNoLymphTarget) + else if (data.LastTaskNewTargetLesion.EqEnum(NewTargetLesionAssessment.iCPD) ||( data.ExixtsLymphTarget || data.ExixtsOrLessNoLymphTarget)) { // 疗效为 iCPD result = NewTargetLesionAssessment.iCPD; From cf00e51559e9b7bbe2d88ff0a78f2c589afa3f7c Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 26 May 2023 17:29:35 +0800 Subject: [PATCH 2/6] =?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 5593c059a..9997ebf6b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2105,7 +2105,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate result = NewTargetLesionAssessment.iCPD; } // else if (上一访视新靶病灶评估为“iCPD”&& （当有“存在”状态的淋巴结新靶病灶||当有“存在”或“太小”状态的非淋巴结新靶病灶）) - else if (data.LastTaskNewTargetLesion.EqEnum(NewTargetLesionAssessment.iCPD) ||( data.ExixtsLymphTarget || data.ExixtsOrLessNoLymphTarget)) + else if (data.LastTaskNewTargetLesion.EqEnum(NewTargetLesionAssessment.iCPD) &&( data.ExixtsLymphTarget || data.ExixtsOrLessNoLymphTarget)) { // 疗效为 iCPD result = NewTargetLesionAssessment.iCPD; From 8e8fb1cc8c1a6cde85d42541d7cda04aa4c8709e Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 26 May 2023 17:42:58 +0800 Subject: [PATCH 3/6] =?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 9997ebf6b..660b19400 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2090,7 +2090,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } - NewTargetLesionAssessment? result = null; + NewTargetLesionAssessment? result = NewTargetLesionAssessment.ND; // if（所有新靶病灶消失或一直不存在任何新靶病灶） if(data.NotExistsNewTargetLesion||data.AllVanish) From 56e682314f3d49bbcc2caec21ddcdc13618adf6b Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 26 May 2023 18:00:03 +0800 Subject: [PATCH 4/6] =?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 660b19400..a172609b6 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2076,7 +2076,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate item.TableQuestionList.Any(x => x.QuestionMark == QuestionMark.IsLymph && x.Answer.EqEnum(YesOrNoOrNa.Yes)) ); - data.ExixtsOrLessNoLymphTarget = data.ExixtsLymphTarget || + data.ExixtsOrLessNoLymphTarget = data.ExixtsOrLessNoLymphTarget || ( ( From 420e730003684ea8b75dc4e53f5aa9f17a685c03 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 29 May 2023 09:11:30 +0800 Subject: [PATCH 5/6] =?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 +- .../ReadingCalculate/IRECIST1Point1CalculateService.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 8a9e4ad66..b936e7141 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1375,7 +1375,7 @@ - 与前一访视SOD相比变化量 + 与触发iRECIST访视相比SOD变化量 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index a172609b6..709fed196 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -1321,16 +1321,16 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } #endregion - #region 与前一访视SOD相比变化量 + #region 与触发iRECIST访视相比SOD变化量 /// - /// 与前一访视SOD相比变化量 + /// 与触发iRECIST访视相比SOD变化量 /// /// /// public async Task GetComparedTriggeringSODChange(ReadingCalculateDto inDto) { - var lastTaskId = await this.GetLastVisitTaskId(inDto); - var lastSOD = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0(); + var firstChangeTaskId = await this.GetFirstChangeTaskId(inDto); + var firstChangeSOD = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == firstChangeTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SOD).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0(); var value = await GetSODData(inDto); @@ -1338,7 +1338,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { return null; } - return value.NullChange0() - lastSOD; + return value.NullChange0() - firstChangeSOD; } #endregion From 1239b1e542b9c47eecb47f3f86b9ea8ffe228475 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 29 May 2023 17:06:13 +0800 Subject: [PATCH 6/6] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 709fed196..9116e307c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -2827,6 +2827,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.NoTargetLesion && x.Answer.EqEnum(NoTargetAssessment.ND)) ) && ( inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.NewLesionEvaluation && x.Answer.EqEnum(NewLesionAssessment.ND))