From 0e1f4931eb202f846d194fdab9f7c5f035b01c4d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 23 Feb 2024 13:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs     | 6 +++++-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs                | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 5c796aacf..d77bf36d3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1480,9 +1480,13 @@ namespace IRaCIS.Application.Services
             await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x=> inDto.MergeRowIdList.Contains(x.Id), x => new ReadingTableAnswerRowInfo()
             {
                 MergeRowId=inDto.MergeMainRowId,
-				 = mark,
                 SplitOrMergeType = SplitOrMergeType.Merge,
             }) ;
+
+			await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(inDto.MergeMainRowId, x => new ReadingTableAnswerRowInfo()
+			{
+				SplitOrMergeType = SplitOrMergeType.MergeMain,
+			});
 			await _readingTableAnswerRowInfoRepository.SaveChangesAsync();
 
 			await this._readingCalculateService.CalculateTask(new CalculateTaskInDto()
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 6040c46b6..06abbb00d 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -657,6 +657,11 @@ namespace IRaCIS.Core.Domain.Share
         /// 融合过 再之前任务融合了
         /// </summary>
 		Merged=3,
+
+		/// <summary>
+		/// 融合主病灶
+		/// </summary>
+		MergeMain = 4,
 	}
 
 	/// <summary>