|
|
@@ -5885,7 +5885,7 @@ public class OrderController : BaseController
|
|
|
var orders = await _orderRepository.Queryable(isAdmin: true)
|
|
|
.Includes(o=>o.Workflow)
|
|
|
.Includes(o=>o.OrderVisits)
|
|
|
- .Where(o=>o.OrderVisits.Any(ov=> ov.VisitState == EVisitState.Visited &&
|
|
|
+ .Where(o=> (o.CounterSignType == null || o.CounterSignType == ECounterSignType.Department) && o.OrderVisits.Any(ov=> ov.VisitState == EVisitState.Visited &&
|
|
|
ov.VisitTime >= model.StartTime && ov.VisitTime <= model.EndTime &&
|
|
|
ov.OrderVisitDetails.Any(ord=> ord.VisitOrgCode.StartsWith(model.OrgId) &&
|
|
|
(SqlFunc.JsonField(ord.OrgProcessingResults, "Key") == "2" ||
|
