From 3f6e5a9c3b7d2f995db97b1b10199e8f7554fc88 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Wed, 25 Feb 2026 13:57:46 +0300 Subject: [PATCH] lab rad issue fixed. --- lib/config/config.dart | 2 +- lib/core/model/radiology/final_radiology.dart | 2 +- lib/core/service/authentication_service.dart | 2 +- .../patient_medical_file/lab_order/labs_service.dart | 3 ++- .../patient_medical_file/radiology/radiology_service.dart | 3 +++ lib/core/viewModel/patient-vital-sign-viewmodel.dart | 6 +++--- .../profile/vital_sign/vital_sign_details_screen.dart | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index b6632a15..3c317102 100755 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -19,7 +19,7 @@ const BASE_URL = 'https://hmgwebservices.com/'; // // const BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; //Vida Plus URL -// const BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; //Vida Plus URL +// const BASE_URL = 'htxtps://vidamergeuat.cloudsolutions.com.sa/'; //Vida Plus URL const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index fde1b4a3..3e6af699 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/lib/core/model/radiology/final_radiology.dart @@ -105,7 +105,7 @@ class FinalRadiology { doctorID = json['DoctorID']; clinicID = json['ClinicID']; orderDate = AppDateUtils.convertStringToDate(json['OrderDate']); - reportDate = AppDateUtils.convertStringToDate(json['ReadOn']); + reportDate = AppDateUtils.convertStringToDate(json['ReadOn'] == null ? json['OrderDate'] : json['ReadOn']); reportData = json['ReportData']; imageURL = json['ImageURL']; procedureID = json['ProcedureID']; diff --git a/lib/core/service/authentication_service.dart b/lib/core/service/authentication_service.dart index cc10e6b9..0d9b44e7 100644 --- a/lib/core/service/authentication_service.dart +++ b/lib/core/service/authentication_service.dart @@ -46,7 +46,7 @@ class AuthenticationService extends BaseService { }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; - }, body: {"IMEI": imei, }); + }, body: {"IMEI": imei, }, isCustomRequest: true); } catch (error) { hasError = true; super.error = error.toString(); diff --git a/lib/core/service/patient_medical_file/lab_order/labs_service.dart b/lib/core/service/patient_medical_file/lab_order/labs_service.dart index 44e15b68..8d41cd54 100644 --- a/lib/core/service/patient_medical_file/lab_order/labs_service.dart +++ b/lib/core/service/patient_medical_file/lab_order/labs_service.dart @@ -29,6 +29,7 @@ class LabsService extends BaseService { body['ProjectID'] = doctorProfile?.projectID; url = GET_PATIENT_LAB_OREDERS; } else { + body["ProjectID"] = 0; // ADDED AS PER BACKEND REQUEST body['isDentalAllowedBackend'] = false; url = GET_Patient_LAB_ORDERS; } @@ -95,7 +96,7 @@ class LabsService extends BaseService { body['OrderNo'] = patientLabOrder.orderNo; body['isDentalAllowedBackend'] = false; body['SetupID'] = patientLabOrder.setupID; - body['ProjectID'] = patientLabOrder.projectID; + // body['ProjectID'] = patientLabOrder.projectID; commented as per backend request body['ClinicID'] = patientLabOrder.clinicID ?? 0; body['InvoiceType'] = patientLabOrder.invoiceType ?? ""; await baseAppClient.postPatient(url, patient: patient, onSuccess: (dynamic response, int statusCode) { diff --git a/lib/core/service/patient_medical_file/radiology/radiology_service.dart b/lib/core/service/patient_medical_file/radiology/radiology_service.dart index f01089e5..3fd0cfc1 100644 --- a/lib/core/service/patient_medical_file/radiology/radiology_service.dart +++ b/lib/core/service/patient_medical_file/radiology/radiology_service.dart @@ -31,6 +31,9 @@ class RadiologyService extends BaseService { if (isInPatient) { url = GET_IN_PATIENT_ORDERS; body['ProjectID'] = patient.projectId; + }else{ + body['ProjectID'] = 0; // ADDED AS PER BACKEND REQUEST + } hasError = false; diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index a7a71216..f54e7554 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -115,11 +115,11 @@ class VitalSignsViewModel extends BaseViewModel { var bodyMassIndex = double.parse(bodyMax); if (bodyMassIndex < 18.5) { return 1; - } else if (bodyMassIndex >= 18.5 && bodyMassIndex <= 24.9) { + } else if (bodyMassIndex >= 18.5 && bodyMassIndex < 24.9) { return 2; - } else if (bodyMassIndex >= 25 && bodyMassIndex <= 29.9) { + } else if (bodyMassIndex >= 24.9 && bodyMassIndex < 29.9) { return 3; - } else if (bodyMassIndex >= 30 && bodyMassIndex <= 34.9) { + } else if (bodyMassIndex >= 29.9 && bodyMassIndex < 34.9) { return 4; } else { return 5; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index ff6d73cb..241ab4df 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -228,7 +228,7 @@ class VitalSignDetailsScreen extends StatelessWidget { ), ), AppText( - "(35<)", + "(>35)", fontFamily: 'Poppins', fontSize: SizeConfig.textMultiplier! * 1.15, fontWeight: FontWeight.w700,