From 9f0802451460bd23812014fe1672479fbc913e2b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 22 Sep 2023 16:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingImageTaskService.cs   | 15 ++-------------
 .../Service/Reading/_MapConfig.cs                 |  1 +
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 6a9ded7f5..2ca550a89 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -851,19 +851,8 @@ 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();
+            var questionMark = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ProjectTo<GetTableAnswerRowInfoOutDto>(_mapper.ConfigurationProvider).ToListAsync();
+
 
             questionMark.ForEach(x => {
 
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index a871faccb..1a64ffa07 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -94,6 +94,7 @@ namespace IRaCIS.Core.Application.Service
 			 .ForMember(d => d.Value, u => u.MapFrom(s => s.Dictionary.Value))
 			  .ForMember(d => d.ValueCN, u => u.MapFrom(s => s.Dictionary.ValueCN));
 
+            CreateMap<ReadingTaskQuestionMark, GetTableAnswerRowInfoOutDto>();
             CreateMap<ReadingTaskQuestionMark, QuestionMarkInfo>();
             CreateMap<QuestionMarkInfo, ReadingTaskQuestionMark>();
             //CreateMap<ReadingClinicalDataView, GetReadingClinicalDataListOutDto>();