From 2869804272ea542af1c2d873b673a3f3a6faa60a Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Mar 2023 11:14:30 +0800
Subject: [PATCH 1/3] =?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       | 7 ++++++-
 IRaCIS.Core.Application/Service/Reading/_MapConfig.cs      | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 862d8f7de..52b3295e5 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -740,6 +740,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string FromMark { get; set; } = string.Empty;
 
+        /// <summary>
+		/// 病灶类型
+		/// </summary>
+		public LesionType? LesionType { get; set; }
+
 
         /// <summary>
         /// 截图地址
@@ -825,7 +830,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public int ShowOrder { get; set; }
 
 
-        public bool IsFirstChangeTask { get; set; } = false;
+        public bool IsFirstChangeTask { get; set; }
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 244523aa2..86d716f30 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -97,6 +97,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<ReadingTableAnswerRowInfo, GetTableAnswerRowInfoOutDto>()
+                    .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial.LesionType))
                   .ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.ReadingQuestionTrial.ShowOrder))
                      .ForMember(d => d.OrderMark, u => u.MapFrom(s => s.ReadingQuestionTrial.OrderMark))
                    .ForMember(d => d.RowIndex, u => u.MapFrom(s => s.RowIndex.ToString()))

From d4a3f1c69a1cf19e87ab916bf2fc988fb4d8b1e7 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Mar 2023 11:18:56 +0800
Subject: [PATCH 2/3] =?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 -
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 2685e2710..e38083603 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -151,7 +151,6 @@ 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/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 52b3295e5..cab45c5cd 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -830,7 +830,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public int ShowOrder { get; set; }
 
 
-        public bool IsFirstChangeTask { get; set; }
+        public bool IsFirstChangeTask { get; set; } = false;
 
     }
 

From 1c2030a42534c7f2698e3e07a896ada61e62c02b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Mar 2023 11:24:22 +0800
Subject: [PATCH 3/3] =?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      | 1 +
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs   | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index cab45c5cd..d863fd555 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -387,6 +387,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public string Answer { get; set; }
 
+        public bool IsFirstChangeTask { get; set; } = false;
         public List<CrterionDictionaryGroup> CrterionDictionaryGroup { get; set; }
 
         public List<DicomReadingQuestionAnswer> Childrens = new List<DicomReadingQuestionAnswer>();
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 44b1008da..0cd00e6ee 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -643,6 +643,14 @@ namespace IRaCIS.Application.Services
                 {
                     x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup;
                 });
+
+                if (taskinfo.IsConvertedTask && taskinfo.BeforeConvertedTaskId != null)
+                {
+                    questions.ForEach(x =>
+                    {
+                        x.IsFirstChangeTask =true;
+                    });
+                }
             }
             else
             {