From f2b53cd35934df941a2540f44941f3b0e562d128 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 25 Mar 2024 10:42:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskMedicalReviewService.cs        | 2 +-
 IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs        | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
index 7b4c39d75..0771faa0c 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@@ -230,7 +230,7 @@ namespace IRaCIS.Core.Application.Service
                               .WhereIf(inQuery.IsInvalid != null, t => t.IsInvalid == inQuery.IsInvalid)
                              .WhereIf(inQuery.IsGetBeRead,x=>!x.IsInvalid&&x.AuditState!= MedicalReviewAuditState.HaveSigned)
                               .WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
-						  .OrderBy(x => x.AuditStateSort).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
+						  .OrderBy(x => x.AuditState== MedicalReviewAuditState.WaitAudit|| x.AuditState == MedicalReviewAuditState.Auditing).ThenBy(x=>x.VisitTask.SubjectId).ThenBy(x=>x.VisitTask.ArmEnum).ThenBy(x=>x.VisitTask.VisitTaskNum)
                              .ProjectTo<TaskMedicalReviewView>(_mapper.ConfigurationProvider);
                         
 
diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
index 326635a80..54ba087db 100644
--- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
+++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
@@ -59,14 +59,6 @@ namespace IRaCIS.Core.Domain.Models
         [Required]
         public MedicalReviewAuditState AuditState { get; set; }
 
-        public int AuditStateSort {
-        
-            get
-            {
-                return AuditState==MedicalReviewAuditState.HaveSigned?2:1;
-            }
-        }
-
 
 
 		/// <summary>