From c6b36bf8053975c04c4c33a6b11de461fa0b1e25 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 4 Jan 2023 13:40:52 +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

---
 .../Service/ReadingCalculate/PCWG3CalculateService.cs           | 1 +
 .../Service/ReadingCalculate/RECIST1Point1CalculateService.cs   | 2 +-
 .../Service/ReadingCalculate/SelfDefineCalculateService.cs      | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 8820497e6..659710cd7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -227,6 +227,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
                             QuestionId = x.ReadingQuestionId,
                             TableQuestionId = x.Id,
+
                             Type = x.Type,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index a74d3ff93..3930f94df 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -207,7 +207,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             Type = x.Type,
                             LesionType = question.LesionType,
                             TableQuestionType = x.TableQuestionType,
-                            
+                            RowId=row.RowId,
                             DataSource = x.DataSource,
                             DictionaryCode = x.DictionaryCode,
                             QuestionMark = x.QuestionMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
index a7ab89b5e..b0a546d85 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs
@@ -183,6 +183,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     question.Childrens = rowlist.Select(x => new ReadingReportDto()
                     {
                         QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
+
                         SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
                         SplitOrMergeType = x.SplitOrMergeType,
                         LesionType = question.LesionType,
@@ -209,6 +210,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             QuestionMark = x.QuestionMark,
                             TypeValue = x.TypeValue,
                             RowIndex = row.RowIndex,
+                            RowId=row.RowId,
                             ShowOrder = x.ShowOrder,
                             ValueType = x.ValueType,
                             CustomUnit=x.CustomUnit,