From c93807d67f2add7361a61e464d5b3308cf15fe13 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 25 Dec 2025 10:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/IRECIST1Point1CalculateService.cs |  6 ++++--
 .../ReadingCalculate/MRECISTHCCCalculateService.cs     |  7 +++++--
 .../ReadingCalculate/RECIST1Point1CalculateService.cs  | 10 ++++++----
 .../RECIST1Point1_BMCalculateService.cs                |  6 ++++--
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index ce7dffdbb..a0658c9ae 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -801,8 +801,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             {
                                 var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                                 var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                                if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
-                                    answer = TargetState.Loss.GetEnumInt().ToString();
+                                if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
+                                {
+                                    answer = x.Answer;
+                                }
                                 return new ReadingTableQuestionAnswer
                                 {
                                     Id = NewId.NextGuid(),
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 547408bac..12b958dc9 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -603,8 +603,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                             var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
-                                answer = TargetState.Loss.GetEnumInt().ToString();
+                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
+                            {
+                                answer = x.Answer;
+                            }
+
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index 8fa9f6ebb..b1cb1fe49 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -604,10 +604,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     var tableAnswers = copyTableAnswers
                         .Select(x =>
                         {
-                            var rowId = tableRowAnswers .Where(y => y.OriginalId == x.RowId) .Select(y => y.Id).FirstOrDefault();
-                            var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty: x.Answer;
-                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
-                                answer = TargetState.Loss.GetEnumInt().ToString();
+                            var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
+                            var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
+                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
+                            {
+                                answer = x.Answer;
+                            }
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index a79ad3272..95e3483b3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -606,8 +606,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
                             var rowId = tableRowAnswers.Where(y => y.OriginalId == x.RowId).Select(y => y.Id).FirstOrDefault();
                             var answer = notNeedCopyMarks.Contains(x.QuestionMark) ? string.Empty : x.Answer;
-                            if (mergedRowIds.Contains(rowId) && x.QuestionMark == QuestionMark.State)
-                                answer = TargetState.Loss.GetEnumInt().ToString();
+                            if (mergedRowIds.Contains(rowId) && (x.QuestionMark == QuestionMark.State || x.QuestionMark == QuestionMark.ShortAxis || x.QuestionMark == QuestionMark.MajorAxis))
+                            {
+                                answer = x.Answer;
+                            }
                             return new ReadingTableQuestionAnswer
                             {
                                 Id = NewId.NextGuid(),