|
@@ -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)
|