From 6b18e5ecedca249b1daa369e90bbcf174a54b4d1 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 3 Sep 2025 15:36:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/General/GeneralCalculateService.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 8a18fe606..99d76da1a 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -299,6 +299,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             tableRowAnswers.ForEach(x =>
             {
+                x.ReportMark = x.RowMark;
                 x.VisitTaskId = visitTaskId;
                 x.IsCurrentTaskAdd = false;
                 x.FristAddTaskId = x.FristAddTaskId == beforeConvertedTaskId ? visitTaskId : x.FristAddTaskId;
@@ -384,7 +385,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                                 x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId ? visitTaskId : fristAddTaskId;
                                 x.QuestionId = otherLesionQuestion.Id;
                                 x.OrderMark = otherLesionQuestion.OrderMark;
-                                x.ReportMark = x.RowMark;
+                              
 
                             }
 

From c9e12993a63a49aae54e3d76865abbf6b58226fd Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 3 Sep 2025 15:40:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/General/GeneralCalculateService.cs     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
index 99d76da1a..a8fc1b22c 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
@@ -378,10 +378,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             if (needRowIds.Contains(x.Id))
                             {
                                 index++;
-                                x.RowIndex = index;
-                                x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
                                 var fristAddTaskId = x.FristAddTaskId.Clone();
+                                x.RowIndex = index;
                                 x.FromMark = fristAddTaskId == beforeConvertedTaskId ? string.Empty : x.RowMark;
+                                x.RowMark = otherLesionQuestion.OrderMark + x.RowIndex.GetLesionMark();
+                           
+                              
                                 x.FristAddTaskId = fristAddTaskId == beforeConvertedTaskId ? visitTaskId : fristAddTaskId;
                                 x.QuestionId = otherLesionQuestion.Id;
                                 x.OrderMark = otherLesionQuestion.OrderMark;