甄别

src/Hotline.Api/Controllers/OrderController.cs

@@ -893,7 +893,7 @@ public class OrderController : BaseController
             .Includes(x => x.VisitDetail)
             .Includes(x => x.Visit, d => d.Order)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Visit.Order.Title.Contains(dto.Keyword!) || d.Visit.Order.No.Contains(dto.Keyword!))
-            .WhereIF(dto.Status == EScreenStatus.Apply || dto.Status == EScreenStatus.Approval || dto.Status == EScreenStatus.End, x => x.Status == dto.Status)
+            .WhereIF(dto.Status.HasValue, x => x.Status == dto.Status)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
             .OrderByDescending(x => x.CreationTime)

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -396,7 +396,7 @@ namespace Hotline.Share.Dtos.Order
 		/// <summary>
 		/// 甄别申请状态
 		/// </summary>
-		public EScreenStatus Status { get; set; }
+		public EScreenStatus? Status { get; set; }
 
 		public DateTime? CreationTimeStart { get; set; }
 	    public DateTime? CreationTimeEnd { get; set; }