Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -1053,6 +1053,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid? VisitId { get; set; }
 
         public bool IsCurrentTask { get; set; }
+
+        /// <summary>
+        /// 是否是转变的任务(转为IRECIST)
+        /// </summary>
+        public bool IsConvertedTask { get; set; } = false;
+
+        /// <summary>
+        /// 是否是第一次转化的任务
+        /// </summary>
+        public bool IsFirstChangeTask { get; set; } = false;
     }
 
     public class GetVisitReadingQuestionOutDto

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -446,6 +446,8 @@ namespace IRaCIS.Application.Services
                     VisitTaskNum = x.VisitTaskNum,
                     IsBaseLineTask = x.SourceSubjectVisitId == baselineVisitId,
                     IsCurrentTask = x.Id == inDto.VisitTaskId,
+                    IsConvertedTask=x.IsConvertedTask,
+                    IsFirstChangeTask=x.BeforeConvertedTaskId!=null,
 
                 }).OrderBy(x => x.VisitTaskNum).ToListAsync();