首页排除待办即将超期

src/Hotline.Api/Controllers/CommonPController.cs

@@ -257,8 +257,7 @@ namespace Hotline.Api.Controllers
 					})
 					.ToListAsync();
 				var waitedList = waitedDataList.Where(x => x.Status != EOrderStatus.Countersigning && 
-				((x.Time > DateTime.Now && x.Status < EOrderStatus.Filed) || (x.Time > x.ActualHandleTime && x.Status >= EOrderStatus.Filed))
-				&& (x.Status < EOrderStatus.Filed && DateTime.Now > x.NearlyExpiredTime && DateTime.Now < x.Time)
+				x.Time > DateTime.Now && x.Status < EOrderStatus.Filed &&  DateTime.Now > x.NearlyExpiredTime 
 				).OrderBy(x=> x.Time).Take(40).ToList();
 				waitedList = waitedList.Count > 0 ? waitedList.Copy() : waitedList;
 				//allNum += waitedList.Count > 40 ? 40 : waitedList.Count;
@@ -440,8 +439,7 @@ namespace Hotline.Api.Controllers
 					})
 					.ToListAsync();
 				var waitedList = waitedDataList.Where(x => x.Status != EOrderStatus.Countersigning &&
-				((x.Time > DateTime.Now && x.Status < EOrderStatus.Filed) || (x.Time > x.ActualHandleTime && x.Status >= EOrderStatus.Filed))
-				&& (x.Status < EOrderStatus.Filed && DateTime.Now > x.NearlyExpiredTime && DateTime.Now < x.Time)
+				 x.Time > DateTime.Now && x.Status < EOrderStatus.Filed && DateTime.Now > x.NearlyExpiredTime
 				).OrderBy(x=>x.Time).Take(40).ToList();
 				waitedList = waitedList.Count > 0 ? waitedList.Copy() : waitedList;
 				//allNum += waitedList.Count > 40 ? 40 : waitedList.Count;