|
@@ -1282,7 +1282,7 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
VisitId = x.OrderVisit.Id,
|
|
|
No = x.OrderVisit.No,
|
|
|
ReTransactNum = x.OrderVisit.Order.ReTransactNum,
|
|
|
- OrderScreenStatus = SqlFunc.Subqueryable<OrderScreen>().Where(q => q.OrderId == x.OrderVisit.OrderId).OrderByDesc(q => q.CreationTime).Select(q => q.Status),
|
|
|
+ OrderScreenStatus = SqlFunc.Subqueryable<OrderScreen>().Where(q => q.OrderId == x.OrderVisit.OrderId && q.VisitDetailId == x.Id).OrderByDesc(q => q.CreationTime).Select(q => q.Status),
|
|
|
VisitContent = x.VisitContent,
|
|
|
HotspotSpliceName = x.OrderVisit.Order.HotspotSpliceName,
|
|
|
OrgLevelOneName = x.OrderVisit.Order.OrgLevelOneName,
|
|
@@ -1331,7 +1331,7 @@ namespace Hotline.Repository.SqlSugar.Orders
|
|
|
VisitId = x.OrderVisit.Id,
|
|
|
No = x.OrderVisit.No,
|
|
|
ReTransactNum = x.OrderVisit.Order.ReTransactNum,
|
|
|
- OrderScreenStatus = SqlFunc.Subqueryable<OrderScreen>().Where(q => q.OrderId == x.OrderVisit.OrderId).OrderByDesc(q => q.CreationTime).Select(q => q.Status),
|
|
|
+ OrderScreenStatus = SqlFunc.Subqueryable<OrderScreen>().Where(q => q.OrderId == x.OrderVisit.OrderId && q.VisitDetailId == x.Id).OrderByDesc(q => q.CreationTime).Select(q => q.Status),
|
|
|
VisitContent = x.VisitContent,
|
|
|
HotspotSpliceName = x.OrderVisit.Order.HotspotSpliceName,
|
|
|
OrgLevelOneName = x.OrderVisit.Order.OrgLevelOneName,
|