|
@@ -2990,7 +2990,7 @@ public class OrderController : BaseController
|
|
|
{
|
|
|
var model = await _orderScreenRepository.Queryable(canView: false)
|
|
|
.Includes(x => x.Order)
|
|
|
- .Includes(x=>x.VisitDetail)
|
|
|
+ .Includes(x => x.VisitDetail)
|
|
|
.Includes(x => x.Workflow, d => d.Steps)
|
|
|
.Includes(x => x.Visit, d => d.Order)
|
|
|
.FirstAsync(x => x.Id == id);
|
|
@@ -7445,6 +7445,7 @@ public class OrderController : BaseController
|
|
|
.WhereIF(pagedDto.EndTime.HasValue, (x, p) => p.CreationTime <= pagedDto.EndTime)
|
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.No), (x, p) => x.No.Contains(pagedDto.No))
|
|
|
.WhereIF(pagedDto.State.HasValue, (x, p) => p.State == pagedDto.State)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(pagedDto.CreatorName), (x, p) => p.CreatorName.Contains(pagedDto.CreatorName))
|
|
|
.Select((x, p) => new
|
|
|
{
|
|
|
index = SqlFunc.RowNumber($"{p.CreationTime} desc ", $"{p.OrderId}"),
|