From 948b8c877d0ea6643949c4fdcc2140aad5bda414 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 22 Nov 2021 11:28:59 +0200 Subject: [PATCH] flutter 2 models --- .../CheckActivationCodeModel.dart | 96 +++---- .../CheckPatientForRegistrationModel.dart | 64 ++--- .../GetPatientInfoRequestModel.dart | 44 +-- .../GetPatientInfoResponseModel.dart | 272 +++++++++--------- .../PatientRegistrationModel.dart | 152 +++++----- ...PNotificationTypeForRegistrationModel.dart | 92 +++--- .../get_medication_for_inpatient_model.dart | 60 ++-- ...edication_for_inpatient_request_model.dart | 24 +- ...on_code_for_doctor_app_response_model.dart | 30 +- .../model/diabetic_chart/DiabeticType.dart | 6 +- .../GetDiabeticChartValuesRequestModel.dart | 30 +- .../GetDiabeticChartValuesResponseModel.dart | 22 +- .../GetDiagnosisForInPatientRequestModel.dart | 18 +- ...GetDiagnosisForInPatientResponseModel.dart | 39 +-- lib/core/model/labs/LabResultHistory.dart | 96 +++---- .../labs/all_special_lab_result_model.dart | 54 ++-- .../labs/all_special_lab_result_request.dart | 28 +- lib/core/model/labs/lab_result.dart | 12 +- ..._patient_to_doctor_list_request_model.dart | 13 +- .../GetNursingProgressNoteRequestModel.dart | 16 +- .../GetNursingProgressNoteResposeModel.dart | 10 +- .../PatientSearchRequestModel.dart | 20 +- .../get_ordered_procedure_request_model.dart | 5 +- .../referral/MyReferralPatientModel.dart | 74 ++--- .../sick_leave_doctor_request_model.dart | 16 +- .../sick_leave/sick_leave_patient_model.dart | 10 +- .../sick_leave_patient_request_model.dart | 2 +- pubspec.lock | 10 +- 28 files changed, 673 insertions(+), 642 deletions(-) diff --git a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart index 4b95c1b0..16202cac 100644 --- a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart +++ b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart @@ -1,56 +1,56 @@ class CheckActivationCodeModel { - int patientMobileNumber; - String mobileNo; - int projectOutSA; - int loginType; - String zipCode; - bool isRegister; - String logInTokenID; - int searchType; - int patientID; - int nationalID; - int patientIdentificationID; - bool forRegisteration; - String activationCode; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + int? patientMobileNumber; + String? mobileNo; + int? projectOutSA; + int? loginType; + String? zipCode; + bool? isRegister; + String? logInTokenID; + int? searchType; + int? patientID; + int? nationalID; + int? patientIdentificationID; + bool? forRegisteration; + String? activationCode; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - String dOB; - int isHijri; - String healthId; + bool? isDentalAllowedBackend; + int? deviceTypeID; + String? dOB; + int? isHijri; + String? healthId; CheckActivationCodeModel( {this.patientMobileNumber, - this.mobileNo, - this.projectOutSA, - this.loginType, - this.zipCode, - this.isRegister, - this.logInTokenID, - this.searchType, - this.patientID, - this.nationalID, - this.patientIdentificationID, - this.forRegisteration, - this.activationCode, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.dOB, - this.isHijri, - this.healthId}); + this.mobileNo, + this.projectOutSA, + this.loginType, + this.zipCode, + this.isRegister, + this.logInTokenID, + this.searchType, + this.patientID, + this.nationalID, + this.patientIdentificationID, + this.forRegisteration, + this.activationCode, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.dOB, + this.isHijri, + this.healthId}); CheckActivationCodeModel.fromJson(Map json) { patientMobileNumber = json['PatientMobileNumber']; diff --git a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart index 3465cf8d..89e1bfd6 100644 --- a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart +++ b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart @@ -1,40 +1,40 @@ class CheckPatientForRegistrationModel { - int patientIdentificationID; - int patientMobileNumber; - String zipCode; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + int? patientIdentificationID; + int? patientMobileNumber; + String? zipCode; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - String tokenID; - int patientID; - bool isRegister; - String dOB; - int isHijri; + bool? isDentalAllowedBackend; + int? deviceTypeID; + String? tokenID; + int? patientID; + bool? isRegister; + String? dOB; + int? isHijri; CheckPatientForRegistrationModel( {this.patientIdentificationID, - this.patientMobileNumber, - this.zipCode, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.tokenID, - this.patientID, - this.isRegister, - this.dOB, - this.isHijri}); + this.patientMobileNumber, + this.zipCode, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.tokenID, + this.patientID, + this.isRegister, + this.dOB, + this.isHijri}); CheckPatientForRegistrationModel.fromJson(Map json) { patientIdentificationID = json['PatientIdentificationID']; diff --git a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart index f05131ef..1f00fba0 100644 --- a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart +++ b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart @@ -1,30 +1,30 @@ class GetPatientInfoRequestModel { - String patientIdentificationID; - String dOB; - int isHijri; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + String? patientIdentificationID; + String? dOB; + int? isHijri; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; + bool? isDentalAllowedBackend; + int? deviceTypeID; GetPatientInfoRequestModel( {this.patientIdentificationID, - this.dOB, - this.isHijri, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID}); + this.dOB, + this.isHijri, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID}); GetPatientInfoRequestModel.fromJson(Map json) { patientIdentificationID = json['PatientIdentificationID']; diff --git a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart index 158bd1e2..a1a25e17 100644 --- a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart +++ b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart @@ -1,78 +1,78 @@ class GetPatientInfoResponseModel { dynamic date; - int languageID; - int serviceName; + int? languageID; + int? serviceName; dynamic time; dynamic androidLink; dynamic authenticationTokenID; dynamic data; - bool dataw; - int dietType; + bool? dataw; + int? dietType; dynamic errorCode; dynamic errorEndUserMessage; dynamic errorEndUserMessageN; dynamic errorMessage; - int errorType; - int foodCategory; + int? errorType; + int? foodCategory; dynamic iOSLink; - bool isAuthenticated; - int mealOrderStatus; - int mealType; - int messageStatus; - int numberOfResultRecords; + bool? isAuthenticated; + int? mealOrderStatus; + int? mealType; + int? messageStatus; + int? numberOfResultRecords; dynamic patientBlodType; dynamic successMsg; dynamic successMsgN; dynamic vidaUpdatedResponse; dynamic accessTokenObject; - int age; + int? age; dynamic clientIdentifierId; - int createdBy; - String dateOfBirth; - String firstNameAr; - String firstNameEn; - String gender; + int? createdBy; + String? dateOfBirth; + String? firstNameAr; + String? firstNameEn; + String? gender; dynamic genderAr; dynamic genderEn; - String healthId; - String idNumber; - String idType; - bool isHijri; - int isInstertedOrUpdated; - int isNull; - int isPatientExistNHIC; - bool isRecordLockedByCurrentUser; - String lastNameAr; - String lastNameEn; + String? healthId; + String? idNumber; + String? idType; + bool? isHijri; + int? isInstertedOrUpdated; + int? isNull; + int? isPatientExistNHIC; + bool? isRecordLockedByCurrentUser; + String? lastNameAr; + String? lastNameEn; dynamic listActiveAccessToken; - String maritalStatus; - String maritalStatusCode; - String nationalDateOfBirth; - String nationality; - String nationalityCode; - String occupation; + String? maritalStatus; + String? maritalStatusCode; + String? nationalDateOfBirth; + String? nationality; + String? nationalityCode; + String? occupation; dynamic pCDTransactionDataResultList; dynamic pCDGetVidaPatientForManualVerificationList; dynamic pCDNHICHMGPatientDetailsMatchCalulationList; - int pCDReturnValue; - String patientStatus; - String placeofBirth; + int? pCDReturnValue; + String? patientStatus; + String? placeofBirth; dynamic practitionerStatusCode; dynamic practitionerStatusDescAr; dynamic practitionerStatusDescEn; - int rowCount; - String secondNameAr; - String secondNameEn; - String thirdNameAr; - String thirdNameEn; + int? rowCount; + String? secondNameAr; + String? secondNameEn; + String? thirdNameAr; + String? thirdNameEn; dynamic yakeenVidaPatientDataStatisticsByPatientIdList; dynamic yakeenVidaPatientDataStatisticsList; dynamic yakeenVidaPatientDataStatisticsPrefferedList; dynamic accessToken; - int categoryCode; + int? categoryCode; dynamic categoryNameAr; dynamic categoryNameEn; - int constraintCode; + int? constraintCode; dynamic constraintNameAr; dynamic constraintNameEn; dynamic content; @@ -84,99 +84,99 @@ class GetPatientInfoResponseModel { dynamic licenseStatusDescEn; dynamic organizations; dynamic registrationNumber; - int specialtyCode; + int? specialtyCode; dynamic specialtyNameAr; dynamic specialtyNameEn; GetPatientInfoResponseModel( {this.date, - this.languageID, - this.serviceName, - this.time, - this.androidLink, - this.authenticationTokenID, - this.data, - this.dataw, - this.dietType, - this.errorCode, - this.errorEndUserMessage, - this.errorEndUserMessageN, - this.errorMessage, - this.errorType, - this.foodCategory, - this.iOSLink, - this.isAuthenticated, - this.mealOrderStatus, - this.mealType, - this.messageStatus, - this.numberOfResultRecords, - this.patientBlodType, - this.successMsg, - this.successMsgN, - this.vidaUpdatedResponse, - this.accessTokenObject, - this.age, - this.clientIdentifierId, - this.createdBy, - this.dateOfBirth, - this.firstNameAr, - this.firstNameEn, - this.gender, - this.genderAr, - this.genderEn, - this.healthId, - this.idNumber, - this.idType, - this.isHijri, - this.isInstertedOrUpdated, - this.isNull, - this.isPatientExistNHIC, - this.isRecordLockedByCurrentUser, - this.lastNameAr, - this.lastNameEn, - this.listActiveAccessToken, - this.maritalStatus, - this.maritalStatusCode, - this.nationalDateOfBirth, - this.nationality, - this.nationalityCode, - this.occupation, - this.pCDTransactionDataResultList, - this.pCDGetVidaPatientForManualVerificationList, - this.pCDNHICHMGPatientDetailsMatchCalulationList, - this.pCDReturnValue, - this.patientStatus, - this.placeofBirth, - this.practitionerStatusCode, - this.practitionerStatusDescAr, - this.practitionerStatusDescEn, - this.rowCount, - this.secondNameAr, - this.secondNameEn, - this.thirdNameAr, - this.thirdNameEn, - this.yakeenVidaPatientDataStatisticsByPatientIdList, - this.yakeenVidaPatientDataStatisticsList, - this.yakeenVidaPatientDataStatisticsPrefferedList, - this.accessToken, - this.categoryCode, - this.categoryNameAr, - this.categoryNameEn, - this.constraintCode, - this.constraintNameAr, - this.constraintNameEn, - this.content, - this.errorList, - this.licenseExpiryDate, - this.licenseIssuedDate, - this.licenseStatusCode, - this.licenseStatusDescAr, - this.licenseStatusDescEn, - this.organizations, - this.registrationNumber, - this.specialtyCode, - this.specialtyNameAr, - this.specialtyNameEn}); + this.languageID, + this.serviceName, + this.time, + this.androidLink, + this.authenticationTokenID, + this.data, + this.dataw, + this.dietType, + this.errorCode, + this.errorEndUserMessage, + this.errorEndUserMessageN, + this.errorMessage, + this.errorType, + this.foodCategory, + this.iOSLink, + this.isAuthenticated, + this.mealOrderStatus, + this.mealType, + this.messageStatus, + this.numberOfResultRecords, + this.patientBlodType, + this.successMsg, + this.successMsgN, + this.vidaUpdatedResponse, + this.accessTokenObject, + this.age, + this.clientIdentifierId, + this.createdBy, + this.dateOfBirth, + this.firstNameAr, + this.firstNameEn, + this.gender, + this.genderAr, + this.genderEn, + this.healthId, + this.idNumber, + this.idType, + this.isHijri, + this.isInstertedOrUpdated, + this.isNull, + this.isPatientExistNHIC, + this.isRecordLockedByCurrentUser, + this.lastNameAr, + this.lastNameEn, + this.listActiveAccessToken, + this.maritalStatus, + this.maritalStatusCode, + this.nationalDateOfBirth, + this.nationality, + this.nationalityCode, + this.occupation, + this.pCDTransactionDataResultList, + this.pCDGetVidaPatientForManualVerificationList, + this.pCDNHICHMGPatientDetailsMatchCalulationList, + this.pCDReturnValue, + this.patientStatus, + this.placeofBirth, + this.practitionerStatusCode, + this.practitionerStatusDescAr, + this.practitionerStatusDescEn, + this.rowCount, + this.secondNameAr, + this.secondNameEn, + this.thirdNameAr, + this.thirdNameEn, + this.yakeenVidaPatientDataStatisticsByPatientIdList, + this.yakeenVidaPatientDataStatisticsList, + this.yakeenVidaPatientDataStatisticsPrefferedList, + this.accessToken, + this.categoryCode, + this.categoryNameAr, + this.categoryNameEn, + this.constraintCode, + this.constraintNameAr, + this.constraintNameEn, + this.content, + this.errorList, + this.licenseExpiryDate, + this.licenseIssuedDate, + this.licenseStatusCode, + this.licenseStatusDescAr, + this.licenseStatusDescEn, + this.organizations, + this.registrationNumber, + this.specialtyCode, + this.specialtyNameAr, + this.specialtyNameEn}); GetPatientInfoResponseModel.fromJson(Map json) { date = json['Date']; @@ -233,9 +233,9 @@ class GetPatientInfoResponseModel { occupation = json['Occupation']; pCDTransactionDataResultList = json['PCDTransactionDataResultList']; pCDGetVidaPatientForManualVerificationList = - json['PCD_GetVidaPatientForManualVerificationList']; + json['PCD_GetVidaPatientForManualVerificationList']; pCDNHICHMGPatientDetailsMatchCalulationList = - json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList']; + json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList']; pCDReturnValue = json['PCD_ReturnValue']; patientStatus = json['PatientStatus']; placeofBirth = json['PlaceofBirth']; @@ -248,11 +248,11 @@ class GetPatientInfoResponseModel { thirdNameAr = json['ThirdNameAr']; thirdNameEn = json['ThirdNameEn']; yakeenVidaPatientDataStatisticsByPatientIdList = - json['YakeenVidaPatientDataStatisticsByPatientIdList']; + json['YakeenVidaPatientDataStatisticsByPatientIdList']; yakeenVidaPatientDataStatisticsList = - json['YakeenVidaPatientDataStatisticsList']; + json['YakeenVidaPatientDataStatisticsList']; yakeenVidaPatientDataStatisticsPrefferedList = - json['YakeenVidaPatientDataStatisticsPrefferedList']; + json['YakeenVidaPatientDataStatisticsPrefferedList']; accessToken = json['accessToken']; categoryCode = json['categoryCode']; categoryNameAr = json['categoryNameAr']; diff --git a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart index 83ff53d7..a73ecb0b 100644 --- a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart +++ b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart @@ -1,42 +1,42 @@ class PatientRegistrationModel { - Patientobject patientobject; - String patientIdentificationID; - String patientMobileNumber; - String logInTokenID; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; + Patientobject? patientobject; + String? patientIdentificationID; + String? patientMobileNumber; + String? logInTokenID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - String tokenID; - String dOB; - int isHijri; - String healthId; - String zipCode; + bool? isDentalAllowedBackend; + int? deviceTypeID; + String? tokenID; + String? dOB; + int? isHijri; + String? healthId; + String? zipCode; PatientRegistrationModel( {this.patientobject, - this.patientIdentificationID, - this.patientMobileNumber, - this.logInTokenID, - this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.tokenID, - this.dOB, - this.isHijri, - this.healthId, - this.zipCode}); + this.patientIdentificationID, + this.patientMobileNumber, + this.logInTokenID, + this.versionID, + this.channel, + this.languageID, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.tokenID, + this.dOB, + this.isHijri, + this.healthId, + this.zipCode}); PatientRegistrationModel.fromJson(Map json) { patientobject = json['Patientobject'] != null @@ -64,7 +64,7 @@ class PatientRegistrationModel { Map toJson() { final Map data = new Map(); if (this.patientobject != null) { - data['Patientobject'] = this.patientobject.toJson(); + data['Patientobject'] = this.patientobject!.toJson(); } data['PatientIdentificationID'] = this.patientIdentificationID; data['PatientMobileNumber'] = this.patientMobileNumber; @@ -88,50 +88,50 @@ class PatientRegistrationModel { } class Patientobject { - bool tempValue; - int patientIdentificationType; - String patientIdentificationNo; - int mobileNumber; - int patientOutSA; - String firstNameN; - String middleNameN; - String lastNameN; - String firstName; - String middleName; - String lastName; - String strDateofBirth; - String dateofBirth; - int gender; - String nationalityID; - String dateofBirthN; - String emailAddress; - String sourceType; - String preferredLanguage; - String marital; - String eHealthIDField; + bool? tempValue; + int? patientIdentificationType; + String? patientIdentificationNo; + int? mobileNumber; + int? patientOutSA; + String? firstNameN; + String? middleNameN; + String? lastNameN; + String? firstName; + String? middleName; + String? lastName; + String? strDateofBirth; + String? dateofBirth; + int? gender; + String? nationalityID; + String? dateofBirthN; + String? emailAddress; + String? sourceType; + String? preferredLanguage; + String? marital; + String? eHealthIDField; Patientobject( {this.tempValue, - this.patientIdentificationType, - this.patientIdentificationNo, - this.mobileNumber, - this.patientOutSA, - this.firstNameN, - this.middleNameN, - this.lastNameN, - this.firstName, - this.middleName, - this.lastName, - this.strDateofBirth, - this.dateofBirth, - this.gender, - this.nationalityID, - this.dateofBirthN, - this.emailAddress, - this.sourceType, - this.preferredLanguage, - this.marital, - this.eHealthIDField}); + this.patientIdentificationType, + this.patientIdentificationNo, + this.mobileNumber, + this.patientOutSA, + this.firstNameN, + this.middleNameN, + this.lastNameN, + this.firstName, + this.middleName, + this.lastName, + this.strDateofBirth, + this.dateofBirth, + this.gender, + this.nationalityID, + this.dateofBirthN, + this.emailAddress, + this.sourceType, + this.preferredLanguage, + this.marital, + this.eHealthIDField}); Patientobject.fromJson(Map json) { tempValue = json['TempValue']; diff --git a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart index 8244a95f..af08661f 100644 --- a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart +++ b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart @@ -1,54 +1,54 @@ class SendActivationCodeByOTPNotificationTypeForRegistrationModel { - int patientMobileNumber; - String mobileNo; - int projectOutSA; - int loginType; - String zipCode; - bool isRegister; - String logInTokenID; - int searchType; - int patientID; - int nationalID; - int patientIdentificationID; - int oTPSendType; - int languageID; - double versionID; - int channel; - String iPAdress; - String generalid; - int patientOutSA; + int? patientMobileNumber; + String? mobileNo; + int? projectOutSA; + int? loginType; + String? zipCode; + bool? isRegister; + String? logInTokenID; + int? searchType; + int? patientID; + int? nationalID; + int? patientIdentificationID; + int? oTPSendType; + int? languageID; + double? versionID; + int? channel; + String? iPAdress; + String? generalid; + int? patientOutSA; Null sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - String dOB; - int isHijri; - String healthId; + bool? isDentalAllowedBackend; + int? deviceTypeID; + String? dOB; + int? isHijri; + String? healthId; SendActivationCodeByOTPNotificationTypeForRegistrationModel( {this.patientMobileNumber, - this.mobileNo, - this.projectOutSA, - this.loginType, - this.zipCode, - this.isRegister, - this.logInTokenID, - this.searchType, - this.patientID, - this.nationalID, - this.patientIdentificationID, - this.oTPSendType, - this.languageID, - this.versionID, - this.channel, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.dOB, - this.isHijri, - this.healthId}); + this.mobileNo, + this.projectOutSA, + this.loginType, + this.zipCode, + this.isRegister, + this.logInTokenID, + this.searchType, + this.patientID, + this.nationalID, + this.patientIdentificationID, + this.oTPSendType, + this.languageID, + this.versionID, + this.channel, + this.iPAdress, + this.generalid, + this.patientOutSA, + this.sessionID, + this.isDentalAllowedBackend, + this.deviceTypeID, + this.dOB, + this.isHijri, + this.healthId}); SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson( Map json) { diff --git a/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart b/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart index 8ba07f2a..4644131e 100644 --- a/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart +++ b/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart @@ -1,40 +1,40 @@ class GetMedicationForInPatientModel { - String setupID; - int projectID; - int admissionNo; - int patientID; - int orderNo; - int prescriptionNo; - int lineItemNo; - String prescriptionDatetime; - int itemID; - int directionID; - int refillID; - String dose; - int unitofMeasurement; - String startDatetime; - String stopDatetime; - int noOfDoses; - int routeId; - String comments; - int reviewedPharmacist; + String? setupID; + int? projectID; + int? admissionNo; + int? patientID; + int? orderNo; + int? prescriptionNo; + int? lineItemNo; + String? prescriptionDatetime; + int? itemID; + int? directionID; + int? refillID; + String? dose; + int? unitofMeasurement; + String? startDatetime; + String? stopDatetime; + int? noOfDoses; + int? routeId; + String? comments; + int? reviewedPharmacist; dynamic reviewedPharmacistDatetime; dynamic discountinueDatetime; dynamic rescheduleDatetime; - int status; - String statusDescription; - int createdBy; - String createdOn; + int? status; + String? statusDescription; + int? createdBy; + String? createdOn; dynamic editedBy; dynamic editedOn; dynamic strength; - String pHRItemDescription; - String pHRItemDescriptionN; - String doctorName; - String uomDescription; - String routeDescription; - String directionDescription; - String refillDescription; + String? pHRItemDescription; + String? pHRItemDescriptionN; + String? doctorName; + String? uomDescription; + String? routeDescription; + String? directionDescription; + String? refillDescription; GetMedicationForInPatientModel( {this.setupID, diff --git a/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart b/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart index 7c906643..71c1305a 100644 --- a/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart +++ b/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart @@ -1,16 +1,16 @@ class GetMedicationForInPatientRequestModel { - bool isDentalAllowedBackend; - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int deviceTypeID; - String tokenID; - int patientID; - int admissionNo; - String sessionID; - int projectID; + bool? isDentalAllowedBackend; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? deviceTypeID; + String? tokenID; + int? patientID; + int? admissionNo; + String? sessionID; + int? projectID; GetMedicationForInPatientRequestModel( {this.isDentalAllowedBackend, diff --git a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart index b30413e5..3fa2f69b 100644 --- a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart +++ b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart @@ -5,16 +5,19 @@ class CheckActivationCodeForDoctorAppResponseModel { late List? listDoctorsClinic; List? listDoctorProfile; late MemberInformation? memberInformation; - String vidaAuthTokenID; - String vidaRefreshTokenID; + String? vidaAuthTokenID; + String? vidaRefreshTokenID; CheckActivationCodeForDoctorAppResponseModel( - {this.authenticationTokenID, this.listDoctorsClinic, this.memberInformation, + {this.authenticationTokenID, + this.listDoctorsClinic, + this.memberInformation, this.listDoctorProfile, this.vidaAuthTokenID, this.vidaRefreshTokenID}); - CheckActivationCodeForDoctorAppResponseModel.fromJson(Map json) { + CheckActivationCodeForDoctorAppResponseModel.fromJson( + Map json) { authenticationTokenID = json['AuthenticationTokenID']; if (json['List_DoctorsClinic'] != null) { listDoctorsClinic = []; @@ -32,19 +35,22 @@ class CheckActivationCodeForDoctorAppResponseModel { vidaAuthTokenID = json['VidaAuthTokenID']; vidaRefreshTokenID = json['VidaRefreshTokenID']; - memberInformation = - json['memberInformation'] != null ? new MemberInformation.fromJson(json['memberInformation']) : null; + memberInformation = json['memberInformation'] != null + ? new MemberInformation.fromJson(json['memberInformation']) + : null; } Map toJson() { final Map data = new Map(); data['AuthenticationTokenID'] = this.authenticationTokenID; if (this.listDoctorsClinic != null) { - data['List_DoctorsClinic'] = this.listDoctorsClinic!.map((v) => v.toJson()).toList(); + data['List_DoctorsClinic'] = + this.listDoctorsClinic!.map((v) => v.toJson()).toList(); } if (this.listDoctorProfile != null) { - data['List_DoctorProfile'] = this.listDoctorProfile!.map((v) => v.toJson()).toList(); + data['List_DoctorProfile'] = + this.listDoctorProfile!.map((v) => v.toJson()).toList(); } if (this.memberInformation != null) { data['memberInformation'] = this.memberInformation!.toJson(); @@ -61,7 +67,13 @@ class ListDoctorsClinic { late bool? isActive; late String? clinicName; - ListDoctorsClinic({this.setupID, this.projectID, this.doctorID, this.clinicID, this.isActive, this.clinicName}); + ListDoctorsClinic( + {this.setupID, + this.projectID, + this.doctorID, + this.clinicID, + this.isActive, + this.clinicName}); ListDoctorsClinic.fromJson(Map json) { setupID = json['SetupID']; diff --git a/lib/core/model/diabetic_chart/DiabeticType.dart b/lib/core/model/diabetic_chart/DiabeticType.dart index 26641e61..8a9cfbe1 100644 --- a/lib/core/model/diabetic_chart/DiabeticType.dart +++ b/lib/core/model/diabetic_chart/DiabeticType.dart @@ -1,7 +1,7 @@ class DiabeticType { - int value; - String nameEn; - String nameAr; + int? value; + String? nameEn; + String? nameAr; DiabeticType({this.value, this.nameEn, this.nameAr}); diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart index 7fad3106..34a8e997 100644 --- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart +++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart @@ -1,22 +1,22 @@ class GetDiabeticChartValuesRequestModel { - int deviceTypeID; - int patientID; - int resultType; - int admissionNo; - String setupID; - bool patientOutSA; - int patientType; - int patientTypeID; + int? deviceTypeID; + int? patientID; + int? resultType; + int? admissionNo; + String? setupID; + bool? patientOutSA; + int? patientType; + int? patientTypeID; GetDiabeticChartValuesRequestModel( {this.deviceTypeID, - this.patientID, - this.resultType, - this.admissionNo, - this.setupID, - this.patientOutSA, - this.patientType, - this.patientTypeID}); + this.patientID, + this.resultType, + this.admissionNo, + this.setupID, + this.patientOutSA, + this.patientType, + this.patientTypeID}); GetDiabeticChartValuesRequestModel.fromJson(Map json) { deviceTypeID = json['DeviceTypeID']; diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart index fa2c1ca2..1e5dd8fd 100644 --- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart +++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart @@ -1,18 +1,18 @@ class GetDiabeticChartValuesResponseModel { - String resultType; - int admissionNo; - String dateChart; - int resultValue; - int createdBy; - String createdOn; + String? resultType; + int? admissionNo; + String? dateChart; + int? resultValue; + int? createdBy; + String? createdOn; GetDiabeticChartValuesResponseModel( {this.resultType, - this.admissionNo, - this.dateChart, - this.resultValue, - this.createdBy, - this.createdOn}); + this.admissionNo, + this.dateChart, + this.resultValue, + this.createdBy, + this.createdOn}); GetDiabeticChartValuesResponseModel.fromJson(Map json) { resultType = json['ResultType']; diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart index 310cfb50..bea61fc9 100644 --- a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart +++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart @@ -1,16 +1,16 @@ class GetDiagnosisForInPatientRequestModel { - int patientID; - int admissionNo; - String setupID; - int patientType; - int patientTypeID; + int? patientID; + int? admissionNo; + String? setupID; + int? patientType; + int? patientTypeID; GetDiagnosisForInPatientRequestModel( {this.patientID, - this.admissionNo, - this.setupID, - this.patientType, - this.patientTypeID}); + this.admissionNo, + this.setupID, + this.patientType, + this.patientTypeID}); GetDiagnosisForInPatientRequestModel.fromJson(Map json) { patientID = json['PatientID']; diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart index 1ec48964..491ac591 100644 --- a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart +++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart @@ -1,26 +1,27 @@ class GetDiagnosisForInPatientResponseModel { - String iCDCode10ID; - int diagnosisTypeID; - int conditionID; - bool complexDiagnosis; - String asciiDesc; - int createdBy; - String createdOn; - int editedBy; - String editedOn; - String createdByName; - String editedByName; + String? iCDCode10ID; + int? diagnosisTypeID; + int? conditionID; + bool? complexDiagnosis; + String? asciiDesc; + int? createdBy; + String? createdOn; + int? editedBy; + String? editedOn; + String? createdByName; + String? editedByName; GetDiagnosisForInPatientResponseModel( {this.iCDCode10ID, - this.diagnosisTypeID, - this.conditionID, - this.complexDiagnosis, - this.asciiDesc, - this.createdBy, - this.createdOn, - this.editedBy, - this.editedOn, this.createdByName}); + this.diagnosisTypeID, + this.conditionID, + this.complexDiagnosis, + this.asciiDesc, + this.createdBy, + this.createdOn, + this.editedBy, + this.editedOn, + this.createdByName}); GetDiagnosisForInPatientResponseModel.fromJson(Map json) { iCDCode10ID = json['ICDCode10ID']; diff --git a/lib/core/model/labs/LabResultHistory.dart b/lib/core/model/labs/LabResultHistory.dart index 7c4221ca..4d4221e1 100644 --- a/lib/core/model/labs/LabResultHistory.dart +++ b/lib/core/model/labs/LabResultHistory.dart @@ -1,54 +1,54 @@ class LabResultHistory { - String description; - String femaleInterpretativeData; - int gender; - bool isCertificateAllowed; - int lineItemNo; - String maleInterpretativeData; - String notes; - int orderLineItemNo; - int orderNo; - String packageID; - int patientID; - String projectID; - String referanceRange; - String resultValue; - int resultValueBasedLineItemNo; - String resultValueFlag; - String sampleCollectedOn; - String sampleReceivedOn; - String setupID; - String superVerifiedOn; - String testCode; - String uOM; - String verifiedOn; - String verifiedOnDateTime; + String? description; + String? femaleInterpretativeData; + int? gender; + bool? isCertificateAllowed; + int? lineItemNo; + String? maleInterpretativeData; + String? notes; + int? orderLineItemNo; + int? orderNo; + String? packageID; + int? patientID; + String? projectID; + String? referanceRange; + String? resultValue; + int? resultValueBasedLineItemNo; + String? resultValueFlag; + String? sampleCollectedOn; + String? sampleReceivedOn; + String? setupID; + String? superVerifiedOn; + String? testCode; + String? uOM; + String? verifiedOn; + String? verifiedOnDateTime; LabResultHistory( {this.description, - this.femaleInterpretativeData, - this.gender, - this.isCertificateAllowed, - this.lineItemNo, - this.maleInterpretativeData, - this.notes, - this.orderLineItemNo, - this.orderNo, - this.packageID, - this.patientID, - this.projectID, - this.referanceRange, - this.resultValue, - this.resultValueBasedLineItemNo, - this.resultValueFlag, - this.sampleCollectedOn, - this.sampleReceivedOn, - this.setupID, - this.superVerifiedOn, - this.testCode, - this.uOM, - this.verifiedOn, - this.verifiedOnDateTime}); + this.femaleInterpretativeData, + this.gender, + this.isCertificateAllowed, + this.lineItemNo, + this.maleInterpretativeData, + this.notes, + this.orderLineItemNo, + this.orderNo, + this.packageID, + this.patientID, + this.projectID, + this.referanceRange, + this.resultValue, + this.resultValueBasedLineItemNo, + this.resultValueFlag, + this.sampleCollectedOn, + this.sampleReceivedOn, + this.setupID, + this.superVerifiedOn, + this.testCode, + this.uOM, + this.verifiedOn, + this.verifiedOnDateTime}); LabResultHistory.fromJson(Map json) { description = json['Description']; @@ -105,4 +105,4 @@ class LabResultHistory { data['VerifiedOnDateTime'] = this.verifiedOnDateTime; return data; } -} \ No newline at end of file +} diff --git a/lib/core/model/labs/all_special_lab_result_model.dart b/lib/core/model/labs/all_special_lab_result_model.dart index ffdc5ee5..a177e16e 100644 --- a/lib/core/model/labs/all_special_lab_result_model.dart +++ b/lib/core/model/labs/all_special_lab_result_model.dart @@ -5,51 +5,51 @@ class AllSpecialLabResultModel { dynamic appointmentDate; dynamic appointmentNo; dynamic appointmentTime; - String clinicDescription; - String clinicDescriptionEnglish; + String? clinicDescription; + String? clinicDescriptionEnglish; dynamic clinicDescriptionN; dynamic clinicID; dynamic createdOn; - double decimalDoctorRate; + double? decimalDoctorRate; dynamic doctorID; - String doctorImageURL; - String doctorName; - String doctorNameEnglish; + String? doctorImageURL; + String? doctorName; + String? doctorNameEnglish; dynamic doctorNameN; dynamic doctorRate; dynamic doctorStarsRate; - String doctorTitle; + String? doctorTitle; dynamic gender; - String genderDescription; - bool inOutPatient; - String invoiceNo; - bool isActiveDoctorProfile; - bool isDoctorAllowVedioCall; - bool isExecludeDoctor; - bool isInOutPatient; + String? genderDescription; + bool? inOutPatient; + String? invoiceNo; + bool? isActiveDoctorProfile; + bool? isDoctorAllowVedioCall; + bool? isExecludeDoctor; + bool? isInOutPatient; dynamic isInOutPatientDescription; dynamic isInOutPatientDescriptionN; - bool isLiveCareAppointment; - bool isRead; - bool isSendEmail; - String moduleID; - String nationalityFlagURL; + bool? isLiveCareAppointment; + bool? isRead; + bool? isSendEmail; + String? moduleID; + String? nationalityFlagURL; dynamic noOfPatientsRate; dynamic orderDate; - String orderNo; + String? orderNo; dynamic patientID; - String projectID; - String projectName; + String? projectID; + String? projectName; dynamic projectNameN; - String qR; - String resultData; - String resultDataHTML; + String? qR; + String? resultData; + String? resultDataHTML; dynamic resultDataTxt; - String setupID; + String? setupID; //List speciality; dynamic status; dynamic statusDesc; - String strOrderDate; + String? strOrderDate; AllSpecialLabResultModel( {this.actualDoctorRate, diff --git a/lib/core/model/labs/all_special_lab_result_request.dart b/lib/core/model/labs/all_special_lab_result_request.dart index d5df1405..950f0e96 100644 --- a/lib/core/model/labs/all_special_lab_result_request.dart +++ b/lib/core/model/labs/all_special_lab_result_request.dart @@ -1,18 +1,18 @@ class AllSpecialLabResultRequestModel { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - String tokenID; - int patientTypeID; - int patientType; - int patientID; - int projectID; + double? versionID; + int? channel; + int? languageID; + String? iPAdress; + String? generalid; + int? patientOutSA; + String? sessionID; + bool? isDentalAllowedBackend; + int? deviceTypeID; + String? tokenID; + int? patientTypeID; + int? patientType; + int? patientID; + int? projectID; AllSpecialLabResultRequestModel( {this.versionID, diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart index 53035721..0cc48aef 100644 --- a/lib/core/model/labs/lab_result.dart +++ b/lib/core/model/labs/lab_result.dart @@ -34,7 +34,8 @@ class LabResult { this.referanceRange, this.resultValue, this.maxValue, - this.minValue,this.sampleCollectedOn, + this.minValue, + this.sampleCollectedOn, this.sampleReceivedOn, this.setupID, this.superVerifiedOn, @@ -95,9 +96,9 @@ class LabResult { int checkResultStatus() { try { - var max = double.tryParse(maxValue) ?? null; - var min = double.tryParse(minValue) ?? null; - var result = double.tryParse(resultValue) ?? null; + var max = double.tryParse(maxValue!) ?? null; + var min = double.tryParse(minValue!) ?? null; + var result = double.tryParse(resultValue!) ?? null; if (max != null && min != null && result != null) { if (result > max) { return 1; @@ -109,10 +110,9 @@ class LabResult { } else { return 0; } - }catch (e){ + } catch (e) { return 0; } - } } diff --git a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart index 1d63e885..f96016d7 100644 --- a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart +++ b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart @@ -1,11 +1,12 @@ class AddPatientToDoctorListRequestModel { - int vCID; - String tokenID; - String generalid; - int doctorId; - bool isOutKsa; + int? vCID; + String? tokenID; + String? generalid; + int? doctorId; + bool? isOutKsa; - AddPatientToDoctorListRequestModel({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa}); + AddPatientToDoctorListRequestModel( + {this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa}); AddPatientToDoctorListRequestModel.fromJson(Map json) { vCID = json['VC_ID']; diff --git a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart index 4335053c..b7fd7aa5 100644 --- a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart +++ b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart @@ -1,14 +1,18 @@ import 'package:doctor_app_flutter/config/config.dart'; class GetNursingProgressNoteRequestModel { - int patientID; - int admissionNo; - int patientTypeID; - int patientType; - String setupID; + int? patientID; + int? admissionNo; + int? patientTypeID; + int? patientType; + String? setupID; GetNursingProgressNoteRequestModel( - {this.patientID, this.admissionNo, this.patientTypeID = 1, this.patientType = 1, this.setupID }); + {this.patientID, + this.admissionNo, + this.patientTypeID = 1, + this.patientType = 1, + this.setupID}); GetNursingProgressNoteRequestModel.fromJson(Map json) { patientID = json['PatientID']; diff --git a/lib/core/model/note/GetNursingProgressNoteResposeModel.dart b/lib/core/model/note/GetNursingProgressNoteResposeModel.dart index fb7fbcec..aaf9c7ab 100644 --- a/lib/core/model/note/GetNursingProgressNoteResposeModel.dart +++ b/lib/core/model/note/GetNursingProgressNoteResposeModel.dart @@ -1,14 +1,14 @@ class GetNursingProgressNoteResposeModel { - String notes; + String? notes; dynamic conditionType; - int createdBy; - String createdOn; + int? createdBy; + String? createdOn; dynamic editedBy; dynamic editedOn; - String createdByName; + String? createdByName; - String editedByName; + String? editedByName; GetNursingProgressNoteResposeModel( {this.notes, diff --git a/lib/core/model/patient_muse/PatientSearchRequestModel.dart b/lib/core/model/patient_muse/PatientSearchRequestModel.dart index 2839833a..c2c1bab8 100644 --- a/lib/core/model/patient_muse/PatientSearchRequestModel.dart +++ b/lib/core/model/patient_muse/PatientSearchRequestModel.dart @@ -1,15 +1,15 @@ class PatientSearchRequestModel { - int ?doctorID; - String?firstName; - String?middleName; - String?lastName; - String?patientMobileNumber; - String?patientIdentificationID; - int ?patientID; + int? doctorID; + String? firstName; + String? middleName; + String? lastName; + String? patientMobileNumber; + String? patientIdentificationID; + int? patientID; String? from; - String ?to; - int ?searchType; - int projectID; + String? to; + int? searchType; + int? projectID; String? mobileNo; String? identificationNo; int? nursingStationID; diff --git a/lib/core/model/procedure/get_ordered_procedure_request_model.dart b/lib/core/model/procedure/get_ordered_procedure_request_model.dart index 02ffb44e..dbfb75cd 100644 --- a/lib/core/model/procedure/get_ordered_procedure_request_model.dart +++ b/lib/core/model/procedure/get_ordered_procedure_request_model.dart @@ -1,9 +1,10 @@ class GetOrderedProcedureRequestModel { String? vidaAuthTokenID; int? patientMRN; - int appointmentNo; + int? appointmentNo; - GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN, this.appointmentNo}); + GetOrderedProcedureRequestModel( + {this.vidaAuthTokenID, this.patientMRN, this.appointmentNo}); GetOrderedProcedureRequestModel.fromJson(Map json) { vidaAuthTokenID = json['VidaAuthTokenID']; diff --git a/lib/core/model/referral/MyReferralPatientModel.dart b/lib/core/model/referral/MyReferralPatientModel.dart index 17ee2f8f..6f68a6d7 100644 --- a/lib/core/model/referral/MyReferralPatientModel.dart +++ b/lib/core/model/referral/MyReferralPatientModel.dart @@ -35,7 +35,7 @@ class MyReferralPatientModel { int? referralClinic; int? referringClinic; int? referralStatus; - DateTime ?referralDate; + DateTime? referralDate; String? referringDoctorRemarks; String? referredDoctorRemarks; String? referralResponseOn; @@ -62,15 +62,15 @@ class MyReferralPatientModel { String? referringClinicDescription; String? referringDoctorName; int? referalStatus; - String sourceSetupID; - int sourceProjectId; - String targetSetupID; - int targetProjectId; - int targetClinicID; - int targetDoctorID; - int sourceAppointmentNo; - int targetAppointmentNo; - String remarksFromSource; + String? sourceSetupID; + int? sourceProjectId; + String? targetSetupID; + int? targetProjectId; + int? targetClinicID; + int? targetDoctorID; + int? sourceAppointmentNo; + int? targetAppointmentNo; + String? remarksFromSource; MyReferralPatientModel( {this.rowID, @@ -113,27 +113,36 @@ class MyReferralPatientModel { this.referralResponseOn, this.priority, this.frequency, - this.mAXResponseTime, - this.episodeID, - this.appointmentNo, - this.appointmentDate, - this.appointmentType, - this.patientMRN, - this.createdOn, - this.clinicID, - this.nationalityID, - this.age, - this.doctorImageURL, - this.frequencyDescription, - this.genderDescription, - this.isDoctorLate, - this.isDoctorResponse, - this.nationalityFlagURL, - this.nursingStationName, - this.priorityDescription, - this.referringClinicDescription, - this.referringDoctorName, - this.referalStatus, this.sourceSetupID, this.sourceAppointmentNo, this.sourceProjectId, this.targetProjectId, this.targetAppointmentNo, this.targetClinicID, this.targetSetupID, this.targetDoctorID, this.remarksFromSource}); + this.mAXResponseTime, + this.episodeID, + this.appointmentNo, + this.appointmentDate, + this.appointmentType, + this.patientMRN, + this.createdOn, + this.clinicID, + this.nationalityID, + this.age, + this.doctorImageURL, + this.frequencyDescription, + this.genderDescription, + this.isDoctorLate, + this.isDoctorResponse, + this.nationalityFlagURL, + this.nursingStationName, + this.priorityDescription, + this.referringClinicDescription, + this.referringDoctorName, + this.referalStatus, + this.sourceSetupID, + this.sourceAppointmentNo, + this.sourceProjectId, + this.targetProjectId, + this.targetAppointmentNo, + this.targetClinicID, + this.targetSetupID, + this.targetDoctorID, + this.remarksFromSource}); MyReferralPatientModel.fromJson(Map json) { rowID = json['RowID']; @@ -219,7 +228,6 @@ class MyReferralPatientModel { sourceAppointmentNo = json['SourceAppointmentNo']; targetAppointmentNo = json['TargetAppointmentNo']; remarksFromSource = json['RemarksFromSource']; - } Map toJson() { @@ -298,6 +306,6 @@ class MyReferralPatientModel { } get patientName { - return this.firstName !+ " " + this.lastName!; + return this.firstName! + " " + this.lastName!; } } diff --git a/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart b/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart index 26bb76bd..8087481c 100644 --- a/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart +++ b/lib/core/model/sick_leave/sick_leave_doctor_request_model.dart @@ -1,12 +1,16 @@ class GetSickLeaveDoctorRequestModel { - int patientMRN; - String appointmentNo; - int status; - String vidaAuthTokenID; - String vidaRefreshTokenID; + int? patientMRN; + String? appointmentNo; + int? status; + String? vidaAuthTokenID; + String? vidaRefreshTokenID; GetSickLeaveDoctorRequestModel( - {this.patientMRN, this.appointmentNo, this.status, this.vidaAuthTokenID, this.vidaRefreshTokenID}); + {this.patientMRN, + this.appointmentNo, + this.status, + this.vidaAuthTokenID, + this.vidaRefreshTokenID}); GetSickLeaveDoctorRequestModel.fromJson(Map json) { patientMRN = json['PatientMRN']; diff --git a/lib/core/model/sick_leave/sick_leave_patient_model.dart b/lib/core/model/sick_leave/sick_leave_patient_model.dart index 1caaa066..cca30c3d 100644 --- a/lib/core/model/sick_leave/sick_leave_patient_model.dart +++ b/lib/core/model/sick_leave/sick_leave_patient_model.dart @@ -21,13 +21,13 @@ class SickLeavePatientModel { dynamic doctorTitle; dynamic gender; dynamic genderDescription; - bool isActiveDoctorProfile; - bool isDoctorAllowVedioCall; - bool isExecludeDoctor; - bool isInOutPatient; + bool? isActiveDoctorProfile; + bool? isDoctorAllowVedioCall; + bool? isExecludeDoctor; + bool? isInOutPatient; dynamic isInOutPatientDescription; dynamic isInOutPatientDescriptionN; - bool isLiveCareAppointment; + bool? isLiveCareAppointment; dynamic noOfPatientsRate; dynamic patientName; dynamic projectName; diff --git a/lib/core/model/sick_leave/sick_leave_patient_request_model.dart b/lib/core/model/sick_leave/sick_leave_patient_request_model.dart index 0abe94fe..9987c4ff 100644 --- a/lib/core/model/sick_leave/sick_leave_patient_request_model.dart +++ b/lib/core/model/sick_leave/sick_leave_patient_request_model.dart @@ -10,7 +10,7 @@ class SickLeavePatientRequestModel { int? patientTypeID; String? tokenID; int? patientID; - int patientMRN; + int? patientMRN; String? sessionID; SickLeavePatientRequestModel( diff --git a/pubspec.lock b/pubspec.lock index 27ad91b3..00eb0727 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -35,7 +35,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" autocomplete_textfield: dependency: "direct main" description: @@ -154,7 +154,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -734,7 +734,7 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: @@ -1138,7 +1138,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.3" timing: dependency: transitive description: @@ -1222,7 +1222,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" video_player: dependency: transitive description: