|
@@ -1872,7 +1872,7 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
FiledTime = x.OrderVisit.Order.FiledTime,
|
|
|
VisitOrgName = x.VisitOrgName,
|
|
|
ActualHandleOrgName = x.OrderVisit.Order.ActualHandleOrgName,
|
|
|
- IsProvinceOrder = x.OrderVisit.Order.Source == ESource.ProvinceStraight ? true : false,
|
|
|
+ IsProvinceOrder = x.OrderVisit.Order.IsProvince,
|
|
|
OrderTag = SqlFunc.Subqueryable<OrderRelationTag>().InnerJoin<SystemDicData>((s, p) => s.TagId == p.Id).Where((s, p) => x.OrderVisit.OrderId == s.OrderId)
|
|
|
.SelectStringJoin((s, p) => p.DicDataName, ",")
|
|
|
}).MergeTable().OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.VisitTime, OrderByType.Desc)
|