From 064101b155ff395f94be84d97979241639d126c8 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 15 Dec 2025 10:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs   | 2 +-
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs           | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index a1db67038..b7c67088f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1978,7 +1978,7 @@ namespace IRaCIS.Core.Application.Service
                 SplitOrMergeType = SplitOrMergeType.Merge,
             });
 
-            await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
+            await _readingTableAnswerRowInfoRepository.BatchUpdateNoTrackingAsync(x=>x.Id== inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
             {
                 SplitOrMergeType = SplitOrMergeType.MergeMain,
             });
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index b819a7b5b..ffb0417ec 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -3896,12 +3896,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 //if (_userInfo.RequestUrl == " ReadingImageTask/splitLesion")
                 var originalRowMark = string.Empty;
+                var mergeRowMark =  string.Empty;
                 if (entity.SplitRowId != null)
                 {
 
                     originalRowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(t => t.Id == entity.SplitRowId).Select(t => t.RowMark).FirstOrDefaultAsync();
                 }
 
+                if (entity.MergeRowId != null)
+                {
+
+                    mergeRowMark = await _dbContext.ReadingTableAnswerRowInfo.Where(t => t.Id == entity.MergeRowId).Select(t => t.RowMark).FirstOrDefaultAsync();
+                }
+
                 //处理标识   因为触发器在稽查后才进行操作
 
                 entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
@@ -3939,6 +3946,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                 }, new
                 {
                     OriginalRowMark = originalRowMark,
+                    MergeRowMark= mergeRowMark,
                     //TableName = tableName,
                     QuestionAnswerList =