From 24d1277b1c2b4efc82910a52aafa3459ae8049dd Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 6 Aug 2025 09:38:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Inspection/FrontAuditConfigService.cs              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index 37318368f..4947c6f37 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -1206,10 +1206,11 @@ namespace IRaCIS.Core.Application.Service
                          {
                              IsShow= lefttrialshow==null? data.IsDefaultChoice : lefttrialshow.IsShow,
                              FrontAuditConfigId = data.Id,
+                             data.Sort,
                              Description =  _userInfo.IsEn_Us ? data.Description : data.DescriptionCN
                          };
           
-            return result.Where(x=>x.IsShow).Distinct().ToList();
+            return result.Where(x=>x.IsShow).Distinct().OrderBy(x=>x.Sort).ToList();
         }
 
         /// <summary>

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

---
 .../Service/ReadingCalculate/MRIPDFFCalculateService.cs     | 2 +-
 IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs             | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
index 5cc4357ab..d577c2a79 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
@@ -417,7 +417,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         FristAddTaskNum = taskinfo.VisitTaskNum,
                         IsCurrentTaskAdd = true,
                         BlindName = taskinfo.TaskBlindName,
-                        OrderMark = tableQuestion.OrderMark + num.GetLesionMark(),
+                        OrderMark = tableQuestion.OrderMark,
                         VisitTaskId = visitTaskId,
                         TrialId = taskinfo.TrialId,
                         QuestionId = tableQuestion.Id,
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index c1565f8c4..0534ce3a8 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -3855,11 +3855,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 //处理标识   因为触发器在稽查后才进行操作
 
-                if (entity.OrderMark == string.Empty)
-                {
-                    entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
-
-                }
+                entity.OrderMark = await _dbContext.ReadingQuestionTrial.Where(x => x.Id == entity.QuestionId).Select(x => x.OrderMark).FirstOrDefaultAsync();
 
                 entity.RowMark = entity.OrderMark+ entity.RowIndex.GetLesionMark();