diff --git a/lib/presentation/book_appointment/select_clinic_page.dart b/lib/presentation/book_appointment/select_clinic_page.dart index 5f76ab31..df597d0c 100644 --- a/lib/presentation/book_appointment/select_clinic_page.dart +++ b/lib/presentation/book_appointment/select_clinic_page.dart @@ -1058,7 +1058,8 @@ class _SelectClinicPageState extends State { regionalViewModel.setBottomSheetState(AppointmentViaRegionState.DOCTOR_SELECTION); var appointmentsViewModel = Provider.of(context, listen: false); if (appointmentsViewModel.selectedClinic.clinicID == 253) { - appointmentsViewModel.setProjectID(regionalViewModel.selectedHospital?.patientDoctorAppointmentList!.first.iD?.toString() ?? ""); + var id =getProjectId(regionalViewModel); + appointmentsViewModel.setProjectID(id); appointmentsViewModel.resetLaserData(); appointmentsViewModel.getLaserClinic(); regionalViewModel.handleLastStepForClinicForDentalAndLaser(appointmentsViewModel.selectedClinic.clinicID ?? -1); @@ -1067,8 +1068,9 @@ class _SelectClinicPageState extends State { } } else if (regionalViewModel.regionBottomSheetType == RegionBottomSheetType.REGION_FOR_DENTAL_AND_LASER) { var appointmentsViewModel = Provider.of(context, listen: false); + var id =getProjectId(regionalViewModel); regionalViewModel.setBottomSheetState(AppointmentViaRegionState.DOCTOR_SELECTION); - appointmentsViewModel.setProjectID(regionalViewModel.selectedHospital?.hospitalList.first.iD?.toString() ?? ""); + appointmentsViewModel.setProjectID(id); regionalViewModel.handleLastStepForClinicForDentalAndLaser(appointmentsViewModel.selectedClinic.clinicID ?? -1); } }, @@ -1379,4 +1381,17 @@ class _SelectClinicPageState extends State { callBackFunc: () {}, ); } + + String getProjectId(AppointmentViaRegionViewmodel regionalViewModel) { + try { + if(regionalViewModel.selectedHospital?.patientDoctorAppointmentList?.isNotEmpty ?? false) { + return regionalViewModel.selectedHospital!.patientDoctorAppointmentList?.first.projectID?.toString() ?? ""; + } else if(regionalViewModel.selectedHospital?.hospitalList.isNotEmpty ?? false) { + return regionalViewModel.selectedHospital!.hospitalList.first.iD?.toString() ?? ""; + } + } on Exception catch (e) { + + } + return ""; + } } diff --git a/lib/presentation/book_appointment/select_doctor_page.dart b/lib/presentation/book_appointment/select_doctor_page.dart index 661c9a30..cb2555f3 100644 --- a/lib/presentation/book_appointment/select_doctor_page.dart +++ b/lib/presentation/book_appointment/select_doctor_page.dart @@ -53,7 +53,7 @@ class _SelectDoctorPageState extends State { bookAppointmentsViewModel.getLiveCareDoctorsList(); } else { if (bookAppointmentsViewModel.selectedClinic.clinicID == 17) { - if (appState.getAuthenticatedUser()!.age! > 12) { + if (appState.isAuthenticated && appState.getAuthenticatedUser()!.age! > 12) { bookAppointmentsViewModel.getDentalChiefComplaintDoctorsList(); } else { bookAppointmentsViewModel.getDoctorsList(isNearest: false); diff --git a/lib/presentation/book_appointment/widgets/appointment_calendar.dart b/lib/presentation/book_appointment/widgets/appointment_calendar.dart index a95989a6..8d96c12c 100644 --- a/lib/presentation/book_appointment/widgets/appointment_calendar.dart +++ b/lib/presentation/book_appointment/widgets/appointment_calendar.dart @@ -278,7 +278,7 @@ class _AppointmentCalendarState extends State { bookAppointmentsViewModel.setProjectID(bookAppointmentsViewModel.selectedDoctor.projectID.toString()); bookAppointmentsViewModel.setSelectedClinic(selectedClinic); bookAppointmentsViewModel.setIsChiefComplaintsListLoading(true); - if(appState.getAuthenticatedUser()!.age! > 12) { + if(appState.isAuthenticated && appState.getAuthenticatedUser()!.age! > 12) { Navigator.of(context).push( CustomPageRoute( page: DentalChiefComplaintsPage(),