|
|
@@ -1884,11 +1884,19 @@ public class OrderController : BaseController
|
|
|
[HttpGet("screen")]
|
|
|
public async Task<PagedDto<OrderScreenListDto>> ScreenList([FromQuery] ScreenListDto dto)
|
|
|
{
|
|
|
- var view = dto.source == 1;
|
|
|
- var handler = dto.source == 1 && dto.Status is EScreenStatus.Apply;
|
|
|
-
|
|
|
- var query = _orderScreenRepository.Queryable(hasHandled: !handler)
|
|
|
- .Includes(d => d.Order)
|
|
|
+ var handler = dto.Status is EScreenStatus.Apply;
|
|
|
+ ISugarQueryable<OrderScreen> query;
|
|
|
+ if (dto.source == 1)
|
|
|
+ {
|
|
|
+ query = _orderScreenRepository.Queryable(hasHandled: !handler);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ query = _orderScreenRepository.Queryable()
|
|
|
+ .Where(x => x.CreatorOrgId.StartsWith(_sessionContext.RequiredOrgId));
|
|
|
+ }
|
|
|
+ query = query.Includes(d => d.Order)
|
|
|
+ .Includes(d => d.Order)
|
|
|
.Includes(d => d.VisitDetail)
|
|
|
.Includes(d => d.Visit, v => v.Order)
|
|
|
.Includes(d => d.Workflow)
|
