Merge branch 'hussam_flutter_2' into 'flutter_2_developemt'

Hussam flutter 2

See merge request Cloud_Solution/doctor_app_flutter!892
merge-requests/895/merge
Elham Ali 4 years ago
commit 7d835ee280

@ -1,56 +1,56 @@
class CheckActivationCodeModel { class CheckActivationCodeModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
bool forRegisteration; bool? forRegisteration;
String activationCode; String? activationCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
CheckActivationCodeModel( CheckActivationCodeModel(
{this.patientMobileNumber, {this.patientMobileNumber,
this.mobileNo, this.mobileNo,
this.projectOutSA, this.projectOutSA,
this.loginType, this.loginType,
this.zipCode, this.zipCode,
this.isRegister, this.isRegister,
this.logInTokenID, this.logInTokenID,
this.searchType, this.searchType,
this.patientID, this.patientID,
this.nationalID, this.nationalID,
this.patientIdentificationID, this.patientIdentificationID,
this.forRegisteration, this.forRegisteration,
this.activationCode, this.activationCode,
this.versionID, this.versionID,
this.channel, this.channel,
this.languageID, this.languageID,
this.iPAdress, this.iPAdress,
this.generalid, this.generalid,
this.patientOutSA, this.patientOutSA,
this.sessionID, this.sessionID,
this.isDentalAllowedBackend, this.isDentalAllowedBackend,
this.deviceTypeID, this.deviceTypeID,
this.dOB, this.dOB,
this.isHijri, this.isHijri,
this.healthId}); this.healthId});
CheckActivationCodeModel.fromJson(Map<String, dynamic> json) { CheckActivationCodeModel.fromJson(Map<String, dynamic> json) {
patientMobileNumber = json['PatientMobileNumber']; patientMobileNumber = json['PatientMobileNumber'];

@ -1,40 +1,40 @@
class CheckPatientForRegistrationModel { class CheckPatientForRegistrationModel {
int patientIdentificationID; int? patientIdentificationID;
int patientMobileNumber; int? patientMobileNumber;
String zipCode; String? zipCode;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
bool isRegister; bool? isRegister;
String dOB; String? dOB;
int isHijri; int? isHijri;
CheckPatientForRegistrationModel( CheckPatientForRegistrationModel(
{this.patientIdentificationID, {this.patientIdentificationID,
this.patientMobileNumber, this.patientMobileNumber,
this.zipCode, this.zipCode,
this.versionID, this.versionID,
this.channel, this.channel,
this.languageID, this.languageID,
this.iPAdress, this.iPAdress,
this.generalid, this.generalid,
this.patientOutSA, this.patientOutSA,
this.sessionID, this.sessionID,
this.isDentalAllowedBackend, this.isDentalAllowedBackend,
this.deviceTypeID, this.deviceTypeID,
this.tokenID, this.tokenID,
this.patientID, this.patientID,
this.isRegister, this.isRegister,
this.dOB, this.dOB,
this.isHijri}); this.isHijri});
CheckPatientForRegistrationModel.fromJson(Map<String, dynamic> json) { CheckPatientForRegistrationModel.fromJson(Map<String, dynamic> json) {
patientIdentificationID = json['PatientIdentificationID']; patientIdentificationID = json['PatientIdentificationID'];

@ -1,30 +1,30 @@
class GetPatientInfoRequestModel { class GetPatientInfoRequestModel {
String patientIdentificationID; String? patientIdentificationID;
String dOB; String? dOB;
int isHijri; int? isHijri;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
GetPatientInfoRequestModel( GetPatientInfoRequestModel(
{this.patientIdentificationID, {this.patientIdentificationID,
this.dOB, this.dOB,
this.isHijri, this.isHijri,
this.versionID, this.versionID,
this.channel, this.channel,
this.languageID, this.languageID,
this.iPAdress, this.iPAdress,
this.generalid, this.generalid,
this.patientOutSA, this.patientOutSA,
this.sessionID, this.sessionID,
this.isDentalAllowedBackend, this.isDentalAllowedBackend,
this.deviceTypeID}); this.deviceTypeID});
GetPatientInfoRequestModel.fromJson(Map<String, dynamic> json) { GetPatientInfoRequestModel.fromJson(Map<String, dynamic> json) {
patientIdentificationID = json['PatientIdentificationID']; patientIdentificationID = json['PatientIdentificationID'];

@ -1,78 +1,78 @@
class GetPatientInfoResponseModel { class GetPatientInfoResponseModel {
dynamic date; dynamic date;
int languageID; int? languageID;
int serviceName; int? serviceName;
dynamic time; dynamic time;
dynamic androidLink; dynamic androidLink;
dynamic authenticationTokenID; dynamic authenticationTokenID;
dynamic data; dynamic data;
bool dataw; bool? dataw;
int dietType; int? dietType;
dynamic errorCode; dynamic errorCode;
dynamic errorEndUserMessage; dynamic errorEndUserMessage;
dynamic errorEndUserMessageN; dynamic errorEndUserMessageN;
dynamic errorMessage; dynamic errorMessage;
int errorType; int? errorType;
int foodCategory; int? foodCategory;
dynamic iOSLink; dynamic iOSLink;
bool isAuthenticated; bool? isAuthenticated;
int mealOrderStatus; int? mealOrderStatus;
int mealType; int? mealType;
int messageStatus; int? messageStatus;
int numberOfResultRecords; int? numberOfResultRecords;
dynamic patientBlodType; dynamic patientBlodType;
dynamic successMsg; dynamic successMsg;
dynamic successMsgN; dynamic successMsgN;
dynamic vidaUpdatedResponse; dynamic vidaUpdatedResponse;
dynamic accessTokenObject; dynamic accessTokenObject;
int age; int? age;
dynamic clientIdentifierId; dynamic clientIdentifierId;
int createdBy; int? createdBy;
String dateOfBirth; String? dateOfBirth;
String firstNameAr; String? firstNameAr;
String firstNameEn; String? firstNameEn;
String gender; String? gender;
dynamic genderAr; dynamic genderAr;
dynamic genderEn; dynamic genderEn;
String healthId; String? healthId;
String idNumber; String? idNumber;
String idType; String? idType;
bool isHijri; bool? isHijri;
int isInstertedOrUpdated; int? isInstertedOrUpdated;
int isNull; int? isNull;
int isPatientExistNHIC; int? isPatientExistNHIC;
bool isRecordLockedByCurrentUser; bool? isRecordLockedByCurrentUser;
String lastNameAr; String? lastNameAr;
String lastNameEn; String? lastNameEn;
dynamic listActiveAccessToken; dynamic listActiveAccessToken;
String maritalStatus; String? maritalStatus;
String maritalStatusCode; String? maritalStatusCode;
String nationalDateOfBirth; String? nationalDateOfBirth;
String nationality; String? nationality;
String nationalityCode; String? nationalityCode;
String occupation; String? occupation;
dynamic pCDTransactionDataResultList; dynamic pCDTransactionDataResultList;
dynamic pCDGetVidaPatientForManualVerificationList; dynamic pCDGetVidaPatientForManualVerificationList;
dynamic pCDNHICHMGPatientDetailsMatchCalulationList; dynamic pCDNHICHMGPatientDetailsMatchCalulationList;
int pCDReturnValue; int? pCDReturnValue;
String patientStatus; String? patientStatus;
String placeofBirth; String? placeofBirth;
dynamic practitionerStatusCode; dynamic practitionerStatusCode;
dynamic practitionerStatusDescAr; dynamic practitionerStatusDescAr;
dynamic practitionerStatusDescEn; dynamic practitionerStatusDescEn;
int rowCount; int? rowCount;
String secondNameAr; String? secondNameAr;
String secondNameEn; String? secondNameEn;
String thirdNameAr; String? thirdNameAr;
String thirdNameEn; String? thirdNameEn;
dynamic yakeenVidaPatientDataStatisticsByPatientIdList; dynamic yakeenVidaPatientDataStatisticsByPatientIdList;
dynamic yakeenVidaPatientDataStatisticsList; dynamic yakeenVidaPatientDataStatisticsList;
dynamic yakeenVidaPatientDataStatisticsPrefferedList; dynamic yakeenVidaPatientDataStatisticsPrefferedList;
dynamic accessToken; dynamic accessToken;
int categoryCode; int? categoryCode;
dynamic categoryNameAr; dynamic categoryNameAr;
dynamic categoryNameEn; dynamic categoryNameEn;
int constraintCode; int? constraintCode;
dynamic constraintNameAr; dynamic constraintNameAr;
dynamic constraintNameEn; dynamic constraintNameEn;
dynamic content; dynamic content;
@ -84,99 +84,99 @@ class GetPatientInfoResponseModel {
dynamic licenseStatusDescEn; dynamic licenseStatusDescEn;
dynamic organizations; dynamic organizations;
dynamic registrationNumber; dynamic registrationNumber;
int specialtyCode; int? specialtyCode;
dynamic specialtyNameAr; dynamic specialtyNameAr;
dynamic specialtyNameEn; dynamic specialtyNameEn;
GetPatientInfoResponseModel( GetPatientInfoResponseModel(
{this.date, {this.date,
this.languageID, this.languageID,
this.serviceName, this.serviceName,
this.time, this.time,
this.androidLink, this.androidLink,
this.authenticationTokenID, this.authenticationTokenID,
this.data, this.data,
this.dataw, this.dataw,
this.dietType, this.dietType,
this.errorCode, this.errorCode,
this.errorEndUserMessage, this.errorEndUserMessage,
this.errorEndUserMessageN, this.errorEndUserMessageN,
this.errorMessage, this.errorMessage,
this.errorType, this.errorType,
this.foodCategory, this.foodCategory,
this.iOSLink, this.iOSLink,
this.isAuthenticated, this.isAuthenticated,
this.mealOrderStatus, this.mealOrderStatus,
this.mealType, this.mealType,
this.messageStatus, this.messageStatus,
this.numberOfResultRecords, this.numberOfResultRecords,
this.patientBlodType, this.patientBlodType,
this.successMsg, this.successMsg,
this.successMsgN, this.successMsgN,
this.vidaUpdatedResponse, this.vidaUpdatedResponse,
this.accessTokenObject, this.accessTokenObject,
this.age, this.age,
this.clientIdentifierId, this.clientIdentifierId,
this.createdBy, this.createdBy,
this.dateOfBirth, this.dateOfBirth,
this.firstNameAr, this.firstNameAr,
this.firstNameEn, this.firstNameEn,
this.gender, this.gender,
this.genderAr, this.genderAr,
this.genderEn, this.genderEn,
this.healthId, this.healthId,
this.idNumber, this.idNumber,
this.idType, this.idType,
this.isHijri, this.isHijri,
this.isInstertedOrUpdated, this.isInstertedOrUpdated,
this.isNull, this.isNull,
this.isPatientExistNHIC, this.isPatientExistNHIC,
this.isRecordLockedByCurrentUser, this.isRecordLockedByCurrentUser,
this.lastNameAr, this.lastNameAr,
this.lastNameEn, this.lastNameEn,
this.listActiveAccessToken, this.listActiveAccessToken,
this.maritalStatus, this.maritalStatus,
this.maritalStatusCode, this.maritalStatusCode,
this.nationalDateOfBirth, this.nationalDateOfBirth,
this.nationality, this.nationality,
this.nationalityCode, this.nationalityCode,
this.occupation, this.occupation,
this.pCDTransactionDataResultList, this.pCDTransactionDataResultList,
this.pCDGetVidaPatientForManualVerificationList, this.pCDGetVidaPatientForManualVerificationList,
this.pCDNHICHMGPatientDetailsMatchCalulationList, this.pCDNHICHMGPatientDetailsMatchCalulationList,
this.pCDReturnValue, this.pCDReturnValue,
this.patientStatus, this.patientStatus,
this.placeofBirth, this.placeofBirth,
this.practitionerStatusCode, this.practitionerStatusCode,
this.practitionerStatusDescAr, this.practitionerStatusDescAr,
this.practitionerStatusDescEn, this.practitionerStatusDescEn,
this.rowCount, this.rowCount,
this.secondNameAr, this.secondNameAr,
this.secondNameEn, this.secondNameEn,
this.thirdNameAr, this.thirdNameAr,
this.thirdNameEn, this.thirdNameEn,
this.yakeenVidaPatientDataStatisticsByPatientIdList, this.yakeenVidaPatientDataStatisticsByPatientIdList,
this.yakeenVidaPatientDataStatisticsList, this.yakeenVidaPatientDataStatisticsList,
this.yakeenVidaPatientDataStatisticsPrefferedList, this.yakeenVidaPatientDataStatisticsPrefferedList,
this.accessToken, this.accessToken,
this.categoryCode, this.categoryCode,
this.categoryNameAr, this.categoryNameAr,
this.categoryNameEn, this.categoryNameEn,
this.constraintCode, this.constraintCode,
this.constraintNameAr, this.constraintNameAr,
this.constraintNameEn, this.constraintNameEn,
this.content, this.content,
this.errorList, this.errorList,
this.licenseExpiryDate, this.licenseExpiryDate,
this.licenseIssuedDate, this.licenseIssuedDate,
this.licenseStatusCode, this.licenseStatusCode,
this.licenseStatusDescAr, this.licenseStatusDescAr,
this.licenseStatusDescEn, this.licenseStatusDescEn,
this.organizations, this.organizations,
this.registrationNumber, this.registrationNumber,
this.specialtyCode, this.specialtyCode,
this.specialtyNameAr, this.specialtyNameAr,
this.specialtyNameEn}); this.specialtyNameEn});
GetPatientInfoResponseModel.fromJson(Map<String, dynamic> json) { GetPatientInfoResponseModel.fromJson(Map<String, dynamic> json) {
date = json['Date']; date = json['Date'];
@ -233,9 +233,9 @@ class GetPatientInfoResponseModel {
occupation = json['Occupation']; occupation = json['Occupation'];
pCDTransactionDataResultList = json['PCDTransactionDataResultList']; pCDTransactionDataResultList = json['PCDTransactionDataResultList'];
pCDGetVidaPatientForManualVerificationList = pCDGetVidaPatientForManualVerificationList =
json['PCD_GetVidaPatientForManualVerificationList']; json['PCD_GetVidaPatientForManualVerificationList'];
pCDNHICHMGPatientDetailsMatchCalulationList = pCDNHICHMGPatientDetailsMatchCalulationList =
json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList']; json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList'];
pCDReturnValue = json['PCD_ReturnValue']; pCDReturnValue = json['PCD_ReturnValue'];
patientStatus = json['PatientStatus']; patientStatus = json['PatientStatus'];
placeofBirth = json['PlaceofBirth']; placeofBirth = json['PlaceofBirth'];
@ -248,11 +248,11 @@ class GetPatientInfoResponseModel {
thirdNameAr = json['ThirdNameAr']; thirdNameAr = json['ThirdNameAr'];
thirdNameEn = json['ThirdNameEn']; thirdNameEn = json['ThirdNameEn'];
yakeenVidaPatientDataStatisticsByPatientIdList = yakeenVidaPatientDataStatisticsByPatientIdList =
json['YakeenVidaPatientDataStatisticsByPatientIdList']; json['YakeenVidaPatientDataStatisticsByPatientIdList'];
yakeenVidaPatientDataStatisticsList = yakeenVidaPatientDataStatisticsList =
json['YakeenVidaPatientDataStatisticsList']; json['YakeenVidaPatientDataStatisticsList'];
yakeenVidaPatientDataStatisticsPrefferedList = yakeenVidaPatientDataStatisticsPrefferedList =
json['YakeenVidaPatientDataStatisticsPrefferedList']; json['YakeenVidaPatientDataStatisticsPrefferedList'];
accessToken = json['accessToken']; accessToken = json['accessToken'];
categoryCode = json['categoryCode']; categoryCode = json['categoryCode'];
categoryNameAr = json['categoryNameAr']; categoryNameAr = json['categoryNameAr'];

@ -1,42 +1,42 @@
class PatientRegistrationModel { class PatientRegistrationModel {
Patientobject patientobject; Patientobject? patientobject;
String patientIdentificationID; String? patientIdentificationID;
String patientMobileNumber; String? patientMobileNumber;
String logInTokenID; String? logInTokenID;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
String zipCode; String? zipCode;
PatientRegistrationModel( PatientRegistrationModel(
{this.patientobject, {this.patientobject,
this.patientIdentificationID, this.patientIdentificationID,
this.patientMobileNumber, this.patientMobileNumber,
this.logInTokenID, this.logInTokenID,
this.versionID, this.versionID,
this.channel, this.channel,
this.languageID, this.languageID,
this.iPAdress, this.iPAdress,
this.generalid, this.generalid,
this.patientOutSA, this.patientOutSA,
this.sessionID, this.sessionID,
this.isDentalAllowedBackend, this.isDentalAllowedBackend,
this.deviceTypeID, this.deviceTypeID,
this.tokenID, this.tokenID,
this.dOB, this.dOB,
this.isHijri, this.isHijri,
this.healthId, this.healthId,
this.zipCode}); this.zipCode});
PatientRegistrationModel.fromJson(Map<String, dynamic> json) { PatientRegistrationModel.fromJson(Map<String, dynamic> json) {
patientobject = json['Patientobject'] != null patientobject = json['Patientobject'] != null
@ -64,7 +64,7 @@ class PatientRegistrationModel {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.patientobject != null) { if (this.patientobject != null) {
data['Patientobject'] = this.patientobject.toJson(); data['Patientobject'] = this.patientobject!.toJson();
} }
data['PatientIdentificationID'] = this.patientIdentificationID; data['PatientIdentificationID'] = this.patientIdentificationID;
data['PatientMobileNumber'] = this.patientMobileNumber; data['PatientMobileNumber'] = this.patientMobileNumber;
@ -88,50 +88,50 @@ class PatientRegistrationModel {
} }
class Patientobject { class Patientobject {
bool tempValue; bool? tempValue;
int patientIdentificationType; int? patientIdentificationType;
String patientIdentificationNo; String? patientIdentificationNo;
int mobileNumber; int? mobileNumber;
int patientOutSA; int? patientOutSA;
String firstNameN; String? firstNameN;
String middleNameN; String? middleNameN;
String lastNameN; String? lastNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
String strDateofBirth; String? strDateofBirth;
String dateofBirth; String? dateofBirth;
int gender; int? gender;
String nationalityID; String? nationalityID;
String dateofBirthN; String? dateofBirthN;
String emailAddress; String? emailAddress;
String sourceType; String? sourceType;
String preferredLanguage; String? preferredLanguage;
String marital; String? marital;
String eHealthIDField; String? eHealthIDField;
Patientobject( Patientobject(
{this.tempValue, {this.tempValue,
this.patientIdentificationType, this.patientIdentificationType,
this.patientIdentificationNo, this.patientIdentificationNo,
this.mobileNumber, this.mobileNumber,
this.patientOutSA, this.patientOutSA,
this.firstNameN, this.firstNameN,
this.middleNameN, this.middleNameN,
this.lastNameN, this.lastNameN,
this.firstName, this.firstName,
this.middleName, this.middleName,
this.lastName, this.lastName,
this.strDateofBirth, this.strDateofBirth,
this.dateofBirth, this.dateofBirth,
this.gender, this.gender,
this.nationalityID, this.nationalityID,
this.dateofBirthN, this.dateofBirthN,
this.emailAddress, this.emailAddress,
this.sourceType, this.sourceType,
this.preferredLanguage, this.preferredLanguage,
this.marital, this.marital,
this.eHealthIDField}); this.eHealthIDField});
Patientobject.fromJson(Map<String, dynamic> json) { Patientobject.fromJson(Map<String, dynamic> json) {
tempValue = json['TempValue']; tempValue = json['TempValue'];

@ -1,54 +1,54 @@
class SendActivationCodeByOTPNotificationTypeForRegistrationModel { class SendActivationCodeByOTPNotificationTypeForRegistrationModel {
int patientMobileNumber; int? patientMobileNumber;
String mobileNo; String? mobileNo;
int projectOutSA; int? projectOutSA;
int loginType; int? loginType;
String zipCode; String? zipCode;
bool isRegister; bool? isRegister;
String logInTokenID; String? logInTokenID;
int searchType; int? searchType;
int patientID; int? patientID;
int nationalID; int? nationalID;
int patientIdentificationID; int? patientIdentificationID;
int oTPSendType; int? oTPSendType;
int languageID; int? languageID;
double versionID; double? versionID;
int channel; int? channel;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
Null sessionID; Null sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String dOB; String? dOB;
int isHijri; int? isHijri;
String healthId; String? healthId;
SendActivationCodeByOTPNotificationTypeForRegistrationModel( SendActivationCodeByOTPNotificationTypeForRegistrationModel(
{this.patientMobileNumber, {this.patientMobileNumber,
this.mobileNo, this.mobileNo,
this.projectOutSA, this.projectOutSA,
this.loginType, this.loginType,
this.zipCode, this.zipCode,
this.isRegister, this.isRegister,
this.logInTokenID, this.logInTokenID,
this.searchType, this.searchType,
this.patientID, this.patientID,
this.nationalID, this.nationalID,
this.patientIdentificationID, this.patientIdentificationID,
this.oTPSendType, this.oTPSendType,
this.languageID, this.languageID,
this.versionID, this.versionID,
this.channel, this.channel,
this.iPAdress, this.iPAdress,
this.generalid, this.generalid,
this.patientOutSA, this.patientOutSA,
this.sessionID, this.sessionID,
this.isDentalAllowedBackend, this.isDentalAllowedBackend,
this.deviceTypeID, this.deviceTypeID,
this.dOB, this.dOB,
this.isHijri, this.isHijri,
this.healthId}); this.healthId});
SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson( SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson(
Map<String, dynamic> json) { Map<String, dynamic> json) {

@ -1,40 +1,40 @@
class GetMedicationForInPatientModel { class GetMedicationForInPatientModel {
String setupID; String? setupID;
int projectID; int? projectID;
int admissionNo; int? admissionNo;
int patientID; int? patientID;
int orderNo; int? orderNo;
int prescriptionNo; int? prescriptionNo;
int lineItemNo; int? lineItemNo;
String prescriptionDatetime; String? prescriptionDatetime;
int itemID; int? itemID;
int directionID; int? directionID;
int refillID; int? refillID;
String dose; String? dose;
int unitofMeasurement; int? unitofMeasurement;
String startDatetime; String? startDatetime;
String stopDatetime; String? stopDatetime;
int noOfDoses; int? noOfDoses;
int routeId; int? routeId;
String comments; String? comments;
int reviewedPharmacist; int? reviewedPharmacist;
dynamic reviewedPharmacistDatetime; dynamic reviewedPharmacistDatetime;
dynamic discountinueDatetime; dynamic discountinueDatetime;
dynamic rescheduleDatetime; dynamic rescheduleDatetime;
int status; int? status;
String statusDescription; String? statusDescription;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
dynamic strength; dynamic strength;
String pHRItemDescription; String? pHRItemDescription;
String pHRItemDescriptionN; String? pHRItemDescriptionN;
String doctorName; String? doctorName;
String uomDescription; String? uomDescription;
String routeDescription; String? routeDescription;
String directionDescription; String? directionDescription;
String refillDescription; String? refillDescription;
GetMedicationForInPatientModel( GetMedicationForInPatientModel(
{this.setupID, {this.setupID,

@ -1,16 +1,16 @@
class GetMedicationForInPatientRequestModel { class GetMedicationForInPatientRequestModel {
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientID; int? patientID;
int admissionNo; int? admissionNo;
String sessionID; String? sessionID;
int projectID; int? projectID;
GetMedicationForInPatientRequestModel( GetMedicationForInPatientRequestModel(
{this.isDentalAllowedBackend, {this.isDentalAllowedBackend,

@ -5,16 +5,19 @@ class CheckActivationCodeForDoctorAppResponseModel {
late List<ListDoctorsClinic>? listDoctorsClinic; late List<ListDoctorsClinic>? listDoctorsClinic;
List<DoctorProfileModel>? listDoctorProfile; List<DoctorProfileModel>? listDoctorProfile;
late MemberInformation? memberInformation; late MemberInformation? memberInformation;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
CheckActivationCodeForDoctorAppResponseModel( CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID, this.listDoctorsClinic, this.memberInformation, {this.authenticationTokenID,
this.listDoctorsClinic,
this.memberInformation,
this.listDoctorProfile, this.listDoctorProfile,
this.vidaAuthTokenID, this.vidaAuthTokenID,
this.vidaRefreshTokenID}); this.vidaRefreshTokenID});
CheckActivationCodeForDoctorAppResponseModel.fromJson(Map<String, dynamic> json) { CheckActivationCodeForDoctorAppResponseModel.fromJson(
Map<String, dynamic> json) {
authenticationTokenID = json['AuthenticationTokenID']; authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) { if (json['List_DoctorsClinic'] != null) {
listDoctorsClinic = []; listDoctorsClinic = [];
@ -32,19 +35,22 @@ class CheckActivationCodeForDoctorAppResponseModel {
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];
vidaRefreshTokenID = json['VidaRefreshTokenID']; vidaRefreshTokenID = json['VidaRefreshTokenID'];
memberInformation = memberInformation = json['memberInformation'] != null
json['memberInformation'] != null ? new MemberInformation.fromJson(json['memberInformation']) : null; ? new MemberInformation.fromJson(json['memberInformation'])
: null;
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
data['AuthenticationTokenID'] = this.authenticationTokenID; data['AuthenticationTokenID'] = this.authenticationTokenID;
if (this.listDoctorsClinic != null) { 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) { 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) { if (this.memberInformation != null) {
data['memberInformation'] = this.memberInformation!.toJson(); data['memberInformation'] = this.memberInformation!.toJson();
@ -61,7 +67,13 @@ class ListDoctorsClinic {
late bool? isActive; late bool? isActive;
late String? clinicName; 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<String, dynamic> json) { ListDoctorsClinic.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID']; setupID = json['SetupID'];

@ -1,7 +1,7 @@
class DiabeticType { class DiabeticType {
int value; int? value;
String nameEn; String? nameEn;
String nameAr; String? nameAr;
DiabeticType({this.value, this.nameEn, this.nameAr}); DiabeticType({this.value, this.nameEn, this.nameAr});

@ -1,22 +1,22 @@
class GetDiabeticChartValuesRequestModel { class GetDiabeticChartValuesRequestModel {
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
int resultType; int? resultType;
int admissionNo; int? admissionNo;
String setupID; String? setupID;
bool patientOutSA; bool? patientOutSA;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
GetDiabeticChartValuesRequestModel( GetDiabeticChartValuesRequestModel(
{this.deviceTypeID, {this.deviceTypeID,
this.patientID, this.patientID,
this.resultType, this.resultType,
this.admissionNo, this.admissionNo,
this.setupID, this.setupID,
this.patientOutSA, this.patientOutSA,
this.patientType, this.patientType,
this.patientTypeID}); this.patientTypeID});
GetDiabeticChartValuesRequestModel.fromJson(Map<String, dynamic> json) { GetDiabeticChartValuesRequestModel.fromJson(Map<String, dynamic> json) {
deviceTypeID = json['DeviceTypeID']; deviceTypeID = json['DeviceTypeID'];

@ -1,18 +1,18 @@
class GetDiabeticChartValuesResponseModel { class GetDiabeticChartValuesResponseModel {
String resultType; String? resultType;
int admissionNo; int? admissionNo;
String dateChart; String? dateChart;
int resultValue; int? resultValue;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
GetDiabeticChartValuesResponseModel( GetDiabeticChartValuesResponseModel(
{this.resultType, {this.resultType,
this.admissionNo, this.admissionNo,
this.dateChart, this.dateChart,
this.resultValue, this.resultValue,
this.createdBy, this.createdBy,
this.createdOn}); this.createdOn});
GetDiabeticChartValuesResponseModel.fromJson(Map<String, dynamic> json) { GetDiabeticChartValuesResponseModel.fromJson(Map<String, dynamic> json) {
resultType = json['ResultType']; resultType = json['ResultType'];

@ -1,16 +1,16 @@
class GetDiagnosisForInPatientRequestModel { class GetDiagnosisForInPatientRequestModel {
int patientID; int? patientID;
int admissionNo; int? admissionNo;
String setupID; String? setupID;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
GetDiagnosisForInPatientRequestModel( GetDiagnosisForInPatientRequestModel(
{this.patientID, {this.patientID,
this.admissionNo, this.admissionNo,
this.setupID, this.setupID,
this.patientType, this.patientType,
this.patientTypeID}); this.patientTypeID});
GetDiagnosisForInPatientRequestModel.fromJson(Map<String, dynamic> json) { GetDiagnosisForInPatientRequestModel.fromJson(Map<String, dynamic> json) {
patientID = json['PatientID']; patientID = json['PatientID'];

@ -1,26 +1,27 @@
class GetDiagnosisForInPatientResponseModel { class GetDiagnosisForInPatientResponseModel {
String iCDCode10ID; String? iCDCode10ID;
int diagnosisTypeID; int? diagnosisTypeID;
int conditionID; int? conditionID;
bool complexDiagnosis; bool? complexDiagnosis;
String asciiDesc; String? asciiDesc;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
int editedBy; int? editedBy;
String editedOn; String? editedOn;
String createdByName; String? createdByName;
String editedByName; String? editedByName;
GetDiagnosisForInPatientResponseModel( GetDiagnosisForInPatientResponseModel(
{this.iCDCode10ID, {this.iCDCode10ID,
this.diagnosisTypeID, this.diagnosisTypeID,
this.conditionID, this.conditionID,
this.complexDiagnosis, this.complexDiagnosis,
this.asciiDesc, this.asciiDesc,
this.createdBy, this.createdBy,
this.createdOn, this.createdOn,
this.editedBy, this.editedBy,
this.editedOn, this.createdByName}); this.editedOn,
this.createdByName});
GetDiagnosisForInPatientResponseModel.fromJson(Map<String, dynamic> json) { GetDiagnosisForInPatientResponseModel.fromJson(Map<String, dynamic> json) {
iCDCode10ID = json['ICDCode10ID']; iCDCode10ID = json['ICDCode10ID'];

@ -1,54 +1,54 @@
class LabResultHistory { class LabResultHistory {
String description; String? description;
String femaleInterpretativeData; String? femaleInterpretativeData;
int gender; int? gender;
bool isCertificateAllowed; bool? isCertificateAllowed;
int lineItemNo; int? lineItemNo;
String maleInterpretativeData; String? maleInterpretativeData;
String notes; String? notes;
int orderLineItemNo; int? orderLineItemNo;
int orderNo; int? orderNo;
String packageID; String? packageID;
int patientID; int? patientID;
String projectID; String? projectID;
String referanceRange; String? referanceRange;
String resultValue; String? resultValue;
int resultValueBasedLineItemNo; int? resultValueBasedLineItemNo;
String resultValueFlag; String? resultValueFlag;
String sampleCollectedOn; String? sampleCollectedOn;
String sampleReceivedOn; String? sampleReceivedOn;
String setupID; String? setupID;
String superVerifiedOn; String? superVerifiedOn;
String testCode; String? testCode;
String uOM; String? uOM;
String verifiedOn; String? verifiedOn;
String verifiedOnDateTime; String? verifiedOnDateTime;
LabResultHistory( LabResultHistory(
{this.description, {this.description,
this.femaleInterpretativeData, this.femaleInterpretativeData,
this.gender, this.gender,
this.isCertificateAllowed, this.isCertificateAllowed,
this.lineItemNo, this.lineItemNo,
this.maleInterpretativeData, this.maleInterpretativeData,
this.notes, this.notes,
this.orderLineItemNo, this.orderLineItemNo,
this.orderNo, this.orderNo,
this.packageID, this.packageID,
this.patientID, this.patientID,
this.projectID, this.projectID,
this.referanceRange, this.referanceRange,
this.resultValue, this.resultValue,
this.resultValueBasedLineItemNo, this.resultValueBasedLineItemNo,
this.resultValueFlag, this.resultValueFlag,
this.sampleCollectedOn, this.sampleCollectedOn,
this.sampleReceivedOn, this.sampleReceivedOn,
this.setupID, this.setupID,
this.superVerifiedOn, this.superVerifiedOn,
this.testCode, this.testCode,
this.uOM, this.uOM,
this.verifiedOn, this.verifiedOn,
this.verifiedOnDateTime}); this.verifiedOnDateTime});
LabResultHistory.fromJson(Map<String, dynamic> json) { LabResultHistory.fromJson(Map<String, dynamic> json) {
description = json['Description']; description = json['Description'];
@ -105,4 +105,4 @@ class LabResultHistory {
data['VerifiedOnDateTime'] = this.verifiedOnDateTime; data['VerifiedOnDateTime'] = this.verifiedOnDateTime;
return data; return data;
} }
} }

@ -5,51 +5,51 @@ class AllSpecialLabResultModel {
dynamic appointmentDate; dynamic appointmentDate;
dynamic appointmentNo; dynamic appointmentNo;
dynamic appointmentTime; dynamic appointmentTime;
String clinicDescription; String? clinicDescription;
String clinicDescriptionEnglish; String? clinicDescriptionEnglish;
dynamic clinicDescriptionN; dynamic clinicDescriptionN;
dynamic clinicID; dynamic clinicID;
dynamic createdOn; dynamic createdOn;
double decimalDoctorRate; double? decimalDoctorRate;
dynamic doctorID; dynamic doctorID;
String doctorImageURL; String? doctorImageURL;
String doctorName; String? doctorName;
String doctorNameEnglish; String? doctorNameEnglish;
dynamic doctorNameN; dynamic doctorNameN;
dynamic doctorRate; dynamic doctorRate;
dynamic doctorStarsRate; dynamic doctorStarsRate;
String doctorTitle; String? doctorTitle;
dynamic gender; dynamic gender;
String genderDescription; String? genderDescription;
bool inOutPatient; bool? inOutPatient;
String invoiceNo; String? invoiceNo;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
dynamic isInOutPatientDescription; dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN; dynamic isInOutPatientDescriptionN;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
bool isRead; bool? isRead;
bool isSendEmail; bool? isSendEmail;
String moduleID; String? moduleID;
String nationalityFlagURL; String? nationalityFlagURL;
dynamic noOfPatientsRate; dynamic noOfPatientsRate;
dynamic orderDate; dynamic orderDate;
String orderNo; String? orderNo;
dynamic patientID; dynamic patientID;
String projectID; String? projectID;
String projectName; String? projectName;
dynamic projectNameN; dynamic projectNameN;
String qR; String? qR;
String resultData; String? resultData;
String resultDataHTML; String? resultDataHTML;
dynamic resultDataTxt; dynamic resultDataTxt;
String setupID; String? setupID;
//List<String> speciality; //List<String> speciality;
dynamic status; dynamic status;
dynamic statusDesc; dynamic statusDesc;
String strOrderDate; String? strOrderDate;
AllSpecialLabResultModel( AllSpecialLabResultModel(
{this.actualDoctorRate, {this.actualDoctorRate,

@ -1,18 +1,18 @@
class AllSpecialLabResultRequestModel { class AllSpecialLabResultRequestModel {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
int patientID; int? patientID;
int projectID; int? projectID;
AllSpecialLabResultRequestModel( AllSpecialLabResultRequestModel(
{this.versionID, {this.versionID,

@ -34,7 +34,8 @@ class LabResult {
this.referanceRange, this.referanceRange,
this.resultValue, this.resultValue,
this.maxValue, this.maxValue,
this.minValue,this.sampleCollectedOn, this.minValue,
this.sampleCollectedOn,
this.sampleReceivedOn, this.sampleReceivedOn,
this.setupID, this.setupID,
this.superVerifiedOn, this.superVerifiedOn,
@ -95,9 +96,9 @@ class LabResult {
int checkResultStatus() { int checkResultStatus() {
try { try {
var max = double.tryParse(maxValue) ?? null; var max = double.tryParse(maxValue!) ?? null;
var min = double.tryParse(minValue) ?? null; var min = double.tryParse(minValue!) ?? null;
var result = double.tryParse(resultValue) ?? null; var result = double.tryParse(resultValue!) ?? null;
if (max != null && min != null && result != null) { if (max != null && min != null && result != null) {
if (result > max) { if (result > max) {
return 1; return 1;
@ -109,10 +110,9 @@ class LabResult {
} else { } else {
return 0; return 0;
} }
}catch (e){ } catch (e) {
return 0; return 0;
} }
} }
} }

@ -1,11 +1,12 @@
class AddPatientToDoctorListRequestModel { class AddPatientToDoctorListRequestModel {
int vCID; int? vCID;
String tokenID; String? tokenID;
String generalid; String? generalid;
int doctorId; int? doctorId;
bool isOutKsa; 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<String, dynamic> json) { AddPatientToDoctorListRequestModel.fromJson(Map<String, dynamic> json) {
vCID = json['VC_ID']; vCID = json['VC_ID'];

@ -1,14 +1,18 @@
import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/config.dart';
class GetNursingProgressNoteRequestModel { class GetNursingProgressNoteRequestModel {
int patientID; int? patientID;
int admissionNo; int? admissionNo;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
String setupID; String? setupID;
GetNursingProgressNoteRequestModel( 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<String, dynamic> json) { GetNursingProgressNoteRequestModel.fromJson(Map<String, dynamic> json) {
patientID = json['PatientID']; patientID = json['PatientID'];

@ -1,14 +1,14 @@
class GetNursingProgressNoteResposeModel { class GetNursingProgressNoteResposeModel {
String notes; String? notes;
dynamic conditionType; dynamic conditionType;
int createdBy; int? createdBy;
String createdOn; String? createdOn;
dynamic editedBy; dynamic editedBy;
dynamic editedOn; dynamic editedOn;
String createdByName; String? createdByName;
String editedByName; String? editedByName;
GetNursingProgressNoteResposeModel( GetNursingProgressNoteResposeModel(
{this.notes, {this.notes,

@ -1,15 +1,15 @@
class PatientSearchRequestModel { class PatientSearchRequestModel {
int ?doctorID; int? doctorID;
String?firstName; String? firstName;
String?middleName; String? middleName;
String?lastName; String? lastName;
String?patientMobileNumber; String? patientMobileNumber;
String?patientIdentificationID; String? patientIdentificationID;
int ?patientID; int? patientID;
String? from; String? from;
String ?to; String? to;
int ?searchType; int? searchType;
int projectID; int? projectID;
String? mobileNo; String? mobileNo;
String? identificationNo; String? identificationNo;
int? nursingStationID; int? nursingStationID;

@ -1,9 +1,10 @@
class GetOrderedProcedureRequestModel { class GetOrderedProcedureRequestModel {
String? vidaAuthTokenID; String? vidaAuthTokenID;
int? patientMRN; int? patientMRN;
int appointmentNo; int? appointmentNo;
GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN, this.appointmentNo}); GetOrderedProcedureRequestModel(
{this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
GetOrderedProcedureRequestModel.fromJson(Map<String, dynamic> json) { GetOrderedProcedureRequestModel.fromJson(Map<String, dynamic> json) {
vidaAuthTokenID = json['VidaAuthTokenID']; vidaAuthTokenID = json['VidaAuthTokenID'];

@ -35,7 +35,7 @@ class MyReferralPatientModel {
int? referralClinic; int? referralClinic;
int? referringClinic; int? referringClinic;
int? referralStatus; int? referralStatus;
DateTime ?referralDate; DateTime? referralDate;
String? referringDoctorRemarks; String? referringDoctorRemarks;
String? referredDoctorRemarks; String? referredDoctorRemarks;
String? referralResponseOn; String? referralResponseOn;
@ -62,15 +62,15 @@ class MyReferralPatientModel {
String? referringClinicDescription; String? referringClinicDescription;
String? referringDoctorName; String? referringDoctorName;
int? referalStatus; int? referalStatus;
String sourceSetupID; String? sourceSetupID;
int sourceProjectId; int? sourceProjectId;
String targetSetupID; String? targetSetupID;
int targetProjectId; int? targetProjectId;
int targetClinicID; int? targetClinicID;
int targetDoctorID; int? targetDoctorID;
int sourceAppointmentNo; int? sourceAppointmentNo;
int targetAppointmentNo; int? targetAppointmentNo;
String remarksFromSource; String? remarksFromSource;
MyReferralPatientModel( MyReferralPatientModel(
{this.rowID, {this.rowID,
@ -113,27 +113,36 @@ class MyReferralPatientModel {
this.referralResponseOn, this.referralResponseOn,
this.priority, this.priority,
this.frequency, this.frequency,
this.mAXResponseTime, this.mAXResponseTime,
this.episodeID, this.episodeID,
this.appointmentNo, this.appointmentNo,
this.appointmentDate, this.appointmentDate,
this.appointmentType, this.appointmentType,
this.patientMRN, this.patientMRN,
this.createdOn, this.createdOn,
this.clinicID, this.clinicID,
this.nationalityID, this.nationalityID,
this.age, this.age,
this.doctorImageURL, this.doctorImageURL,
this.frequencyDescription, this.frequencyDescription,
this.genderDescription, this.genderDescription,
this.isDoctorLate, this.isDoctorLate,
this.isDoctorResponse, this.isDoctorResponse,
this.nationalityFlagURL, this.nationalityFlagURL,
this.nursingStationName, this.nursingStationName,
this.priorityDescription, this.priorityDescription,
this.referringClinicDescription, this.referringClinicDescription,
this.referringDoctorName, this.referringDoctorName,
this.referalStatus, this.sourceSetupID, this.sourceAppointmentNo, this.sourceProjectId, this.targetProjectId, this.targetAppointmentNo, this.targetClinicID, this.targetSetupID, this.targetDoctorID, this.remarksFromSource}); this.referalStatus,
this.sourceSetupID,
this.sourceAppointmentNo,
this.sourceProjectId,
this.targetProjectId,
this.targetAppointmentNo,
this.targetClinicID,
this.targetSetupID,
this.targetDoctorID,
this.remarksFromSource});
MyReferralPatientModel.fromJson(Map<String?, dynamic> json) { MyReferralPatientModel.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID']; rowID = json['RowID'];
@ -219,7 +228,6 @@ class MyReferralPatientModel {
sourceAppointmentNo = json['SourceAppointmentNo']; sourceAppointmentNo = json['SourceAppointmentNo'];
targetAppointmentNo = json['TargetAppointmentNo']; targetAppointmentNo = json['TargetAppointmentNo'];
remarksFromSource = json['RemarksFromSource']; remarksFromSource = json['RemarksFromSource'];
} }
Map<String?, dynamic> toJson() { Map<String?, dynamic> toJson() {
@ -298,6 +306,6 @@ class MyReferralPatientModel {
} }
get patientName { get patientName {
return this.firstName !+ " " + this.lastName!; return this.firstName! + " " + this.lastName!;
} }
} }

@ -1,12 +1,16 @@
class GetSickLeaveDoctorRequestModel { class GetSickLeaveDoctorRequestModel {
int patientMRN; int? patientMRN;
String appointmentNo; String? appointmentNo;
int status; int? status;
String vidaAuthTokenID; String? vidaAuthTokenID;
String vidaRefreshTokenID; String? vidaRefreshTokenID;
GetSickLeaveDoctorRequestModel( GetSickLeaveDoctorRequestModel(
{this.patientMRN, this.appointmentNo, this.status, this.vidaAuthTokenID, this.vidaRefreshTokenID}); {this.patientMRN,
this.appointmentNo,
this.status,
this.vidaAuthTokenID,
this.vidaRefreshTokenID});
GetSickLeaveDoctorRequestModel.fromJson(Map<String, dynamic> json) { GetSickLeaveDoctorRequestModel.fromJson(Map<String, dynamic> json) {
patientMRN = json['PatientMRN']; patientMRN = json['PatientMRN'];

@ -21,13 +21,13 @@ class SickLeavePatientModel {
dynamic doctorTitle; dynamic doctorTitle;
dynamic gender; dynamic gender;
dynamic genderDescription; dynamic genderDescription;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
dynamic isInOutPatientDescription; dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN; dynamic isInOutPatientDescriptionN;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
dynamic noOfPatientsRate; dynamic noOfPatientsRate;
dynamic patientName; dynamic patientName;
dynamic projectName; dynamic projectName;

@ -10,7 +10,7 @@ class SickLeavePatientRequestModel {
int? patientTypeID; int? patientTypeID;
String? tokenID; String? tokenID;
int? patientID; int? patientID;
int patientMRN; int? patientMRN;
String? sessionID; String? sessionID;
SickLeavePatientRequestModel( SickLeavePatientRequestModel(

@ -18,7 +18,8 @@ class DischargeSummaryService extends BaseService {
_allDischargeSummaryList; _allDischargeSummaryList;
Future getPendingDischargeSummary( Future getPendingDischargeSummary(
{required GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async { {required GetDischargeSummaryReqModel
getDischargeSummaryReqModel}) async {
hasError = false; hasError = false;
await baseAppClient.post(GET_PENDING_DISCHARGE_SUMMARY, await baseAppClient.post(GET_PENDING_DISCHARGE_SUMMARY,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
@ -36,7 +37,7 @@ class DischargeSummaryService extends BaseService {
} }
Future getAllDischargeSummary( Future getAllDischargeSummary(
{GetDischargeSummaryReqModel getDischargeSummaryReqModel}) async { {GetDischargeSummaryReqModel? getDischargeSummaryReqModel}) async {
hasError = false; hasError = false;
await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY, await baseAppClient.post(GET_ALL_DISCHARGE_SUMMARY,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
@ -49,6 +50,6 @@ class DischargeSummaryService extends BaseService {
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: getDischargeSummaryReqModel.toJson()); }, body: getDischargeSummaryReqModel!.toJson());
} }
} }

@ -11,12 +11,11 @@ class OperationReportService extends BaseService {
List<GetReservationsResponseModel> get reservationList => _reservationList; List<GetReservationsResponseModel> get reservationList => _reservationList;
List<GetOperationDetailsResponseModel> _operationDetailsList = []; List<GetOperationDetailsResponseModel> _operationDetailsList = [];
List<GetOperationDetailsResponseModel> get operationDetailsList => _operationDetailsList; List<GetOperationDetailsResponseModel> get operationDetailsList =>
_operationDetailsList;
Future getReservations( Future getReservations({required int patientId}) async {
{ GetReservationsRequestModel getReservationsRequestModel =
required int patientId}) async {
getReservationsRequestModel =
GetReservationsRequestModel(patientID: patientId, doctorID: ""); GetReservationsRequestModel(patientID: patientId, doctorID: "");
hasError = false; hasError = false;
@ -35,10 +34,9 @@ class OperationReportService extends BaseService {
}, body: getReservationsRequestModel.toJson()); }, body: getReservationsRequestModel.toJson());
} }
Future getOperationReportDetails( Future getOperationReportDetails({
{required GetOperationDetailsRequestModel getOperationReportRequestModel, required GetOperationDetailsRequestModel getOperationReportRequestModel,
}) async { }) async {
hasError = false; hasError = false;
await baseAppClient.post(GET_OPERATION_DETAILS, await baseAppClient.post(GET_OPERATION_DETAILS,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
@ -46,7 +44,8 @@ class OperationReportService extends BaseService {
_operationDetailsList.clear(); _operationDetailsList.clear();
response['List_OperationDetails'].forEach( response['List_OperationDetails'].forEach(
(v) { (v) {
_operationDetailsList.add(GetOperationDetailsResponseModel.fromJson(v)); _operationDetailsList
.add(GetOperationDetailsResponseModel.fromJson(v));
}, },
); );
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {

@ -43,16 +43,20 @@ class AuthenticationViewModel extends BaseViewModel {
NewLoginInformationModel get loginInfo => _authService.loginInfo; NewLoginInformationModel get loginInfo => _authService.loginInfo;
List<DoctorProfileModel> get doctorProfilesList => _authService.doctorProfilesList; List<DoctorProfileModel> get doctorProfilesList =>
_authService.doctorProfilesList;
SendActivationCodeForDoctorAppResponseModel get activationCodeVerificationScreenRes => SendActivationCodeForDoctorAppResponseModel
_authService.activationCodeVerificationScreenRes; get activationCodeVerificationScreenRes =>
_authService.activationCodeVerificationScreenRes;
SendActivationCodeForDoctorAppResponseModel get activationCodeForDoctorAppRes => SendActivationCodeForDoctorAppResponseModel
_authService.activationCodeForDoctorAppRes; get activationCodeForDoctorAppRes =>
_authService.activationCodeForDoctorAppRes;
CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes => CheckActivationCodeForDoctorAppResponseModel
_authService.checkActivationCodeForDoctorAppRes; get checkActivationCodeForDoctorAppRes =>
_authService.checkActivationCodeForDoctorAppRes;
NewLoginInformationModel? loggedUser; NewLoginInformationModel? loggedUser;
GetIMEIDetailsModel? user; GetIMEIDetailsModel? user;
@ -66,13 +70,12 @@ class AuthenticationViewModel extends BaseViewModel {
bool unverified = false; bool unverified = false;
bool isFromLogin = false; bool isFromLogin = false;
APP_STATUS appStatus = APP_STATUS.LOADING; APP_STATUS appStatus = APP_STATUS.LOADING;
String localToken =""; String localToken = "";
AuthenticationViewModel() { AuthenticationViewModel() {
getDeviceInfoFromFirebase(); getDeviceInfoFromFirebase();
getDoctorProfile(); getDoctorProfile();
} }
/// Insert Device IMEI /// Insert Device IMEI
Future insertDeviceImei(token) async { Future insertDeviceImei(token) async {
var loggedIn = await sharedPref.getObj(LOGGED_IN_USER); var loggedIn = await sharedPref.getObj(LOGGED_IN_USER);
@ -86,19 +89,29 @@ class AuthenticationViewModel extends BaseViewModel {
profileInfo['IMEI'] = token; profileInfo['IMEI'] = token;
profileInfo['LogInTypeID'] = await sharedPref.getInt(OTP_TYPE); profileInfo['LogInTypeID'] = await sharedPref.getInt(OTP_TYPE);
profileInfo['BioMetricEnabled'] = true; profileInfo['BioMetricEnabled'] = true;
profileInfo['MobileNo'] = loggedIn != null ? loggedIn['MobileNumber'] : user!.mobile; profileInfo['MobileNo'] =
InsertIMEIDetailsModel insertIMEIDetailsModel = InsertIMEIDetailsModel.fromJson(profileInfo); loggedIn != null ? loggedIn['MobileNumber'] : user!.mobile;
insertIMEIDetailsModel.genderDescription = profileInfo['Gender_Description']; InsertIMEIDetailsModel insertIMEIDetailsModel =
insertIMEIDetailsModel.genderDescriptionN = profileInfo['Gender_DescriptionN']; InsertIMEIDetailsModel.fromJson(profileInfo);
insertIMEIDetailsModel.genderDescriptionN = profileInfo['Gender_DescriptionN']; insertIMEIDetailsModel.genderDescription =
profileInfo['Gender_Description'];
insertIMEIDetailsModel.genderDescriptionN =
profileInfo['Gender_DescriptionN'];
insertIMEIDetailsModel.genderDescriptionN =
profileInfo['Gender_DescriptionN'];
insertIMEIDetailsModel.titleDescription = profileInfo['Title_Description']; insertIMEIDetailsModel.titleDescription = profileInfo['Title_Description'];
insertIMEIDetailsModel.titleDescriptionN = profileInfo['Title_DescriptionN']; insertIMEIDetailsModel.titleDescriptionN =
profileInfo['Title_DescriptionN'];
insertIMEIDetailsModel.projectID = await sharedPref.getInt(PROJECT_ID); insertIMEIDetailsModel.projectID = await sharedPref.getInt(PROJECT_ID);
insertIMEIDetailsModel.doctorID = insertIMEIDetailsModel.doctorID = loggedIn != null
loggedIn != null ? loggedIn['List_MemberInformation'][0]['MemberID'] : user!.doctorID; ? loggedIn['List_MemberInformation'][0]['MemberID']
insertIMEIDetailsModel.outSA = loggedIn != null ? loggedIn['PatientOutSA'] : user!.outSA; : user!.doctorID;
insertIMEIDetailsModel.vidaAuthTokenID = await sharedPref.getString(VIDA_AUTH_TOKEN_ID); insertIMEIDetailsModel.outSA =
insertIMEIDetailsModel.vidaRefreshTokenID = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); loggedIn != null ? loggedIn['PatientOutSA'] : user!.outSA;
insertIMEIDetailsModel.vidaAuthTokenID =
await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
insertIMEIDetailsModel.vidaRefreshTokenID =
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
insertIMEIDetailsModel.password = userInfo.password; insertIMEIDetailsModel.password = userInfo.password;
await _authService.insertDeviceImei(insertIMEIDetailsModel); await _authService.insertDeviceImei(insertIMEIDetailsModel);
@ -127,20 +140,23 @@ class AuthenticationViewModel extends BaseViewModel {
} }
/// send activation code for for msg methods /// send activation code for for msg methods
Future sendActivationCodeVerificationScreen(AuthMethodTypes authMethodType) async { Future sendActivationCodeVerificationScreen(
AuthMethodTypes authMethodType) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
ActivationCodeForVerificationScreenModel activationCodeModel = ActivationCodeForVerificationScreenModel( ActivationCodeForVerificationScreenModel activationCodeModel =
iMEI: user!.iMEI, ActivationCodeForVerificationScreenModel(
facilityId: user!.projectID, iMEI: user!.iMEI,
memberID: user!.doctorID, facilityId: user!.projectID,
loginDoctorID: int.parse(user!.editedBy.toString()), memberID: user!.doctorID,
zipCode: user!.outSA == true ? '971' : '966', loginDoctorID: int.parse(user!.editedBy.toString()),
mobileNumber: user!.mobile, zipCode: user!.outSA == true ? '971' : '966',
oTPSendType: authMethodType.getTypeIdService(), mobileNumber: user!.mobile,
isMobileFingerPrint: 1, oTPSendType: authMethodType.getTypeIdService(),
vidaAuthTokenID: user!.vidaAuthTokenID, isMobileFingerPrint: 1,
vidaRefreshTokenID: user!.vidaRefreshTokenID); vidaAuthTokenID: user!.vidaAuthTokenID,
await _authService.sendActivationCodeVerificationScreen(activationCodeModel); vidaRefreshTokenID: user!.vidaRefreshTokenID);
await _authService
.sendActivationCodeVerificationScreen(activationCodeModel);
if (_authService.hasError) { if (_authService.hasError) {
error = _authService.error!; error = _authService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -149,56 +165,73 @@ class AuthenticationViewModel extends BaseViewModel {
} }
/// send activation code for silent login /// send activation code for silent login
Future sendActivationCodeForDoctorApp({required AuthMethodTypes authMethodType, required String password}) async { Future sendActivationCodeForDoctorApp(
{required AuthMethodTypes authMethodType,
required String password}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
int projectID = await sharedPref.getInt(PROJECT_ID); int projectID = await sharedPref.getInt(PROJECT_ID);
ActivationCodeModel activationCodeModel = ActivationCodeModel( ActivationCodeModel activationCodeModel = ActivationCodeModel(
facilityId: projectID, facilityId: projectID,
memberID: loggedUser!.listMemberInformation![0].memberID, memberID: loggedUser!.listMemberInformation![0].memberID,
loginDoctorID: loggedUser!.listMemberInformation![0].employeeID, loginDoctorID: loggedUser!.listMemberInformation![0].employeeID,
otpSendType: authMethodType.getTypeIdService().toString(), otpSendType: authMethodType.getTypeIdService().toString(),
); );
await _authService.sendActivationCodeForDoctorApp(activationCodeModel); await _authService.sendActivationCodeForDoctorApp(activationCodeModel);
if (_authService.hasError) { if (_authService.hasError) {
error = _authService.error!; error = _authService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
await sharedPref.setString(TOKEN, await sharedPref.setString(
_authService.activationCodeForDoctorAppRes.logInTokenID!); TOKEN, _authService.activationCodeForDoctorAppRes.logInTokenID!);
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
/// check activation code for sms and whats app /// check activation code for sms and whats app
Future checkActivationCodeForDoctorApp({required String activationCode,bool isSilentLogin = false}) async { Future checkActivationCodeForDoctorApp(
{required String activationCode, bool isSilentLogin = false}) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
CheckActivationCodeRequestModel checkActivationCodeForDoctorApp = new CheckActivationCodeRequestModel( CheckActivationCodeRequestModel checkActivationCodeForDoctorApp =
zipCode: loggedUser != null ? loggedUser!.zipCode : user!.zipCode, new CheckActivationCodeRequestModel(
mobileNumber: loggedUser != null ? loggedUser!.mobileNumber : user!.mobile, zipCode: loggedUser != null ? loggedUser!.zipCode : user!.zipCode,
projectID: await sharedPref.getInt(PROJECT_ID) != null ? await sharedPref.getInt(PROJECT_ID) : user!.projectID, mobileNumber:
logInTokenID: await sharedPref.getString(TOKEN), loggedUser != null ? loggedUser!.mobileNumber : user!.mobile,
activationCode: activationCode, projectID: await sharedPref.getInt(PROJECT_ID) != null
memberID:userInfo.userID!=null? int.parse(userInfo!.userID!):user!.doctorID , ? await sharedPref.getInt(PROJECT_ID)
password: userInfo.password, : user!.projectID,
facilityId:userInfo.projectID!=null? userInfo.projectID.toString():user!.projectID.toString(), logInTokenID: await sharedPref.getString(TOKEN),
oTPSendType: await sharedPref.getInt(OTP_TYPE), activationCode: activationCode,
iMEI: localToken, memberID: userInfo.userID != null
loginDoctorID:userInfo.userID!=null? int.parse(userInfo!.userID!):user!.editedBy,// loggedUser.listMemberInformation[0].employeeID, ? int.parse(userInfo!.userID!)
isForSilentLogin:isSilentLogin, : user!.doctorID,
generalid: "Cs2020@2016\$2958"); password: userInfo.password,
await _authService.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp); facilityId: userInfo.projectID != null
? userInfo.projectID.toString()
: user!.projectID.toString(),
oTPSendType: await sharedPref.getInt(OTP_TYPE),
iMEI: localToken,
loginDoctorID: userInfo.userID != null
? int.parse(userInfo!.userID!)
: user!
.editedBy, // loggedUser.listMemberInformation[0].employeeID,
isForSilentLogin: isSilentLogin,
generalid: "Cs2020@2016\$2958");
await _authService
.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp);
if (_authService.hasError) { if (_authService.hasError) {
error = _authService.error!; error = _authService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
await setDataAfterSendActivationSuccess(checkActivationCodeForDoctorAppRes); await setDataAfterSendActivationSuccess(
checkActivationCodeForDoctorAppRes);
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
/// get list of Hospitals /// get list of Hospitals
Future getHospitalsList(memberID) async { Future getHospitalsList(memberID) async {
GetHospitalsRequestModel getHospitalsRequestModel = GetHospitalsRequestModel(); GetHospitalsRequestModel getHospitalsRequestModel =
GetHospitalsRequestModel();
getHospitalsRequestModel.memberID = memberID; getHospitalsRequestModel.memberID = memberID;
await _hospitalsService.getHospitals(getHospitalsRequestModel); await _hospitalsService.getHospitals(getHospitalsRequestModel);
if (_hospitalsService.hasError) { if (_hospitalsService.hasError) {
@ -230,13 +263,15 @@ class AuthenticationViewModel extends BaseViewModel {
} }
/// add  token to shared preferences in case of send activation code is success /// add  token to shared preferences in case of send activation code is success
setDataAfterSendActivationSuccess(CheckActivationCodeForDoctorAppResponseModel sendActivationCodeForDoctorAppResponseModel)async { setDataAfterSendActivationSuccess(
// print("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode); CheckActivationCodeForDoctorAppResponseModel
await sharedPref.setString(VIDA_AUTH_TOKEN_ID, sendActivationCodeForDoctorAppResponseModel) async {
sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID); // print("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, await sharedPref.setString(VIDA_AUTH_TOKEN_ID,
sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID); sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID!);
await sharedPref.setString(TOKEN, await sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID!);
await sharedPref.setString(TOKEN,
sendActivationCodeForDoctorAppResponseModel.authenticationTokenID!); sendActivationCodeForDoctorAppResponseModel.authenticationTokenID!);
} }
@ -275,7 +310,9 @@ class AuthenticationViewModel extends BaseViewModel {
clinicID: clinicInfo.clinicID, clinicID: clinicInfo.clinicID,
license: true, license: true,
projectID: clinicInfo.projectID, projectID: clinicInfo.projectID,
languageID: 2);///TODO change the lan languageID: 2);
///TODO change the lan
await _authService.getDoctorProfileBasedOnClinic(docInfo); await _authService.getDoctorProfileBasedOnClinic(docInfo);
if (_authService.hasError) { if (_authService.hasError) {
error = _authService.error!; error = _authService.error!;
@ -288,13 +325,17 @@ class AuthenticationViewModel extends BaseViewModel {
/// add some logic in case of check activation code is success /// add some logic in case of check activation code is success
onCheckActivationCodeSuccess({bool isSilentLogin = false}) async { onCheckActivationCodeSuccess({bool isSilentLogin = false}) async {
sharedPref.setString(TOKEN, checkActivationCodeForDoctorAppRes.authenticationTokenID!); sharedPref.setString(
TOKEN, checkActivationCodeForDoctorAppRes.authenticationTokenID!);
if (checkActivationCodeForDoctorAppRes.listDoctorProfile != null && if (checkActivationCodeForDoctorAppRes.listDoctorProfile != null &&
checkActivationCodeForDoctorAppRes.listDoctorProfile!.isNotEmpty) { checkActivationCodeForDoctorAppRes.listDoctorProfile!.isNotEmpty) {
localSetDoctorProfile(checkActivationCodeForDoctorAppRes.listDoctorProfile![0]); localSetDoctorProfile(
checkActivationCodeForDoctorAppRes.listDoctorProfile![0]);
} else { } else {
sharedPref.setObj(CLINIC_NAME, checkActivationCodeForDoctorAppRes.listDoctorsClinic); sharedPref.setObj(
ClinicModel clinic = ClinicModel.fromJson(checkActivationCodeForDoctorAppRes.listDoctorsClinic![0].toJson()); CLINIC_NAME, checkActivationCodeForDoctorAppRes.listDoctorsClinic);
ClinicModel clinic = ClinicModel.fromJson(
checkActivationCodeForDoctorAppRes.listDoctorsClinic![0].toJson());
await getDoctorProfileBasedOnClinic(clinic); await getDoctorProfileBasedOnClinic(clinic);
} }
} }
@ -336,13 +377,13 @@ class AuthenticationViewModel extends BaseViewModel {
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
if (_authService.dashboardItemsList.length > 0) { if (_authService.dashboardItemsList.length > 0) {
user =_authService.dashboardItemsList[0]; user = _authService.dashboardItemsList[0];
sharedPref.setObj( sharedPref.setObj(
LAST_LOGIN_USER, _authService.dashboardItemsList[0]); LAST_LOGIN_USER, _authService.dashboardItemsList[0]);
await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, await sharedPref.setString(
user!.vidaRefreshTokenID!); VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!);
await sharedPref.setString(VIDA_AUTH_TOKEN_ID, await sharedPref.setString(
user!.vidaAuthTokenID!); VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!);
this.unverified = true; this.unverified = true;
} }
setState(ViewState.Idle); setState(ViewState.Idle);
@ -352,7 +393,6 @@ class AuthenticationViewModel extends BaseViewModel {
} }
} }
/// determine the status of the app /// determine the status of the app
APP_STATUS get status { APP_STATUS get status {
if (state == ViewState.Busy) { if (state == ViewState.Busy) {

@ -14,16 +14,20 @@ class DischargeSummaryViewModel extends BaseViewModel {
List<GetDischargeSummaryResModel> get pendingDischargeSummaryList => List<GetDischargeSummaryResModel> get pendingDischargeSummaryList =>
_dischargeSummaryService.pendingDischargeSummaryList; _dischargeSummaryService.pendingDischargeSummaryList;
List<GetDischargeSummaryResModel> get allDisChargeSummaryList => List<GetDischargeSummaryResModel> get allDisChargeSummaryList =>
_dischargeSummaryService.allDischargeSummaryList; _dischargeSummaryService.allDischargeSummaryList;
Future getPendingDischargeSummary({
Future getPendingDischargeSummary({required int patientId, required int admissionNo, }) async { required int patientId,
GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId ); required int admissionNo,
}) async {
GetDischargeSummaryReqModel getDischargeSummaryReqModel =
GetDischargeSummaryReqModel(
admissionNo: admissionNo, patientID: patientId);
hasError = false; hasError = false;
setState(ViewState.Busy); setState(ViewState.Busy);
await _dischargeSummaryService.getPendingDischargeSummary(getDischargeSummaryReqModel: getDischargeSummaryReqModel); await _dischargeSummaryService.getPendingDischargeSummary(
getDischargeSummaryReqModel: getDischargeSummaryReqModel);
if (_dischargeSummaryService.hasError) { if (_dischargeSummaryService.hasError) {
error = _dischargeSummaryService.error!; error = _dischargeSummaryService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
@ -32,19 +36,22 @@ class DischargeSummaryViewModel extends BaseViewModel {
} }
} }
Future getAllDischargeSummary({
int? patientId,
Future getAllDischargeSummary({int patientId, int admissionNo, }) async { int? admissionNo,
GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId ); }) async {
GetDischargeSummaryReqModel getDischargeSummaryReqModel =
GetDischargeSummaryReqModel(
admissionNo: admissionNo!, patientID: patientId!);
hasError = false; hasError = false;
setState(ViewState.Busy); setState(ViewState.Busy);
await _dischargeSummaryService.getAllDischargeSummary(getDischargeSummaryReqModel: getDischargeSummaryReqModel); await _dischargeSummaryService.getAllDischargeSummary(
getDischargeSummaryReqModel: getDischargeSummaryReqModel);
if (_dischargeSummaryService.hasError) { if (_dischargeSummaryService.hasError) {
error = _dischargeSummaryService.error; error = _dischargeSummaryService.error!;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);
} else { } else {
setState(ViewState.Idle); setState(ViewState.Idle);
} }
} }
} }

@ -42,7 +42,10 @@ class _DiabeticChartState extends State<DiabeticChart> {
DiabeticType(nameAr: "Urine Glucose", nameEn: "Urine Glucose", value: 1), DiabeticType(nameAr: "Urine Glucose", nameEn: "Urine Glucose", value: 1),
DiabeticType(nameAr: "Urine Acet", nameEn: "Urine Acet", value: 2), DiabeticType(nameAr: "Urine Acet", nameEn: "Urine Acet", value: 2),
DiabeticType(nameAr: "Blood Glucose", nameEn: "Blood Glucose", value: 3), DiabeticType(nameAr: "Blood Glucose", nameEn: "Blood Glucose", value: 3),
DiabeticType(nameAr: "Blood Glucose(Glucometer)", nameEn: "Blood Glucose(Glucometer)", value: 4) DiabeticType(
nameAr: "Blood Glucose(Glucometer)",
nameEn: "Blood Glucose(Glucometer)",
value: 4)
]; ];
late DiabeticType selectedDiabeticType; late DiabeticType selectedDiabeticType;
@ -56,7 +59,8 @@ class _DiabeticChartState extends State<DiabeticChart> {
onModelReady: (model) async { onModelReady: (model) async {
selectedDiabeticType = diabeticType[2]; selectedDiabeticType = diabeticType[2];
await model.getDiabeticChartValues(patient, selectedDiabeticType.value, isLocalBusy: false); await model.getDiabeticChartValues(patient, selectedDiabeticType.value!,
isLocalBusy: false);
generateData(model); generateData(model);
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -70,84 +74,69 @@ class _DiabeticChartState extends State<DiabeticChart> {
child: Column( child: Column(
children: [ children: [
Container( Container(
width: MediaQuery.of(context).size.width * 0.7, width: MediaQuery.of(context).size.width * 0.7,
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton( child: DropdownButton(
dropdownColor: Colors.white, dropdownColor: Colors.white,
iconEnabledColor: Colors.black, iconEnabledColor: Colors.black,
isExpanded: true, isExpanded: true,
value: selectedDiabeticType.value, value: selectedDiabeticType.value,
iconSize: 25, iconSize: 25,
elevation: 16, elevation: 16,
selectedItemBuilder: (BuildContext context) { selectedItemBuilder: (BuildContext context) {
return diabeticType return diabeticType.map((item) {
.map((item) { return Row(
return Row( mainAxisSize: MainAxisSize.max,
mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.end,
mainAxisAlignment: children: <Widget>[
MainAxisAlignment.end, Column(
children: <Widget>[ mainAxisAlignment: MainAxisAlignment.center,
Column( children: [
mainAxisAlignment: Container(
MainAxisAlignment.center, padding: EdgeInsets.all(2),
children: [ margin: EdgeInsets.all(2),
Container( decoration: new BoxDecoration(
color: Colors.red[800],
padding: EdgeInsets.all(2), borderRadius: BorderRadius.circular(20),
margin: EdgeInsets.all(2), ),
decoration: new BoxDecoration( constraints: BoxConstraints(
color: Colors.red[800], minWidth: 20,
borderRadius: minHeight: 20,
BorderRadius.circular( ),
20), child: Center(
), child: AppText(
constraints: BoxConstraints( diabeticType.length.toString(),
minWidth: 20, color: Colors.white,
minHeight: 20, fontSize:
), projectsProvider.isArabic ? 10 : 11,
child: Center( textAlign: TextAlign.center,
child: AppText( ),
diabeticType )),
.length
.toString(),
color: Colors.white,
fontSize: projectsProvider
.isArabic
? 10
: 11,
textAlign:
TextAlign.center,
),
)),
],
),
AppText(
selectedDiabeticType.nameEn,
fontSize: 12,
color: Colors.black,
fontWeight: FontWeight.bold,
textAlign: TextAlign.end),
], ],
);
}).toList();
},
onChanged: (newValue) async {
await onChangeFunc(newValue, model, patient);
setState(() {
});
},
items: diabeticType
.map((item) {
return DropdownMenuItem(
child: AppText(
item.nameEn,
textAlign: TextAlign.left,
), ),
value: item.value, AppText(selectedDiabeticType.nameEn,
); fontSize: 12,
}).toList(), color: Colors.black,
)), fontWeight: FontWeight.bold,
textAlign: TextAlign.end),
],
);
}).toList();
},
onChanged: (newValue) async {
await onChangeFunc(newValue, model, patient);
setState(() {});
},
items: diabeticType.map((item) {
return DropdownMenuItem(
child: AppText(
item.nameEn,
textAlign: TextAlign.left,
),
value: item.value,
);
}).toList(),
)),
), ),
timeSeriesData1.length != 0 || timeSeriesData2.length != 0 timeSeriesData1.length != 0 || timeSeriesData2.length != 0
? Padding( ? Padding(
@ -155,14 +144,13 @@ class _DiabeticChartState extends State<DiabeticChart> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 8), margin: EdgeInsets.symmetric(horizontal: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(12)), borderRadius: BorderRadius.circular(12)),
child: LineChartForDiabetic( child: LineChartForDiabetic(
title: selectedDiabeticType.nameEn, title: selectedDiabeticType.nameEn!,
isOX: false, isOX: false,
timeSeries1: timeSeriesData1, timeSeries1: timeSeriesData1,
// timeSeries2: timeSeriesData2, // timeSeries2: timeSeriesData2,
@ -211,21 +199,21 @@ class _DiabeticChartState extends State<DiabeticChart> {
model.diabeticChartValuesList.toList().forEach( model.diabeticChartValuesList.toList().forEach(
(element) { (element) {
DateTime elementDate = DateTime elementDate =
AppDateUtils.getDateTimeFromServerFormat(element.dateChart); AppDateUtils.getDateTimeFromServerFormat(element.dateChart!);
if (element.resultValue.toInt() != 0) if (element.resultValue!.toInt() != 0)
timeSeriesData1.add( timeSeriesData1.add(
TimeSeriesSales2( TimeSeriesSales2(
new DateTime( new DateTime(
elementDate.year, elementDate.month, elementDate.day), elementDate.year, elementDate.month, elementDate.day),
element.resultValue.toDouble(), element.resultValue!.toDouble(),
), ),
); );
if (element.resultValue.toInt() != 0) if (element.resultValue!.toInt() != 0)
timeSeriesData2.add( timeSeriesData2.add(
TimeSeriesSales2( TimeSeriesSales2(
new DateTime( new DateTime(
elementDate.year, elementDate.month, elementDate.day), elementDate.year, elementDate.month, elementDate.day),
element.resultValue.toDouble(), element.resultValue!.toDouble(),
), ),
); );
}, },
@ -236,20 +224,17 @@ class _DiabeticChartState extends State<DiabeticChart> {
onChangeFunc(newValue, PatientViewModel model, patient) async { onChangeFunc(newValue, PatientViewModel model, patient) async {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
setState(() { setState(() {
selectedDiabeticType = diabeticType[newValue-1]; selectedDiabeticType = diabeticType[newValue - 1];
timeSeriesData1.clear(); timeSeriesData1.clear();
timeSeriesData2.clear(); timeSeriesData2.clear();
}); });
await model.getDiabeticChartValues(patient, selectedDiabeticType.value,isLocalBusy:true); await model.getDiabeticChartValues(patient, selectedDiabeticType.value!,
if(model.state == ViewState.ErrorLocal){ isLocalBusy: true);
if (model.state == ViewState.ErrorLocal) {
Helpers.showErrorToast(model.error); Helpers.showErrorToast(model.error);
} }
generateData(model); generateData(model);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
} }
} }

@ -12,8 +12,10 @@ import 'package:provider/provider.dart';
class DiabeticDetails extends StatefulWidget { class DiabeticDetails extends StatefulWidget {
final List<GetDiabeticChartValuesResponseModel> diabeticDetailsList; final List<GetDiabeticChartValuesResponseModel> diabeticDetailsList;
DiabeticDetails( DiabeticDetails({
{Key? key, required this.diabeticDetailsList,}); Key? key,
required this.diabeticDetailsList,
});
@override @override
_VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState(); _VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState();
@ -40,7 +42,6 @@ class _VitalSignDetailsWidgetState extends State<DiabeticDetails> {
TranslationBase.of(context).date, TranslationBase.of(context).date,
fontSize: SizeConfig.textMultiplier * 1.5, fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
), ),
// height: 60, // height: 60,
@ -52,7 +53,7 @@ class _VitalSignDetailsWidgetState extends State<DiabeticDetails> {
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: Container( child: Container(
child: AppText( child: AppText(
"Result", "Result",
fontSize: SizeConfig.textMultiplier * 1.5, fontSize: SizeConfig.textMultiplier * 1.5,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Poppins', fontFamily: 'Poppins',
@ -70,7 +71,8 @@ class _VitalSignDetailsWidgetState extends State<DiabeticDetails> {
), ),
Table( Table(
border: TableBorder( border: TableBorder(
horizontalInside: BorderSide(width: 1.0, color: Colors.grey[300]!), horizontalInside:
BorderSide(width: 1.0, color: Colors.grey[300]!),
), ),
children: fullData(projectViewModel), children: fullData(projectViewModel),
), ),
@ -85,7 +87,7 @@ class _VitalSignDetailsWidgetState extends State<DiabeticDetails> {
widget.diabeticDetailsList.forEach((diabetic) { widget.diabeticDetailsList.forEach((diabetic) {
var data = diabetic.resultValue; var data = diabetic.resultValue;
DateTime elementDate = DateTime elementDate =
AppDateUtils.getDateTimeFromServerFormat(diabetic.dateChart); AppDateUtils.getDateTimeFromServerFormat(diabetic.dateChart!);
if (data != 0) if (data != 0)
tableRow.add(TableRow(children: [ tableRow.add(TableRow(children: [
Container( Container(

@ -50,10 +50,11 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
print(type); print(type);
GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel = GetDiagnosisForInPatientRequestModel getDiagnosisForInPatientRequestModel =
GetDiagnosisForInPatientRequestModel( GetDiagnosisForInPatientRequestModel(
admissionNo: int.parse(patient!.admissionNo!), admissionNo: int.parse(patient!.admissionNo!),
patientTypeID: patient!.patientType!, patientTypeID: patient!.patientType!,
patientID: patient.patientId, setupID: "010266"); patientID: patient.patientId,
setupID: "010266");
model.getDiagnosisForInPatient(getDiagnosisForInPatientRequestModel); model.getDiagnosisForInPatient(getDiagnosisForInPatientRequestModel);
} }
@ -76,8 +77,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
), ),
body: model.diagnosisForInPatientList == null || body: model.diagnosisForInPatientList == null ||
model.diagnosisForInPatientList.length == 0 model.diagnosisForInPatientList.length == 0
? DrAppEmbeddedError( ? DrAppEmbeddedError(error: TranslationBase.of(context).noItem!)
error: TranslationBase.of(context).noItem!)
: Container( : Container(
color: Colors.grey[200], color: Colors.grey[200],
child: Column( child: Column(
@ -85,8 +85,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
Expanded( Expanded(
child: Container( child: Container(
child: ListView.builder( child: ListView.builder(
itemCount: itemCount: model.diagnosisForInPatientList.length,
model.diagnosisForInPatientList.length,
itemBuilder: (BuildContext ctxt, int index) { itemBuilder: (BuildContext ctxt, int index) {
return FractionallySizedBox( return FractionallySizedBox(
widthFactor: 0.95, widthFactor: 0.95,
@ -160,7 +159,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
.getDateTimeFromServerFormat(model .getDateTimeFromServerFormat(model
.diagnosisForInPatientList[ .diagnosisForInPatientList[
index] index]
.createdOn), .createdOn!),
isArabic: isArabic:
projectViewModel projectViewModel
.isArabic, .isArabic,
@ -186,7 +185,7 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
.getDateTimeFromServerFormat(model .getDateTimeFromServerFormat(model
.diagnosisForInPatientList[ .diagnosisForInPatientList[
index] index]
.createdOn)) .createdOn!))
: AppDateUtils.getHour( : AppDateUtils.getHour(
DateTime.now()), DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -207,9 +206,9 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText( AppText(
TranslationBase.of( TranslationBase.of(context)
context) .icd! +
.icd! + " : ", " : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
@ -228,16 +227,17 @@ class _ProgressNoteState extends State<DiagnosisScreen> {
), ),
Row( Row(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment.start,
children: [ children: [
AppText("Ascii Desc : ", AppText(
"Ascii Desc : ",
fontSize: 12, fontSize: 12,
), ),
Expanded( Expanded(
child: AppText( child: AppText(
model model
.diagnosisForInPatientList[ .diagnosisForInPatientList[
index] index]
.asciiDesc, .asciiDesc,
fontSize: 12, fontSize: 12,
isCopyable: true, isCopyable: true,

@ -19,7 +19,8 @@ class LabResultHistoryDetailsWidget extends StatefulWidget {
_VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState(); _VitalSignDetailsWidgetState createState() => _VitalSignDetailsWidgetState();
} }
class _VitalSignDetailsWidgetState extends State<LabResultHistoryDetailsWidget> { class _VitalSignDetailsWidgetState
extends State<LabResultHistoryDetailsWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
@ -85,7 +86,7 @@ class _VitalSignDetailsWidgetState extends State<LabResultHistoryDetailsWidget>
List<TableRow> fullData(ProjectViewModel projectViewModel) { List<TableRow> fullData(ProjectViewModel projectViewModel) {
List<TableRow> tableRow = []; List<TableRow> tableRow = [];
widget.labResultHistory.forEach((vital) { widget.labResultHistory.forEach((vital) {
var date = AppDateUtils.convertStringToDate(vital.verifiedOnDateTime); var date = AppDateUtils.convertStringToDate(vital.verifiedOnDateTime!);
tableRow.add(TableRow(children: [ tableRow.add(TableRow(children: [
Container( Container(
child: Container( child: Container(
@ -113,4 +114,4 @@ class _VitalSignDetailsWidgetState extends State<LabResultHistoryDetailsWidget>
}); });
return tableRow; return tableRow;
} }
} }

@ -110,10 +110,10 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
height: 160, height: 160,
decoration: BoxDecoration( decoration: BoxDecoration(
color: model.allSpecialLabList[index] color: model.allSpecialLabList[index]
.isLiveCareAppointment .isLiveCareAppointment!
? Colors.red[900] ? Colors.red[900]
: !model.allSpecialLabList[index] : !model.allSpecialLabList[index]
.isInOutPatient .isInOutPatient!
? Colors.black ? Colors.black
: Color(0xffa9a089), : Color(0xffa9a089),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@ -135,12 +135,12 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
child: Center( child: Center(
child: Text( child: Text(
model.allSpecialLabList[index] model.allSpecialLabList[index]
.isLiveCareAppointment .isLiveCareAppointment!
? TranslationBase.of(context) ? TranslationBase.of(context)
.liveCare! .liveCare!
.toUpperCase() .toUpperCase()
: !model.allSpecialLabList[index] : !model.allSpecialLabList[index]
.isInOutPatient .isInOutPatient!
? TranslationBase.of(context) ? TranslationBase.of(context)
.inPatientLabel! .inPatientLabel!
.toUpperCase() .toUpperCase()
@ -159,21 +159,21 @@ class _AllLabSpecialResultState extends State<AllLabSpecialResult> {
FadePage( FadePage(
page: SpecialLabResultDetailsPage( page: SpecialLabResultDetailsPage(
resultData: model.allSpecialLabList[index] resultData: model.allSpecialLabList[index]
.resultDataHTML, .resultDataHTML!,
patient: patient, patient: patient,
), ),
), ),
), ),
doctorName: doctorName:
model.allSpecialLabList[index].doctorName, model.allSpecialLabList[index].doctorName!,
invoiceNO: invoiceNO:
' ${model.allSpecialLabList[index].invoiceNo}', ' ${model.allSpecialLabList[index].invoiceNo}',
profileUrl: model profileUrl: model
.allSpecialLabList[index].doctorImageURL, .allSpecialLabList[index].doctorImageURL!,
branch: branch:
model.allSpecialLabList[index].projectName, model.allSpecialLabList[index].projectName!,
clinic: model clinic: model.allSpecialLabList[index]
.allSpecialLabList[index].clinicDescription, .clinicDescription!,
appointmentDate: appointmentDate:
AppDateUtils.getDateTimeFromServerFormat( AppDateUtils.getDateTimeFromServerFormat(
model.allSpecialLabList[index].createdOn, model.allSpecialLabList[index].createdOn,

@ -14,21 +14,21 @@ import 'package:html_editor_enhanced/html_editor.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
class AddVerifyMedicalReport extends StatefulWidget { class AddVerifyMedicalReport extends StatefulWidget {
final PatiantInformtion patient; final PatiantInformtion? patient;
final String?patientType; final String? patientType;
final String? arrivalType; final String? arrivalType;
final MedicalReportModel? medicalReport; final MedicalReportModel? medicalReport;
final PatientMedicalReportViewModel model; final PatientMedicalReportViewModel? model;
final MedicalReportStatus? status; final MedicalReportStatus? status;
final String? medicalNote; final String? medicalNote;
const AddVerifyMedicalReport( const AddVerifyMedicalReport(
{Key? key, {Key? key,
required this.patient, this.patient,
this.patientType, this.patientType,
this.arrivalType, this.arrivalType,
this.medicalReport, this.medicalReport,
required this.model, this.model,
this.status, this.status,
this.medicalNote}) this.medicalNote})
: super(key: key); : super(key: key);
@ -69,13 +69,26 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
children: [ children: [
if (model.medicalReportTemplate.length > 0) if (model.medicalReportTemplate.length > 0)
HtmlRichEditor( HtmlRichEditor(
initialText: (widget.medicalReport != null initialText: (widget.medicalReport !=
null
? widget.medicalNote ? widget.medicalNote
: widget.model.medicalReportTemplate[0].templateText!.length > 0 : widget
? widget.model.medicalReportTemplate[0].templateText .model!
.medicalReportTemplate[
0]
.templateText!
.length >
0
? widget
.model!
.medicalReportTemplate[0]
.templateText
: ""), : ""),
hint: "Write the medical report ", hint: "Write the medical report ",
height: MediaQuery.of(context).size.height * 0.75, controller: _controller, height:
MediaQuery.of(context).size.height *
0.75,
controller: _controller,
), ),
], ],
), ),
@ -106,22 +119,30 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
if (txtOfMedicalReport.isNotEmpty) { if (txtOfMedicalReport.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
widget.medicalReport != null widget.medicalReport != null
?await widget.model.updateMedicalReport( ? await widget.model!.updateMedicalReport(
widget.patient, widget.patient!,
txtOfMedicalReport, txtOfMedicalReport,
widget.medicalReport != null ? widget.medicalReport!.lineItemNo : null, widget.medicalReport != null
widget.medicalReport != null ? widget.medicalReport!.invoiceNo : null) ? widget.medicalReport!.lineItemNo
: await widget.model.addMedicalReport(widget.patient, txtOfMedicalReport); : null,
widget.medicalReport != null
? widget.medicalReport!.invoiceNo
: null)
: await widget.model!.addMedicalReport(
widget.patient!, txtOfMedicalReport);
//model.getMedicalReportList(patient); //model.getMedicalReportList(patient);
Navigator.pop(context); Navigator.pop(context);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
if (widget.model.state == ViewState.ErrorLocal) { if (widget.model!.state ==
DrAppToastMsg.showErrorToast(widget.model.error); ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(
widget.model!.error);
} }
} else { } else {
DrAppToastMsg.showErrorToast("Please enter medical note"); DrAppToastMsg.showErrorToast(
"Please enter medical note");
} }
}, },
), ),
@ -138,17 +159,22 @@ class _AddVerifyMedicalReportState extends State<AddVerifyMedicalReport> {
color: Color(0xff359846), color: Color(0xff359846),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
onPressed: () async { onPressed: () async {
txtOfMedicalReport = await _controller.getText(); txtOfMedicalReport =
await _controller.getText();
if (txtOfMedicalReport.isNotEmpty) { if (txtOfMedicalReport.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
await widget.model.verifyMedicalReport(widget.patient, widget.medicalReport!); await widget.model!.verifyMedicalReport(
widget.patient!, widget.medicalReport!);
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
Navigator.pop(context); Navigator.pop(context);
if (widget.model.state == ViewState.ErrorLocal) { if (widget.model!.state ==
DrAppToastMsg.showErrorToast(widget.model.error); ViewState.ErrorLocal) {
DrAppToastMsg.showErrorToast(
widget.model!.error);
} }
} else { } else {
DrAppToastMsg.showErrorToast("Please enter medical note"); DrAppToastMsg.showErrorToast(
"Please enter medical note");
} }
}, },
), ),

@ -54,7 +54,8 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
GetNursingProgressNoteRequestModel( GetNursingProgressNoteRequestModel(
admissionNo: int.parse(patient!.admissionNo!), admissionNo: int.parse(patient!.admissionNo!),
patientTypeID: patient!.patientType!, patientTypeID: patient!.patientType!,
patientID: patient.patientId, setupID: "010266"); patientID: patient.patientId,
setupID: "010266");
model.getNursingProgressNote(getNursingProgressNoteRequestModel); model.getNursingProgressNote(getNursingProgressNoteRequestModel);
} }
@ -162,7 +163,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
.getDateTimeFromServerFormat(model .getDateTimeFromServerFormat(model
.patientNursingProgressNoteList[ .patientNursingProgressNoteList[
index] index]
.createdOn), .createdOn!),
isArabic: isArabic:
projectViewModel projectViewModel
.isArabic, .isArabic,
@ -188,7 +189,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
.getDateTimeFromServerFormat(model .getDateTimeFromServerFormat(model
.patientNursingProgressNoteList[ .patientNursingProgressNoteList[
index] index]
.createdOn)) .createdOn!))
: AppDateUtils.getHour( : AppDateUtils.getHour(
DateTime.now()), DateTime.now()),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save