田爽 9 месяцев назад
Родитель
Сommit
a796c3b770

+ 1 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -1821,7 +1821,7 @@ public class OrderController : BaseController
             .Includes(d => d.VisitDetail)
             .Includes(d => d.Visit, v => v.Order)
             .Includes(d => d.Workflow)
-            .Includes(d=> d.ScreenDetail.Where(sd=>sd.AuditUserId  ==  _sessionContext.UserId).OrderByDescending(sd=>sd.AuditTime).Take(1).ToList())
+            .Includes(d=> d.ScreenDetails.Where(sd=>sd.AuditUserId  ==  _sessionContext.UserId).OrderByDescending(sd=>sd.AuditTime).Take(1).ToList())
             .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Visit.Order.Title.Contains(dto.Title!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Visit.Order.No.Contains(dto.No!));
         if (dto.TabStatus is EScreenStatus.Apply)

+ 6 - 1
src/Hotline.Share/Dtos/Order/OrderScreenDto.cs

@@ -141,7 +141,12 @@ namespace Hotline.Share.Dtos.Order
 		/// <summary>
 		/// 甄别明细
 		/// </summary>
-		public List<OrderScreenDetailDto> ScreenDetail { get; set; }
+		public OrderScreenDetailDto ScreenDetail => ScreenDetails != null && ScreenDetails.Any() ? ScreenDetails.First() : null;
+
+		/// <summary>
+		/// 甄别明细
+		/// </summary>
+		public List<OrderScreenDetailDto> ScreenDetails { get; set; }
 
 		/// <summary>
 		/// 回访明细id

+ 1 - 1
src/Hotline/Orders/OrderScreen.cs

@@ -57,7 +57,7 @@ namespace Hotline.Orders
         /// 回访
         /// </summary>
         [Navigate(NavigateType.OneToMany, nameof(OrderScreenDetail.ScreenId), nameof(Id))]
-        public List<OrderScreenDetail> ScreenDetail { get; set; }
+        public List<OrderScreenDetail> ScreenDetails { get; set; }
 
 		/// <summary>
 		/// 甄别申请类型id