From 011189564a5fae1221859a2c06352b373d866b1a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Mar 2023 11:57:15 +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/Reading/Dto/ReadingImageTaskViewModel.cs          | 4 ++++
 .../ReadingCalculate/General/GeneralCalculateService.cs       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 4932bb811..cb8db141f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -274,6 +274,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsCurrentTask { get; set; }
 
+        public Guid? BeforeConvertedTaskId { get; set; }
+
+        public bool IsConvertedTask { get; set; }
+
         public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
     }
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 733d2435a..ac5fc0623 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -179,6 +179,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 TaskName = x.TaskName,
                 LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null,
                 VisitTaskNum = x.VisitTaskNum,
+                IsConvertedTask=x.IsConvertedTask,
+                BeforeConvertedTaskId=x.BeforeConvertedTaskId,
                 IsCurrentTask = x.Id == visitTaskId,
                  
             }).ToListAsync();