From 8e3f20794d757c0b7204b71cce71959d88b9c164 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 4 Aug 2025 12:49:37 +0300 Subject: [PATCH] Radiology ExamId updates --- lib/config/config.dart | 12 ++++++------ lib/core/model/radiology/final_radiology.dart | 5 ++++- lib/core/service/medical/medical_service.dart | 4 ++-- lib/core/service/medical/radiology_service.dart | 3 ++- .../viewModels/medical/radiology_view_model.dart | 4 ++-- lib/pages/login/confirm-login.dart | 2 +- .../medical/radiology/radiology_details_page.dart | 3 ++- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index 46e3dcc0..8d75daae 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; // var BASE_URL = 'http://10.50.100.198:2018/'; - var BASE_URL = 'https://uat.hmgwebservices.com/'; -// var BASE_URL = 'https://hmgwebservices.com/'; + // var BASE_URL = 'https://uat.hmgwebservices.com/'; +var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'http://10.201.204.103/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; @@ -701,10 +701,10 @@ var IS_DOCTOR_AVAILABLE_BY_CALENDAR_SCHEDULE = 'Services/OUTPs.svc/REST/HIS_IsDo //PAYFORT var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; -// var payFortEnvironment = FortEnvironment.production; -// var applePayMerchantId = "merchant.com.hmgwebservices"; -var payFortEnvironment = FortEnvironment.test; -var applePayMerchantId = "merchant.com.hmgwebservices.uat"; +var payFortEnvironment = FortEnvironment.production; +var applePayMerchantId = "merchant.com.hmgwebservices"; +// var payFortEnvironment = FortEnvironment.test; +// var applePayMerchantId = "merchant.com.hmgwebservices.uat"; class AppGlobal { static var context; diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 44a5883f..ca3403a3 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -44,6 +44,7 @@ class FinalRadiology { bool? isCVI; bool? isRadMedicalReport; bool? isLiveCareAppointment; + String? exam_Id; FinalRadiology( {this.setupID, @@ -88,7 +89,8 @@ class FinalRadiology { this.speciality, this.isCVI, this.isRadMedicalReport, - this.isLiveCareAppointment}); + this.isLiveCareAppointment, + this.exam_Id}); FinalRadiology.fromJson(Map json) { try { @@ -135,6 +137,7 @@ class FinalRadiology { // speciality = json['Speciality'].cast(); isCVI = json['isCVI']; isRadMedicalReport = json['isRadMedicalReport']; + exam_Id = json['Exam_id']; } catch (e) { print(e); } diff --git a/lib/core/service/medical/medical_service.dart b/lib/core/service/medical/medical_service.dart index 445f5ab6..733d9ae5 100644 --- a/lib/core/service/medical/medical_service.dart +++ b/lib/core/service/medical/medical_service.dart @@ -55,7 +55,7 @@ class MedicalService extends BaseService { getSchedule(DoctorList doctorRequest) async { Map request; - request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7}; + request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90}; dynamic localRes; await baseAppClient.post(DOCTOR_SCHEDULE_URL, onSuccess: (response, statusCode) async { localRes = response; @@ -68,7 +68,7 @@ class MedicalService extends BaseService { getFreeSlot(DoctorList doctorRequest) async { Map request; - request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 7}; + request = {'DoctorID': doctorRequest.doctorID, 'ProjectID': doctorRequest.projectID, 'ClinicID': doctorRequest.clinicID, 'DoctorWorkingHoursDays': 90}; dynamic localRes; await baseAppClient.post(GET_DOCTOR_FREE_SLOTS, onSuccess: (response, statusCode) async { localRes = response; diff --git a/lib/core/service/medical/radiology_service.dart b/lib/core/service/medical/radiology_service.dart index 05016b17..19bedfce 100644 --- a/lib/core/service/medical/radiology_service.dart +++ b/lib/core/service/medical/radiology_service.dart @@ -12,7 +12,7 @@ class RadiologyService extends BaseService { String radReportPDF = ""; - Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus}) async { + Future getRadImageURL({int? invoiceNo, String? invoiceType, int? lineItem, int? projectId, bool? isVidaPlus, String? examId}) async { hasError = false; final Map body = new Map(); body['InvoiceNo'] = isVidaPlus! ? "0" : invoiceNo; @@ -20,6 +20,7 @@ class RadiologyService extends BaseService { body['LineItemNo'] = lineItem; body['ProjectID'] = projectId; body['InvoiceType'] = invoiceType; + body['ExamId'] = examId; await baseAppClient.post(GET_RAD_IMAGE_URL, isAllowAny: true, onSuccess: (dynamic response, int statusCode) { url = response['Data']; diff --git a/lib/core/viewModels/medical/radiology_view_model.dart b/lib/core/viewModels/medical/radiology_view_model.dart index f64f6937..6b8c4c96 100644 --- a/lib/core/viewModels/medical/radiology_view_model.dart +++ b/lib/core/viewModels/medical/radiology_view_model.dart @@ -56,9 +56,9 @@ class RadiologyViewModel extends BaseViewModel { String get radImageURL => _radiologyService.url; - getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus}) async { + getRadImageURL({required int invoiceNo, String? invoiceType, required int lineItem, required int projectId, required bool isVidaPlus, required String examId}) async { setState(ViewState.Busy); - await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus); + await _radiologyService.getRadImageURL(invoiceNo: invoiceNo, invoiceType: invoiceType, lineItem: lineItem, projectId: projectId, isVidaPlus: isVidaPlus, examId: examId); if (_radiologyService.hasError) { error = _radiologyService.error!; setState(ViewState.Error); diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 7766a443..cc3d1fa9 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -99,7 +99,7 @@ class _ConfirmLogin extends State { late ToDoCountProviderModel toDoProvider; var dob; - late int isHijri; + int isHijri = 0; var healthId; @override diff --git a/lib/pages/medical/radiology/radiology_details_page.dart b/lib/pages/medical/radiology/radiology_details_page.dart index 6582017f..4d127148 100644 --- a/lib/pages/medical/radiology/radiology_details_page.dart +++ b/lib/pages/medical/radiology/radiology_details_page.dart @@ -33,7 +33,8 @@ class RadiologyDetailsPage extends StatelessWidget { invoiceType: finalRadiology!.invoiceType, lineItem: finalRadiology!.invoiceLineItemNo!, invoiceNo: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!) ? finalRadiology!.invoiceNo_VP : finalRadiology!.invoiceNo, - isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!)), + isVidaPlus: Utils.isVidaPlusProject(projectViewModel, finalRadiology!.projectID!), + examId: finalRadiology!.exam_Id!), builder: (_, model, widget) => AppScaffold( appBarTitle: TranslationBase.of(context).report, isShowAppBar: true,