Dun.Jason 4 сар өмнө
parent
commit
852ed381d9

+ 2 - 1
src/Hotline.Api/Controllers/CommonPController.cs

@@ -498,7 +498,8 @@ namespace Hotline.Api.Controllers
 				.Includes(x => x.OrderVisit, y => y.Employee)
 				.Includes(x => x.OrderVisit, y => y.Employee)
 				.Includes(x => x.OrderScreens)
 				.Includes(x => x.OrderScreens)
 				.Where(x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType ==  EOrderScreenType.Org && s.SendBackApply == true) || x.OrderScreens.Any() == false)
 				.Where(x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType ==  EOrderScreenType.Org && s.SendBackApply == true) || x.OrderScreens.Any() == false)
-				.Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
+                .Where(x => x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW") == false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
+                .Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
 				.Where(x => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
 				.Where(x => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||