diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index fb84f505..5c253025 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -61,6 +61,7 @@ class ProcedureViewModel extends BaseViewModel { if (_procedureService.hasError) { error = _procedureService.error; setState(ViewState.ErrorLocal); + await getProcedure(mrn: mrn); } else { await getProcedure(mrn: mrn); setState(ViewState.Idle); diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart index 7ad1d47e..f7525391 100644 --- a/lib/screens/medical-file/medical_file_details.dart +++ b/lib/screens/medical-file/medical_file_details.dart @@ -638,7 +638,8 @@ class _MedicalFileDetailsState extends State { .medicalFileList[ 0] .entityList[0] - .timelines[0] + .timelines[ + encounterNumber] .timeLineEvents[0] .consulations[0] .lstProcedure[ diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 5c1bd3b4..b5c248b9 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -6,6 +6,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart'; import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/models/livecare/transfer_to_admin.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -350,13 +351,12 @@ class _PrescriptionFormWidgetState extends State { // final routeArgs = ModalRoute.of(context).settings.arguments as Map; // patient = routeArgs['patient']; - return BaseView( + return BaseView( onModelReady: (model) async { await model.getMedicationList(); }, - builder: - (BuildContext context, PrescriptionViewModel model, Widget child) => - NetworkBaseView( + builder: (BuildContext context, MedicineViewModel model, Widget child) => + NetworkBaseView( baseViewModel: model, child: DraggableScrollableSheet( initialChildSize: 0.90,