From 24fc0e82bece1d8df0dd78fbd70f4821f982004b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 14 Nov 2022 16:11:19 +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

---
 .../Service/ReadingCalculate/PCWG3CalculateService.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 90536ddb4..b9f4d4ffd 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -701,7 +701,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var taskList = await GetSiteVisitForTumorList(inDto);
-            var lastTask = taskList.Where(x => x.VisitTaskNum < taskinfo.VisitTaskNum).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault();
+            var lastTask = taskList.Where(x => x.VisitTaskNum < taskinfo.VisitTaskNum&&x.VisitTaskId!=inDto.VisitTaskId).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault();
             if (lastTask != null)
             {
                 var thisTask = taskList.FirstOrDefault();
@@ -767,7 +767,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var taskList =await GetSiteVisitForTumorList(inDto);
-            var lastTask = taskList.Where(x => x.VisitTaskNum < taskinfo.VisitTaskNum).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault();
+            var lastTask = taskList.Where(x => x.VisitTaskNum < taskinfo.VisitTaskNum&&x.VisitTaskId!=inDto.VisitTaskId).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault();
 
             var baseLineTask = taskList.OrderBy(x => x.VisitTaskNum).FirstOrDefault();
             var newLesionsCountQuestionId = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.QuestionId).FirstOrDefault();