From 1990cebd582c70c615e10f8d380f135c618b81ea Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 24 Dec 2025 14:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=9E=8D=E5=90=88=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/IRECIST1Point1CalculateService.cs     | 4 +++-
 .../Service/ReadingCalculate/LuganoCalculateService.cs     | 7 +++++--
 .../ReadingCalculate/LuganoWithoutPETCalculateService.cs   | 4 +++-
 .../Service/ReadingCalculate/MRECISTHCCCalculateService.cs | 4 +++-
 .../Service/ReadingCalculate/PCWG3CalculateService.cs      | 4 +++-
 .../ReadingCalculate/RECIST1Point1CalculateService.cs      | 4 +++-
 .../ReadingCalculate/RECIST1Point1_BMCalculateService.cs   | 4 +++-
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
index b1cb82bec..3477311fe 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
@@ -633,7 +633,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             string errorMassage = string.Empty;
 
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+                x.SplitOrMergeType!= SplitOrMergeType.Merge &&x.SplitOrMergeType != SplitOrMergeType.Merged &&
+                x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 0b64664cd..73e2eac79 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -688,7 +688,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             string errorMassage = string.Empty;
 
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+              x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
@@ -697,7 +699,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }).ToListAsync();
 
 
-            var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId &&
+            var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x =>
+            x.VisitTaskId == inDto.VisitTaskId &&
             (x.Answer == TargetState.UnableEvaluate.GetEnumInt() || x.Answer == TargetState.Loss.GetEnumInt())
              && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State
             )
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
index c0371ea35..21e307d71 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoWithoutPETCalculateService.cs
@@ -688,7 +688,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             string errorMassage = string.Empty;
 
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+               x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 5217b83ae..b253cecea 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -463,7 +463,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             // 错误信息
             string errorMassage = string.Empty;
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+               x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 8017ddb37..61bf65736 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -1225,7 +1225,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             string errorMassage = string.Empty;
 
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType != LesionType.BaselineLesions && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+               x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType != LesionType.BaselineLesions && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
index ae4f7325f..68cba7d40 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
@@ -465,7 +465,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             // 错误信息
             string errorMassage = string.Empty;
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+               x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
index 1789cbf3c..f23c0eafa 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
@@ -460,7 +460,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             string errorMassage = string.Empty;
 
-            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
+            var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x =>
+               x.SplitOrMergeType != SplitOrMergeType.Merge && x.SplitOrMergeType != SplitOrMergeType.Merged &&
+            x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null))
                 .Select(x => new
                 {
                     x.ReadingQuestionTrial.OrderMark,