diff --git a/lib/config/config.dart b/lib/config/config.dart index 00fadf62..5c88e3da 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -606,6 +606,8 @@ var PAYFORT_PROD_URL = 'https://paymentservices.payfort.com/FortAPI/paymentApi'; // Check If InPatient API var CHECK_IF_INPATIENT = 'Services/Patients.svc/REST/GetInPatientAdmissionInfo'; +var CHECK_IF_PATIENT_ADMITTED = 'Services/Inps.svc/REST/chekIsPatientAdmitted'; + // Get General Instructions API var GET_GENERAL_INSTRUCTIONS = 'Services/INPs.svc/REST/getGeneralInstructions'; diff --git a/lib/models/InPatientServices/get_admission_info_response_model.dart b/lib/models/InPatientServices/get_admission_info_response_model.dart index 118f8737..25d87884 100644 --- a/lib/models/InPatientServices/get_admission_info_response_model.dart +++ b/lib/models/InPatientServices/get_admission_info_response_model.dart @@ -1,60 +1,92 @@ class GetAdmissionInfoResponseModel { + String setupID; + int projectID; int admissionNo; String admissionDate; - String infotainmentIBMSLink; - String infotainmentIBMSLinkAr; - int projectID; - String roomID; - String bedID; + int admissionRequestNo; + int admissionType; + int patientType; + int patientID; int clinicID; int doctorID; - int patientID; - String bMIUrl; - String mOPUrl; + int admittingClinicID; + int admittingDoctorID; + int categoryID; + String roomID; + String bedID; + dynamic dischargeDate; + int approvalNo; + int status; + String statusDesc; + String statusDescN; GetAdmissionInfoResponseModel( - {this.admissionNo, - this.admissionDate, - this.infotainmentIBMSLink, - this.infotainmentIBMSLinkAr, + {this.setupID, this.projectID, - this.roomID, - this.bedID, + this.admissionNo, + this.admissionDate, + this.admissionRequestNo, + this.admissionType, + this.patientType, + this.patientID, this.clinicID, this.doctorID, - this.patientID, - this.bMIUrl, - this.mOPUrl}); + this.admittingClinicID, + this.admittingDoctorID, + this.categoryID, + this.roomID, + this.bedID, + this.dischargeDate, + this.approvalNo, + this.status, + this.statusDesc, + this.statusDescN}); GetAdmissionInfoResponseModel.fromJson(Map json) { + setupID = json['SetupID']; + projectID = json['ProjectID']; admissionNo = json['AdmissionNo']; admissionDate = json['AdmissionDate']; - infotainmentIBMSLink = json['InfotainmentIBMSLink']; - infotainmentIBMSLinkAr = json['InfotainmentIBMSLinkAr']; - projectID = json['ProjectID']; - roomID = json['RoomID']; - bedID = json['BedID']; + admissionRequestNo = json['AdmissionRequestNo']; + admissionType = json['AdmissionType']; + patientType = json['PatientType']; + patientID = json['PatientID']; clinicID = json['ClinicID']; doctorID = json['DoctorID']; - patientID = json['PatientID']; - bMIUrl = json['BMIUrl']; - mOPUrl = json['MOPUrl']; + admittingClinicID = json['AdmittingClinicID']; + admittingDoctorID = json['AdmittingDoctorID']; + categoryID = json['CategoryID']; + roomID = json['RoomID']; + bedID = json['BedID']; + dischargeDate = json['DischargeDate']; + approvalNo = json['ApprovalNo']; + status = json['Status']; + statusDesc = json['StatusDesc']; + statusDescN = json['StatusDescN']; } Map toJson() { final Map data = new Map(); + data['SetupID'] = this.setupID; + data['ProjectID'] = this.projectID; data['AdmissionNo'] = this.admissionNo; data['AdmissionDate'] = this.admissionDate; - data['InfotainmentIBMSLink'] = this.infotainmentIBMSLink; - data['InfotainmentIBMSLinkAr'] = this.infotainmentIBMSLinkAr; - data['ProjectID'] = this.projectID; - data['RoomID'] = this.roomID; - data['BedID'] = this.bedID; + data['AdmissionRequestNo'] = this.admissionRequestNo; + data['AdmissionType'] = this.admissionType; + data['PatientType'] = this.patientType; + data['PatientID'] = this.patientID; data['ClinicID'] = this.clinicID; data['DoctorID'] = this.doctorID; - data['PatientID'] = this.patientID; - data['BMIUrl'] = this.bMIUrl; - data['MOPUrl'] = this.mOPUrl; + data['AdmittingClinicID'] = this.admittingClinicID; + data['AdmittingDoctorID'] = this.admittingDoctorID; + data['CategoryID'] = this.categoryID; + data['RoomID'] = this.roomID; + data['BedID'] = this.bedID; + data['DischargeDate'] = this.dischargeDate; + data['ApprovalNo'] = this.approvalNo; + data['Status'] = this.status; + data['StatusDesc'] = this.statusDesc; + data['StatusDescN'] = this.statusDescN; return data; } } diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index ef3378bb..baf5a5a5 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -672,23 +672,24 @@ class _ConfirmLogin extends State { } checkIfIsInPatient() { + bool isAdmitted = false; GetAdmissionInfoResponseModel getAdmissionInfoResponseModel; ClinicListService service = new ClinicListService(); service.checkIfInPatientAPI(context).then((res) { if (res['MessageStatus'] == 1) { - if (res['List_PatientAdmissionInfo'].length != 0) { + isAdmitted = res['isAdmitted']; + print("IS ADMITTED: $isAdmitted"); + if (res['PatientAdmittedInformation'].length != 0) { print("INPATIENT!!!"); - getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['List_PatientAdmissionInfo'][0]); + getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['PatientAdmittedInformation'][0]); projectViewModel.setIsPatientAdmitted(true); - projectViewModel.setInPatientProjectID(res['List_PatientAdmissionInfo'][0]['ProjectID']); + projectViewModel.setInPatientProjectID(res['PatientAdmittedInformation'][0]['ProjectID']); projectViewModel.setInPatientAdmissionInfo(getAdmissionInfoResponseModel); } else { print("OUTPATIENT!!!"); projectViewModel.setIsPatientAdmitted(false); } } else {} - }).catchError((err) { - print(err); }); } diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index fefce667..856a5bc3 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -394,23 +394,24 @@ class _Login extends State { } checkIfIsInPatient() { + bool isAdmitted = false; GetAdmissionInfoResponseModel getAdmissionInfoResponseModel; ClinicListService service = new ClinicListService(); service.checkIfInPatientAPI(context).then((res) { if (res['MessageStatus'] == 1) { - if (res['List_PatientAdmissionInfo'].length != 0) { + isAdmitted = res['isAdmitted']; + print("IS ADMITTED: $isAdmitted"); + if (res['PatientAdmittedInformation'].length != 0) { print("INPATIENT!!!"); - getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['List_PatientAdmissionInfo'][0]); + getAdmissionInfoResponseModel = GetAdmissionInfoResponseModel.fromJson(res['PatientAdmittedInformation'][0]); projectViewModel.setIsPatientAdmitted(true); - projectViewModel.setInPatientProjectID(res['List_PatientAdmissionInfo'][0]['ProjectID']); + projectViewModel.setInPatientProjectID(res['PatientAdmittedInformation'][0]['ProjectID']); projectViewModel.setInPatientAdmissionInfo(getAdmissionInfoResponseModel); } else { print("OUTPATIENT!!!"); projectViewModel.setIsPatientAdmitted(false); } } else {} - }).catchError((err) { - print(err); }); } diff --git a/lib/services/clinic_services/get_clinic_service.dart b/lib/services/clinic_services/get_clinic_service.dart index 69e99e53..6bea9aa4 100644 --- a/lib/services/clinic_services/get_clinic_service.dart +++ b/lib/services/clinic_services/get_clinic_service.dart @@ -66,12 +66,12 @@ class ClinicListService extends BaseService { Future checkIfInPatientAPI(context) async { Map request; request = { - "IsActiveAppointment": true, + "IsActiveAppointment": false, }; dynamic localRes; - await baseAppClient.post(CHECK_IF_INPATIENT, onSuccess: (response, statusCode) async { + await baseAppClient.post(CHECK_IF_PATIENT_ADMITTED, onSuccess: (response, statusCode) async { localRes = response; }, onFailure: (String error, int statusCode) { throw error;