lab rad issue fixed.

ipd-changes-for-vida-plus
Sultan Khan 2 days ago
parent 1911420c4e
commit 3f6e5a9c3b

@ -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";

@ -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'];

@ -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();

@ -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) {

@ -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;

@ -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;

@ -228,7 +228,7 @@ class VitalSignDetailsScreen extends StatelessWidget {
),
),
AppText(
"(35<)",
"(>35)",
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier! * 1.15,
fontWeight: FontWeight.w700,

Loading…
Cancel
Save