|
@@ -1822,7 +1822,7 @@ public class OrderController : BaseController
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Visit.Order.No.Contains(dto.No!));
|
|
|
if (dto.Status is EScreenStatus.Apply)
|
|
|
{
|
|
|
- query.Where(d => (d.Status == EScreenStatus.Apply || d.Status == EScreenStatus.Approval));
|
|
|
+ query.Where(d => (d.Status == EScreenStatus.Apply || d.Status == EScreenStatus.Approval || (d.Status == EScreenStatus.SendBack || d.SendBackApply == false)));
|
|
|
}
|
|
|
|
|
|
if (dto.Status.HasValue && dto.Status == EScreenStatus.MyHandle)
|