添加标记

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

@@ -829,6 +829,9 @@ namespace IRaCIS.Application.Services
                 .ToListAsync();
 
 
+
+
+
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).ProjectTo<VisitTaskDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
             if (taskInfo.IsConvertedTask &&taskInfo.BeforeConvertedTaskId!=null)
@@ -845,6 +848,26 @@ namespace IRaCIS.Application.Services
 
                 x.OrderMarkName = x.OrderMark + x.RowIndexNum.GetLesionMark();
             });
+
+            var questionMark = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).
+                Select(x => new GetTableAnswerRowInfoOutDto()
+                {
+                    FristAddTaskId = x.FirstAddTaskId.Value,
+                    Id = x.Id,
+                    InstanceId = x.InstanceId,
+                    MeasureData = x.MeasureData,
+                    NumberOfFrames = x.NumberOfFrames,
+                    PicturePath = x.PicturePath,
+                    VisitTaskId = x.VisitTaskId,
+                    StudyId = x.StudyId,
+                    SeriesId = x.StudyId,
+                }).ToListAsync();
+
+            questionMark.ForEach(x => {
+
+                x.IsFirstChangeTask = x.VisitTaskId == inDto.VisitTaskId;
+            });
+            result.AddRange(questionMark);
             return result;
         }
 
@@ -1535,6 +1558,13 @@ namespace IRaCIS.Application.Services
             }).ToList();
             await _readingTaskQuestionAnswerRepository.AddRangeAsync(needAddAnswer);
 
+
+            var questionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).Select(x => new
+            {
+                x.QuestionId,
+                x.FirstAddTaskId,
+
+            }).ToListAsync();
             await _readingTaskQuestionMarkRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId);
 
             var datetime = DateTime.Now;
@@ -1551,8 +1581,8 @@ namespace IRaCIS.Application.Services
                 QuestionId = x.QuestionId,
                 SeriesId = x.SeriesId,
                 StudyId = x.StudyId,
-                CreateTime = datetime
-
+                CreateTime = datetime,
+                FirstAddTaskId= questionMarkList.Where(y=>y.QuestionId==x.QuestionId).Select(x=>x.FirstAddTaskId).FirstOrDefault() ?? inDto.VisitTaskId,
             }).ToList();
             await _readingTaskQuestionMarkRepository.AddRangeAsync(markList);
             await _readingTaskQuestionAnswerRepository.SaveChangesAsync();