From 2302a1d3512800df41d961e8ecb8125c24fa5d05 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 23 Sep 2022 10:30:12 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs      |  5 +++++
 .../Service/Reading/ReadingImageTaskService.cs    | 15 +++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 16ba305c8..f1c89f0f5 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -60,6 +60,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string QuestionName { get; set; }
 
+
+        public string SplitOrMergeLesionName { get; set; }
+
+        public SplitOrMergeType? SplitOrMergeType { get; set; }
+
         /// <summary>
         /// 类型
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index b082cc7b4..693b44102 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -429,7 +429,7 @@ namespace IRaCIS.Application.Services
             var criterionId = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == indto.TrialId && x.IsConfirm).Select(x => x.Id).FirstOrDefaultAsync();
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId).ToListAsync();
             var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == criterionId).OrderBy(x => x.ShowOrder).ToListAsync();
-
+            var tableAnsweRowInfos = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId).ProjectTo<TableAnsweRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
 
             var answers = await _readingTaskQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
             var tableAnswers = await _readingTableQuestionAnswerRepository.Where(x => visitTaskIds.Contains(x.VisitTaskId)).ToListAsync();
@@ -490,13 +490,16 @@ namespace IRaCIS.Application.Services
                     }
 
                     // 构造表格行数据
-                    var rowIndexs = tableAnswers.Where(x => x.QuestionId == question.QuestionId).Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList();
 
-                    question.Childrens = rowIndexs.Select(x => new ReadingReportDto()
+
+                    var rowlist = tableAnsweRowInfos.Where(x => x.QuestionId == question.QuestionId).OrderBy(x => x.RowIndex).ToList();
+
+
+                    question.Childrens = rowlist.Select(x => new ReadingReportDto()
                     {
-
-                        QuestionName = question.OrderMark + x.GetLesionMark(),
-                        RowIndex = x,
+                        QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
+                        SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
+                        SplitOrMergeType = x.SplitOrMergeType,
 
                     }).ToList();