From 02883db4026c9f36980e184875a175da8928e8c3 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 23 Mar 2023 15:39:07 +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/Allocation/VisitTaskHelpeService.cs               | 1 +
 .../ReadingCalculate/IRECIST1Point1CalculateService.cs        | 4 ++--
 IRaCIS.Core.Domain/Allocation/VisitTask.cs                    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 543df1665..f489b1bea 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -102,6 +102,7 @@ namespace IRaCIS.Core.Application.Service
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == taskId).IgnoreAutoIncludes().AsNoTracking().FirstNotNullAsync();
             taskInfo.ReadingTaskState = ReadingTaskState.WaitReading;
             taskInfo.IsConvertedTask = true;
+            taskInfo.BeforeConvertedTaskId = taskId;
             taskInfo.Id = NewId.NextGuid();
 
             await _visitTaskRepository.BatchUpdateNoTrackingAsync(x =>
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index 8619dae1c..50f0b4ee7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -724,8 +724,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
                      x.DoctorUserId == taskinfo.DoctorUserId &&
                      x.IsSelfAnalysis== taskinfo.IsSelfAnalysis &&
-                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum) 
-                    && ((x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect)||(x.VisitTaskNum==taskinfo.VisitTaskNum&&x.TaskState==TaskState.Freeze) )
+                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum
+                    && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect)||(x.Id==taskinfo.BeforeConvertedTaskId) 
                     ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 
 
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index 8ffc4efce..d6998f29e 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -294,6 +294,8 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public bool IsConvertedTask { get; set; } = false;
 
+        public Guid BeforeConvertedTaskId { get; set; }
+
         [NotMapped]
         public List<CrterionDictionaryGroup> CrterionDictionaryGroup
         {