From 19dab0179dda4e4298105800d317a5cc72208821 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Tue, 25 Mar 2025 11:56:41 +0300 Subject: [PATCH] updates --- lib/models/anicllary-orders/ancillary_order_list_model.dart | 6 +++++- lib/pages/ToDoList/ToDo.dart | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/models/anicllary-orders/ancillary_order_list_model.dart b/lib/models/anicllary-orders/ancillary_order_list_model.dart index ccb359a3..e81b6a14 100644 --- a/lib/models/anicllary-orders/ancillary_order_list_model.dart +++ b/lib/models/anicllary-orders/ancillary_order_list_model.dart @@ -71,6 +71,7 @@ class AncillaryOrderList { bool? isQueued; String? orderDate; int? orderNo; + int? invoiceNo; AncillaryOrderList( {this.ancillaryProcedureListModels, @@ -83,7 +84,8 @@ class AncillaryOrderList { this.isCheckInAllow, this.isQueued, this.orderDate, - this.orderNo}); + this.orderNo, + this.invoiceNo}); AncillaryOrderList.fromJson(Map json) { if (json['AncillaryProcedureListModels'] != null) { @@ -103,6 +105,7 @@ class AncillaryOrderList { isQueued = json['IsQueued']; orderDate = json['OrderDate']; orderNo = json['OrderNo']; + invoiceNo = json['Invoiceno']; } Map toJson() { @@ -121,6 +124,7 @@ class AncillaryOrderList { data['IsQueued'] = this.isQueued; data['OrderDate'] = this.orderDate; data['OrderNo'] = this.orderNo; + data['Invoiceno'] = this.invoiceNo; return data; } } diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 65b321ea..07cfb924 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -455,6 +455,7 @@ class _ToDoState extends State with SingleTickerProviderStateMixin { date: DateUtil.convertStringToDate(ancillaryLists[0].ancillaryOrderList![index].orderDate), isSortByClinic: true, isAllowCheckInAncillary: ancillaryLists[0].ancillaryOrderList![index].isCheckInAllow!, + // isAllowCheckInAncillary: true, onAncillaryCheckInTap: () { AppoitmentAllHistoryResultList appo = new AppoitmentAllHistoryResultList(); appo.doctorTitle = TranslationBase.of(context).dr.toString(); @@ -1686,11 +1687,11 @@ class _ToDoState extends State with SingleTickerProviderStateMixin { DoctorsListService service = new DoctorsListService(); service - .getLabQueueNumber(projectID, projectViewModel.authenticatedUserObject.user.patientID!, Utils.isVidaPlusProject(projectViewModel, projectID), ancillaryOrderList.orderNo.toString(), + .getLabQueueNumber(projectID, projectViewModel.authenticatedUserObject.user.patientID!, Utils.isVidaPlusProject(projectViewModel, projectID), ancillaryOrderList.invoiceNo.toString(), ancillaryOrderList.orderNo.toString()) .then((res) { GifLoaderDialogUtils.hideDialog(context); - showAlertDialog(res['QLineResponse']['PatientCallNo']); + showAlertDialog(res['QLineResponse']['patientCallNo']); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); AppToast.showErrorToast(message: err);