Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

2025-08-06 10:56:08 +08:00
parent fcdee39356 7e54b4fdd6
commit 677a7f7bd7
3 changed files with 4 additions and 7 deletions
@@ -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>
@@ -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,