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

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

@@ -543,7 +543,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid? DeleteUserId { get; set; }
 
 
-
+        /// <summary>
+		/// 来自于哪个标记
+		/// </summary>
+		public string FromMark { get; set; } = string.Empty;
 
         public string RowMark { get; set; } = string.Empty;
     }

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);