diff --git a/lib/core/service/er/am_service.dart b/lib/core/service/er/am_service.dart index 710bc9a7..9c66d373 100644 --- a/lib/core/service/er/am_service.dart +++ b/lib/core/service/er/am_service.dart @@ -74,8 +74,10 @@ class AmService extends BaseService { await baseAppClient.post(GET_ALL_TRANSPORTATIONS_ORDERS, onSuccess: (dynamic response, int statusCode) { patientAmbulanceRequestOrdersList.clear(); - print(response['data'].length); - print(response['data'][0]); + hasPendingOrder = false; + pendingOrderID = 0; + pendingAmbulanceRequestOrder = null; + response['data'].forEach((item) { patientAmbulanceRequestOrdersList.add(AmbulanceRequestOrdersModel.fromJson(item)); if (item['statusId'] == 1) { diff --git a/lib/core/viewModels/er/am_request_view_model.dart b/lib/core/viewModels/er/am_request_view_model.dart index 33098ad2..8eb292fe 100644 --- a/lib/core/viewModels/er/am_request_view_model.dart +++ b/lib/core/viewModels/er/am_request_view_model.dart @@ -121,7 +121,7 @@ class AmRequestViewModel extends BaseViewModel { error = _amService.error; setState(ViewState.ErrorLocal); } else - getAmRequestOrders(); - + // getAmRequestOrders(); + getPatientAllPresOrdersListRC(); } } diff --git a/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart index 3283d97f..26c973d7 100644 --- a/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart +++ b/lib/pages/ErService/AmbulanceRequestIndexPages/AmbulanceRequestIndex.dart @@ -71,7 +71,7 @@ class _AmbulanceRequestIndexPageState extends State { OrderLogItem( title: TranslationBase.of(context).reqId, value: widget.amRequestViewModel.pendingAmbulanceRequestOrder - .statusId + .id .toString(), ), OrderLogItem(