Pubspec & Models Null Safety Update
parent
fe03cc606f
commit
435567305e
@ -1,200 +1,190 @@
|
|||||||
class AdmissionRequest {
|
class AdmissionRequest {
|
||||||
int patientMRN;
|
int? patientMRN;
|
||||||
int admitToClinic;
|
int? admitToClinic;
|
||||||
bool isPregnant;
|
bool? isPregnant;
|
||||||
int pregnancyWeeks;
|
int? pregnancyWeeks;
|
||||||
int pregnancyType;
|
int? pregnancyType;
|
||||||
int noOfBabies;
|
int? noOfBabies;
|
||||||
int mrpDoctorID;
|
int? mrpDoctorID;
|
||||||
String admissionDate;
|
String? admissionDate;
|
||||||
int expectedDays;
|
int? expectedDays;
|
||||||
int admissionType;
|
int? admissionType;
|
||||||
int admissionLocationID;
|
int? admissionLocationID;
|
||||||
int roomCategoryID;
|
int? roomCategoryID;
|
||||||
int wardID;
|
int? wardID;
|
||||||
bool isSickLeaveRequired;
|
bool? isSickLeaveRequired;
|
||||||
String sickLeaveComments;
|
String? sickLeaveComments;
|
||||||
bool isTransport;
|
bool? isTransport;
|
||||||
String transportComments;
|
String? transportComments;
|
||||||
bool isPhysioAppointmentNeeded;
|
bool? isPhysioAppointmentNeeded;
|
||||||
String physioAppointmentComments;
|
String? physioAppointmentComments;
|
||||||
bool isOPDFollowupAppointmentNeeded;
|
bool? isOPDFollowupAppointmentNeeded;
|
||||||
String opdFollowUpComments;
|
String? opdFollowUpComments;
|
||||||
bool isDietType;
|
bool? isDietType;
|
||||||
int dietType;
|
int? dietType;
|
||||||
String dietRemarks;
|
String? dietRemarks;
|
||||||
bool isPhysicalActivityModification;
|
bool? isPhysicalActivityModification;
|
||||||
String physicalActivityModificationComments;
|
String? physicalActivityModificationComments;
|
||||||
int orStatus;
|
int? orStatus;
|
||||||
String mainLineOfTreatment;
|
String? mainLineOfTreatment;
|
||||||
int estimatedCost;
|
int? estimatedCost;
|
||||||
String elementsForImprovement;
|
String? elementsForImprovement;
|
||||||
bool isPackagePatient;
|
bool? isPackagePatient;
|
||||||
String complications;
|
String? complications;
|
||||||
String otherDepartmentInterventions;
|
String? otherDepartmentInterventions;
|
||||||
String otherProcedures;
|
String? otherProcedures;
|
||||||
String pastMedicalHistory;
|
String? pastMedicalHistory;
|
||||||
String pastSurgicalHistory;
|
String? pastSurgicalHistory;
|
||||||
List<dynamic> admissionRequestDiagnoses;
|
List<dynamic>? admissionRequestDiagnoses;
|
||||||
List<dynamic> admissionRequestProcedures;
|
List<dynamic>? admissionRequestProcedures;
|
||||||
int appointmentNo;
|
int? appointmentNo;
|
||||||
int episodeID;
|
int? episodeID;
|
||||||
int admissionRequestNo;
|
int? admissionRequestNo;
|
||||||
|
|
||||||
AdmissionRequest(
|
AdmissionRequest({
|
||||||
{this.patientMRN,
|
this.patientMRN,
|
||||||
this.admitToClinic,
|
this.admitToClinic,
|
||||||
this.isPregnant,
|
this.isPregnant,
|
||||||
this.pregnancyWeeks = 0,
|
this.pregnancyWeeks,
|
||||||
this.pregnancyType = 0,
|
this.pregnancyType,
|
||||||
this.noOfBabies = 0,
|
this.noOfBabies,
|
||||||
this.mrpDoctorID,
|
this.mrpDoctorID,
|
||||||
this.admissionDate,
|
this.admissionDate,
|
||||||
this.expectedDays,
|
this.expectedDays,
|
||||||
this.admissionType,
|
this.admissionType,
|
||||||
this.admissionLocationID = 0,
|
this.admissionLocationID,
|
||||||
this.roomCategoryID = 0,
|
this.roomCategoryID,
|
||||||
this.wardID,
|
this.wardID,
|
||||||
this.isSickLeaveRequired,
|
this.isSickLeaveRequired,
|
||||||
this.sickLeaveComments = "",
|
this.sickLeaveComments,
|
||||||
this.isTransport = false,
|
this.isTransport,
|
||||||
this.transportComments = "",
|
this.transportComments,
|
||||||
this.isPhysioAppointmentNeeded = false,
|
this.isPhysioAppointmentNeeded,
|
||||||
this.physioAppointmentComments = "",
|
this.physioAppointmentComments,
|
||||||
this.isOPDFollowupAppointmentNeeded = false,
|
this.isOPDFollowupAppointmentNeeded,
|
||||||
this.opdFollowUpComments = "",
|
this.opdFollowUpComments,
|
||||||
this.isDietType,
|
this.isDietType,
|
||||||
this.dietType,
|
this.dietType,
|
||||||
this.dietRemarks,
|
this.dietRemarks,
|
||||||
this.isPhysicalActivityModification = false,
|
this.isPhysicalActivityModification,
|
||||||
this.physicalActivityModificationComments = "",
|
this.physicalActivityModificationComments,
|
||||||
this.orStatus = 1,
|
this.orStatus,
|
||||||
this.mainLineOfTreatment,
|
this.mainLineOfTreatment,
|
||||||
this.estimatedCost,
|
this.estimatedCost,
|
||||||
this.elementsForImprovement,
|
this.elementsForImprovement,
|
||||||
this.isPackagePatient = false,
|
this.isPackagePatient,
|
||||||
this.complications = "",
|
this.complications,
|
||||||
this.otherDepartmentInterventions = "",
|
this.otherDepartmentInterventions,
|
||||||
this.otherProcedures = "",
|
this.otherProcedures,
|
||||||
this.pastMedicalHistory = "",
|
this.pastMedicalHistory,
|
||||||
this.pastSurgicalHistory = "",
|
this.pastSurgicalHistory,
|
||||||
this.admissionRequestDiagnoses,
|
this.admissionRequestDiagnoses,
|
||||||
this.admissionRequestProcedures,
|
this.admissionRequestProcedures,
|
||||||
this.appointmentNo,
|
this.appointmentNo,
|
||||||
this.episodeID,
|
this.episodeID,
|
||||||
this.admissionRequestNo});
|
this.admissionRequestNo,
|
||||||
|
});
|
||||||
|
|
||||||
AdmissionRequest.fromJson(Map<String, dynamic> json) {
|
AdmissionRequest.fromJson(Map<String, dynamic>? json) {
|
||||||
patientMRN = json['patientMRN'];
|
if (json != null) {
|
||||||
admitToClinic = json['admitToClinic'];
|
patientMRN = json['patientMRN'];
|
||||||
isPregnant = json['isPregnant'];
|
admitToClinic = json['admitToClinic'];
|
||||||
pregnancyWeeks = json['pregnancyWeeks'];
|
isPregnant = json['isPregnant'];
|
||||||
pregnancyType = json['pregnancyType'];
|
pregnancyWeeks = json['pregnancyWeeks'];
|
||||||
noOfBabies = json['noOfBabies'];
|
pregnancyType = json['pregnancyType'];
|
||||||
mrpDoctorID = json['mrpDoctorID'];
|
noOfBabies = json['noOfBabies'];
|
||||||
admissionDate = json['admissionDate'];
|
mrpDoctorID = json['mrpDoctorID'];
|
||||||
expectedDays = json['expectedDays'];
|
admissionDate = json['admissionDate'];
|
||||||
admissionType = json['admissionType'];
|
expectedDays = json['expectedDays'];
|
||||||
admissionLocationID = json['admissionLocationID'];
|
admissionType = json['admissionType'];
|
||||||
roomCategoryID = json['roomCategoryID'];
|
admissionLocationID = json['admissionLocationID'];
|
||||||
wardID = json['wardID'];
|
roomCategoryID = json['roomCategoryID'];
|
||||||
isSickLeaveRequired = json['isSickLeaveRequired'];
|
wardID = json['wardID'];
|
||||||
sickLeaveComments = json['sickLeaveComments'];
|
isSickLeaveRequired = json['isSickLeaveRequired'];
|
||||||
isTransport = json['isTransport'];
|
sickLeaveComments = json['sickLeaveComments'];
|
||||||
transportComments = json['transportComments'];
|
isTransport = json['isTransport'];
|
||||||
isPhysioAppointmentNeeded = json['isPhysioAppointmentNeeded'];
|
transportComments = json['transportComments'];
|
||||||
physioAppointmentComments = json['physioAppointmentComments'];
|
isPhysioAppointmentNeeded = json['isPhysioAppointmentNeeded'];
|
||||||
isOPDFollowupAppointmentNeeded = json['isOPDFollowupAppointmentNeeded'];
|
physioAppointmentComments = json['physioAppointmentComments'];
|
||||||
opdFollowUpComments = json['opdFollowUpComments'];
|
isOPDFollowupAppointmentNeeded = json['isOPDFollowupAppointmentNeeded'];
|
||||||
isDietType = json['isDietType'];
|
opdFollowUpComments = json['opdFollowUpComments'];
|
||||||
dietType = json['dietType'];
|
isDietType = json['isDietType'];
|
||||||
dietRemarks = json['dietRemarks'];
|
dietType = json['dietType'];
|
||||||
isPhysicalActivityModification = json['isPhysicalActivityModification'];
|
dietRemarks = json['dietRemarks'];
|
||||||
physicalActivityModificationComments =
|
isPhysicalActivityModification =
|
||||||
json['physicalActivityModificationComments'];
|
json['isPhysicalActivityModification'];
|
||||||
orStatus = json['orStatus'];
|
physicalActivityModificationComments =
|
||||||
mainLineOfTreatment = json['mainLineOfTreatment'];
|
json['physicalActivityModificationComments'];
|
||||||
estimatedCost = json['estimatedCost'];
|
orStatus = json['orStatus'];
|
||||||
elementsForImprovement = json['elementsForImprovement'];
|
mainLineOfTreatment = json['mainLineOfTreatment'];
|
||||||
isPackagePatient = json['isPackagePatient'];
|
estimatedCost = json['estimatedCost'];
|
||||||
complications = json['complications'];
|
elementsForImprovement = json['elementsForImprovement'];
|
||||||
otherDepartmentInterventions = json['otherDepartmentInterventions'];
|
isPackagePatient = json['isPackagePatient'];
|
||||||
otherProcedures = json['otherProcedures'];
|
complications = json['complications'];
|
||||||
pastMedicalHistory = json['pastMedicalHistory'];
|
otherDepartmentInterventions = json['otherDepartmentInterventions'];
|
||||||
pastSurgicalHistory = json['pastSurgicalHistory'];
|
otherProcedures = json['otherProcedures'];
|
||||||
if (json['admissionRequestDiagnoses'] != null) {
|
pastMedicalHistory = json['pastMedicalHistory'];
|
||||||
admissionRequestDiagnoses = new List<dynamic>();
|
pastSurgicalHistory = json['pastSurgicalHistory'];
|
||||||
json['admissionRequestDiagnoses'].forEach((v) {
|
if (json['admissionRequestDiagnoses'] != null) {
|
||||||
admissionRequestDiagnoses.add(v);
|
admissionRequestDiagnoses = List<dynamic>.from(
|
||||||
// admissionRequestDiagnoses
|
json['admissionRequestDiagnoses'],
|
||||||
// .add(new AdmissionRequestDiagnoses.fromJson(v));
|
);
|
||||||
});
|
}
|
||||||
|
if (json['admissionRequestProcedures'] != null) {
|
||||||
|
admissionRequestProcedures = List<dynamic>.from(
|
||||||
|
json['admissionRequestProcedures'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
appointmentNo = json['appointmentNo'];
|
||||||
|
episodeID = json['episodeID'];
|
||||||
|
admissionRequestNo = json['admissionRequestNo'];
|
||||||
}
|
}
|
||||||
if (json['admissionRequestProcedures'] != null) {
|
|
||||||
admissionRequestProcedures = new List<dynamic>();
|
|
||||||
json['admissionRequestProcedures'].forEach((v) {
|
|
||||||
admissionRequestProcedures.add(v);
|
|
||||||
// admissionRequestProcedures
|
|
||||||
// .add(new AdmissionRequestProcedures.fromJson(v));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
appointmentNo = json['appointmentNo'];
|
|
||||||
episodeID = json['episodeID'];
|
|
||||||
admissionRequestNo = json['admissionRequestNo'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
final Map<String, dynamic> data = {};
|
||||||
data['patientMRN'] = this.patientMRN;
|
data['patientMRN'] = patientMRN;
|
||||||
data['admitToClinic'] = this.admitToClinic;
|
data['admitToClinic'] = admitToClinic;
|
||||||
data['isPregnant'] = this.isPregnant;
|
data['isPregnant'] = isPregnant;
|
||||||
data['pregnancyWeeks'] = this.pregnancyWeeks;
|
data['pregnancyWeeks'] = pregnancyWeeks;
|
||||||
data['pregnancyType'] = this.pregnancyType;
|
data['pregnancyType'] = pregnancyType;
|
||||||
data['noOfBabies'] = this.noOfBabies;
|
data['noOfBabies'] = noOfBabies;
|
||||||
data['mrpDoctorID'] = this.mrpDoctorID;
|
data['mrpDoctorID'] = mrpDoctorID;
|
||||||
data['admissionDate'] = this.admissionDate;
|
data['admissionDate'] = admissionDate;
|
||||||
data['expectedDays'] = this.expectedDays;
|
data['expectedDays'] = expectedDays;
|
||||||
data['admissionType'] = this.admissionType;
|
data['admissionType'] = admissionType;
|
||||||
data['admissionLocationID'] = this.admissionLocationID;
|
data['admissionLocationID'] = admissionLocationID;
|
||||||
data['roomCategoryID'] = this.roomCategoryID;
|
data['roomCategoryID'] = roomCategoryID;
|
||||||
data['wardID'] = this.wardID;
|
data['wardID'] = wardID;
|
||||||
data['isSickLeaveRequired'] = this.isSickLeaveRequired;
|
data['isSickLeaveRequired'] = isSickLeaveRequired;
|
||||||
data['sickLeaveComments'] = this.sickLeaveComments;
|
data['sickLeaveComments'] = sickLeaveComments;
|
||||||
data['isTransport'] = this.isTransport;
|
data['isTransport'] = isTransport;
|
||||||
data['transportComments'] = this.transportComments;
|
data['transportComments'] = transportComments;
|
||||||
data['isPhysioAppointmentNeeded'] = this.isPhysioAppointmentNeeded;
|
data['isPhysioAppointmentNeeded'] = isPhysioAppointmentNeeded;
|
||||||
data['physioAppointmentComments'] = this.physioAppointmentComments;
|
data['physioAppointmentComments'] = physioAppointmentComments;
|
||||||
data['isOPDFollowupAppointmentNeeded'] =
|
data['isOPDFollowupAppointmentNeeded'] = isOPDFollowupAppointmentNeeded;
|
||||||
this.isOPDFollowupAppointmentNeeded;
|
data['opdFollowUpComments'] = opdFollowUpComments;
|
||||||
data['opdFollowUpComments'] = this.opdFollowUpComments;
|
data['isDietType'] = isDietType;
|
||||||
data['isDietType'] = this.isDietType;
|
data['dietType'] = dietType;
|
||||||
data['dietType'] = this.dietType;
|
data['dietRemarks'] = dietRemarks;
|
||||||
data['dietRemarks'] = this.dietRemarks;
|
data['isPhysicalActivityModification'] = isPhysicalActivityModification;
|
||||||
data['isPhysicalActivityModification'] =
|
|
||||||
this.isPhysicalActivityModification;
|
|
||||||
data['physicalActivityModificationComments'] =
|
data['physicalActivityModificationComments'] =
|
||||||
this.physicalActivityModificationComments;
|
physicalActivityModificationComments;
|
||||||
data['orStatus'] = this.orStatus;
|
data['orStatus'] = orStatus;
|
||||||
data['mainLineOfTreatment'] = this.mainLineOfTreatment;
|
data['mainLineOfTreatment'] = mainLineOfTreatment;
|
||||||
data['estimatedCost'] = this.estimatedCost;
|
data['estimatedCost'] = estimatedCost;
|
||||||
data['elementsForImprovement'] = this.elementsForImprovement;
|
data['elementsForImprovement'] = elementsForImprovement;
|
||||||
data['isPackagePatient'] = this.isPackagePatient;
|
data['isPackagePatient'] = isPackagePatient;
|
||||||
data['complications'] = this.complications;
|
data['complications'] = complications;
|
||||||
data['otherDepartmentInterventions'] = this.otherDepartmentInterventions;
|
data['otherDepartmentInterventions'] = otherDepartmentInterventions;
|
||||||
data['otherProcedures'] = this.otherProcedures;
|
data['otherProcedures'] = otherProcedures;
|
||||||
data['pastMedicalHistory'] = this.pastMedicalHistory;
|
data['pastMedicalHistory'] = pastMedicalHistory;
|
||||||
data['pastSurgicalHistory'] = this.pastSurgicalHistory;
|
data['pastSurgicalHistory'] = pastSurgicalHistory;
|
||||||
if (this.admissionRequestDiagnoses != null) {
|
data['admissionRequestDiagnoses'] = admissionRequestDiagnoses;
|
||||||
data['admissionRequestDiagnoses'] = this.admissionRequestDiagnoses;
|
data['admissionRequestProcedures'] = admissionRequestProcedures;
|
||||||
// this.admissionRequestDiagnoses.map((v) => v.toJson()).toList();
|
data['appointmentNo'] = appointmentNo;
|
||||||
}
|
data['episodeID'] = episodeID;
|
||||||
if (this.admissionRequestProcedures != null) {
|
data['admissionRequestNo'] = admissionRequestNo;
|
||||||
data['admissionRequestProcedures'] =
|
|
||||||
this.admissionRequestProcedures.map((v) => v.toJson()).toList();
|
|
||||||
}
|
|
||||||
data['appointmentNo'] = this.appointmentNo;
|
|
||||||
data['episodeID'] = this.episodeID;
|
|
||||||
data['admissionRequestNo'] = this.admissionRequestNo;
|
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,32 +1,35 @@
|
|||||||
class Clinic {
|
class Clinic {
|
||||||
int clinicGroupID;
|
int? clinicGroupID;
|
||||||
String clinicGroupName;
|
String? clinicGroupName;
|
||||||
int clinicID;
|
int? clinicID;
|
||||||
String clinicNameArabic;
|
String? clinicNameArabic;
|
||||||
String clinicNameEnglish;
|
String? clinicNameEnglish;
|
||||||
|
|
||||||
Clinic(
|
Clinic({
|
||||||
{this.clinicGroupID,
|
this.clinicGroupID,
|
||||||
this.clinicGroupName,
|
this.clinicGroupName,
|
||||||
this.clinicID,
|
this.clinicID,
|
||||||
this.clinicNameArabic,
|
this.clinicNameArabic,
|
||||||
this.clinicNameEnglish});
|
this.clinicNameEnglish,
|
||||||
|
});
|
||||||
|
|
||||||
Clinic.fromJson(Map<String, dynamic> json) {
|
Clinic.fromJson(Map<String, dynamic>? json) {
|
||||||
clinicGroupID = json['clinicGroupID'];
|
if (json != null) {
|
||||||
clinicGroupName = json['clinicGroupName'];
|
clinicGroupID = json['clinicGroupID'];
|
||||||
clinicID = json['clinicID'];
|
clinicGroupName = json['clinicGroupName'];
|
||||||
clinicNameArabic = json['clinicNameArabic'];
|
clinicID = json['clinicID'];
|
||||||
clinicNameEnglish = json['clinicNameEnglish'];
|
clinicNameArabic = json['clinicNameArabic'];
|
||||||
|
clinicNameEnglish = json['clinicNameEnglish'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, dynamic> toJson() {
|
Map<String, dynamic> toJson() {
|
||||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
final Map<String, dynamic> data = {};
|
||||||
data['clinicGroupID'] = this.clinicGroupID;
|
data['clinicGroupID'] = clinicGroupID;
|
||||||
data['clinicGroupName'] = this.clinicGroupName;
|
data['clinicGroupName'] = clinicGroupName;
|
||||||
data['clinicID'] = this.clinicID;
|
data['clinicID'] = clinicID;
|
||||||
data['clinicNameArabic'] = this.clinicNameArabic;
|
data['clinicNameArabic'] = clinicNameArabic;
|
||||||
data['clinicNameEnglish'] = this.clinicNameEnglish;
|
data['clinicNameEnglish'] = clinicNameEnglish;
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue