添加上一次

2024-12-25 16:09:10 +08:00
parent 2e9afc2ce8
commit 3ae311bd02
5 changed files with 69 additions and 7 deletions
@@ -469,13 +469,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        public int? NumberOfFrames { get; set; }

        public string MeasureData { get; set; } = string.Empty;
-        public Guid FirstAddTaskId
-        {
-            get
-            {
-                return this.VisitTaskId;
-            }
-        }
+        public Guid? FirstAddTaskId { get; set; }

        public QuestionType? QuestionType { get; set; }
        public string OrderMarkName { get; set; } = string.Empty;
@@ -92,6 +92,7 @@ namespace IRaCIS.Core.Application.Service
        [HttpPost]
        public async Task<SaveTableQuestionMarkInDto> SaveTableQuestionMark(SaveTableQuestionMarkInDto inDto)
        {
+            inDto.FirstAddTaskId=inDto.FirstAddTaskId==null?inDto.VisitTaskId:inDto.FirstAddTaskId;
             var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
            await _readingTableQuestionAnswerRepository.BatchDeleteNoTrackingAsync(x =>x.VisitTaskId==inDto.VisitTaskId&&x.QuestionId==inDto.QuestionId&& x.RowId == inDto.RowId.Value && x.TableQuestionId == inDto.TableQuestionId);
            await _readingTableQuestionAnswerRepository.AddAsync(new ReadingTableQuestionAnswer()
@@ -1008,6 +1009,7 @@ namespace IRaCIS.Core.Application.Service
                x.IsFirstChangeTask = x.VisitTaskId == inDto.VisitTaskId;
            });
            result.AddRange(questionMark);
+            result= result.OrderBy(x=>x.RowIndex).ThenBy(x => x.OrderMarkName).ToList();
            return result;
        }

@@ -65,6 +65,7 @@ namespace IRaCIS.Core.Application.Service
            CreateMap<TrialClinicalTableQuestion, ClinicalTablePreviewDto>();
            #endregion

+            CreateMap<ReadingTaskQuestionMark, TableMarkInfo>();
            CreateMap<VisitTask, VisitTaskDto>();
            CreateMap<SaveTableQuestionMarkInDto, ReadingTaskQuestionMark>();
            CreateMap<ReadingTaskQuestionMark, TableQuestionMark>();