From 26636337981051d2c443a10f28be313a46cb0613 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Mar 2023 10:56: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/Allocation/VisitTaskHelpeService.cs    |  2 ++
 .../ReadingImageTask/ReadingImageTaskService.cs    | 14 ++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 0c333d895..2685e2710 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -140,6 +140,7 @@ namespace IRaCIS.Core.Application.Service
             taskAnswer.ForEach(x => {
 
                 x.VisitTaskId = taskInfo.Id;
+               
                 x.Id= NewId.NextGuid();
             });
 
@@ -150,6 +151,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 x.VisitTaskId = taskInfo.Id;
                 x.IsCurrentTaskAdd = false;
+                x.isf
                 x.Id = NewId.NextGuid();
             });
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 1489399ec..44b1008da 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -718,17 +718,7 @@ namespace IRaCIS.Application.Services
 
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
 
-            if (taskInfo.IsConvertedTask &&
-                !(await _visitTaskRepository.AnyAsync(x => x.IsAnalysisCreate == taskInfo.IsAnalysisCreate
-               && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis
-               && x.VisitTaskNum < taskInfo.VisitTaskNum
-               && x.DoctorUserId == taskInfo.DoctorUserId
-               && x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId
-               && !x.IsConvertedTask
-               && x.SubjectId == taskInfo.SubjectId
-               && x.ArmEnum == taskInfo.ArmEnum &&
-                x.TaskState == TaskState.Effect))
-                )
+            if (taskInfo.IsConvertedTask &&taskInfo.BeforeConvertedTaskId!=null)
             {
                 result.ForEach(x =>
                 {
@@ -1153,7 +1143,7 @@ namespace IRaCIS.Application.Services
                 });
 
 
-
+                answers.Add("LesionType", rowInfo.LesionType.ToString()); 
                 answers.Add("BlindName", rowInfo.BlindName);
                 answers.Add("IsFirstChangeTask", isFirstChangeTask.ToString());
                 answers.Add("FromMark", rowInfo.FromMark);