order/orgvisitdetail

src/Hotline.Repository.SqlSugar/Orders/OrderRepository.cs

@@ -1385,18 +1385,13 @@ namespace Hotline.Repository.SqlSugar.Orders
 				.WhereIF(dto.ActualHandleTimeEnd.HasValue, x => x.OrderVisit.Order.ActualHandleTime <= dto.ActualHandleTimeEnd)//办结时间结束
 				.WhereIF(dto.VisitTimeStart.HasValue, x => x.OrderVisit.VisitTime >= dto.VisitTimeStart) //回访时间
 				.WhereIF(dto.VisitTimeEnd.HasValue, x => x.OrderVisit.VisitTime < dto.VisitTimeEnd) //回访时间
-				.OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.OrderVisit.VisitTime, OrderByType.Desc)
-				.OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, x => x.OrderVisit.Order.CreationTime, OrderByType.Asc) //受理时间升序
-				.OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, x => x.OrderVisit.Order.CreationTime, OrderByType.Desc) //受理时间降序
-				.OrderByIF(dto is { SortField: "visitTime", SortRule: 0 }, x => x.OrderVisit.VisitTime, OrderByType.Asc) //回访时间升序
-				.OrderByIF(dto is { SortField: "visitTime", SortRule: 1 }, x => x.OrderVisit.VisitTime, OrderByType.Desc) //回访时间降序
-				.OrderByIF(dto is { SortField: "filedTime", SortRule: 0 }, x => x.OrderVisit.Order.FiledTime, OrderByType.Asc) //办结时间升序
-				.OrderByIF(dto is { SortField: "filedTime", SortRule: 1 }, x => x.OrderVisit.Order.FiledTime, OrderByType.Desc) //办结时间降序
+				
 				.Where(x=> SqlFunc.JsonField(x.OrgProcessingResults, "Key") != "2" && SqlFunc.JsonField(x.OrgProcessingResults, "Key") != "-1" && SqlFunc.JsonField(x.OrgProcessingResults, "Key") != "7")
 				.Where(x=>x.VisitOrgCode.StartsWith(_sessionContext.RequiredOrgId))
 				.Select(x => new OrgVisitDetailListResp()
 				{
-					Id = x.OrderVisit.Order.Id,
+					Id = x.Id,
+                    OrderId = x.OrderVisit.Order.Id,
 					VisitId = x.OrderVisit.Id,
 					No = x.OrderVisit.No,
 					ReTransactNum = x.OrderVisit.Order.ReTransactNum,
@@ -1417,7 +1412,15 @@ namespace Hotline.Repository.SqlSugar.Orders
 					FiledTime = x.OrderVisit.Order.FiledTime,
 					VisitOrgName = x.VisitOrgName,
 					ActualHandleOrgName = x.OrderVisit.Order.ActualHandleOrgName
-				});
+				}).MergeTable()
+                .OrderByIF(string.IsNullOrEmpty(dto.SortField), x => x.VisitTime, OrderByType.Desc)
+                .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, x => x.CreationTime, OrderByType.Asc) //受理时间升序
+                .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, x => x.CreationTime, OrderByType.Desc) //受理时间降序
+                .OrderByIF(dto is { SortField: "visitTime", SortRule: 0 }, x => x.VisitTime, OrderByType.Asc) //回访时间升序
+                .OrderByIF(dto is { SortField: "visitTime", SortRule: 1 }, x => x.VisitTime, OrderByType.Desc) //回访时间降序
+                .OrderByIF(dto is { SortField: "filedTime", SortRule: 0 }, x => x.FiledTime, OrderByType.Asc) //办结时间升序
+                .OrderByIF(dto is { SortField: "filedTime", SortRule: 1 }, x => x.FiledTime, OrderByType.Desc) //办结时间降序
+                ;
 
 		}
 	}