Null Safety Update

lib/client/base_app_client.dart

@@ -148,7 +148,7 @@ class BaseAppClient {
       {required Map<String, dynamic> body,
       required Function(dynamic response, int statusCode) onSuccess,
       required Function(String error, int statusCode) onFailure,
-      required PatiantInformtion patient,
+       PatiantInformtion? patient,
       bool isExternal = false}) async {
     String url = BASE_URL + endPoint;
 
@@ -196,7 +196,7 @@ class BaseAppClient {
       body['PatientType'] = body.containsKey('PatientType')
           ? body['PatientType'] != null
               ? body['PatientType']
-              : patient.patientType != null
+              : patient!.patientType != null
                   ? patient.patientType
                   : PATIENT_TYPE
           : PATIENT_TYPE;
@@ -204,13 +204,13 @@ class BaseAppClient {
       body['PatientTypeID'] = body.containsKey('PatientTypeID')
           ? body['PatientTypeID'] != null
               ? body['PatientTypeID']
-              : patient.patientType != null
+              : patient!.patientType != null
                   ? patient.patientType
                   : PATIENT_TYPE_ID
           : PATIENT_TYPE_ID;
 
       body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] ?? token : token;
-      body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient.patientId ?? patient.patientMRN;
+      body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
 
       body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
       body['SessionID'] = SESSION_ID; //getSe

lib/core/model/PatientRegistration/CheckActivationCodeModel.dart

@@ -1,29 +1,29 @@
 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;
+  dynamic sessionID;
-  bool isDentalAllowedBackend;
+  bool? isDentalAllowedBackend;
-  int deviceTypeID;
+  int? deviceTypeID;
-  String dOB;
+  String? dOB;
-  int isHijri;
+  int? isHijri;
-  String healthId;
+  String? healthId;
 
   CheckActivationCodeModel(
       {this.patientMobileNumber,

lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart

@@ -1,21 +1,21 @@
 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;
+  dynamic 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(
       {this.patientIdentificationID,

lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart

@@ -1,16 +1,16 @@
 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;
+  dynamic sessionID;
-  bool isDentalAllowedBackend;
+  bool? isDentalAllowedBackend;
-  int deviceTypeID;
+  int? deviceTypeID;
 
   GetPatientInfoRequestModel(
       {this.patientIdentificationID,

lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart

@@ -1,78 +1,78 @@
 class GetPatientInfoResponseModel {
   dynamic date;
-  int languageID;
+  int? languageID;
-  int serviceName;
+  int? serviceName;
   dynamic time;
   dynamic androidLink;
   dynamic authenticationTokenID;
   dynamic data;
-  bool dataw;
+  bool? dataw;
-  int dietType;
+  int? dietType;
   dynamic errorCode;
   dynamic errorEndUserMessage;
   dynamic errorEndUserMessageN;
   dynamic errorMessage;
-  int errorType;
+  int? errorType;
-  int foodCategory;
+  int? foodCategory;
   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 successMsg;
   dynamic successMsgN;
   dynamic vidaUpdatedResponse;
   dynamic accessTokenObject;
-  int age;
+  int? age;
   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 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;
-  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 pCDGetVidaPatientForManualVerificationList;
   dynamic pCDNHICHMGPatientDetailsMatchCalulationList;
-  int pCDReturnValue;
+  int? pCDReturnValue;
-  String patientStatus;
+  String? patientStatus;
-  String placeofBirth;
+  String? placeofBirth;
   dynamic practitionerStatusCode;
   dynamic practitionerStatusDescAr;
   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 yakeenVidaPatientDataStatisticsList;
   dynamic yakeenVidaPatientDataStatisticsPrefferedList;
   dynamic accessToken;
-  int categoryCode;
+  int? categoryCode;
   dynamic categoryNameAr;
   dynamic categoryNameEn;
-  int constraintCode;
+  int? constraintCode;
   dynamic constraintNameAr;
   dynamic constraintNameEn;
   dynamic content;
@@ -84,7 +84,7 @@ class GetPatientInfoResponseModel {
   dynamic licenseStatusDescEn;
   dynamic organizations;
   dynamic registrationNumber;
-  int specialtyCode;
+  int? specialtyCode;
   dynamic specialtyNameAr;
   dynamic specialtyNameEn;
 

lib/core/model/PatientRegistration/PatientRegistrationModel.dart

@@ -1,22 +1,22 @@
 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;
-  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(
       {this.patientobject,
@@ -64,7 +64,7 @@ class PatientRegistrationModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.patientobject != null) {
-      data['Patientobject'] = this.patientobject.toJson();
+      data['Patientobject'] = this.patientobject!.toJson();
     }
     data['PatientIdentificationID'] = this.patientIdentificationID;
     data['PatientMobileNumber'] = this.patientMobileNumber;
@@ -88,27 +88,27 @@ class PatientRegistrationModel {
 }
 
 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(
       {this.tempValue,

lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart

@@ -1,28 +1,28 @@
 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;
+  dynamic sessionID;
-  bool isDentalAllowedBackend;
+  bool? isDentalAllowedBackend;
-  int deviceTypeID;
+  int? deviceTypeID;
-  String dOB;
+  String? dOB;
-  int isHijri;
+  int? isHijri;
-  String healthId;
+  String? healthId;
 
   SendActivationCodeByOTPNotificationTypeForRegistrationModel(
       {this.patientMobileNumber,

lib/core/model/Prescriptions/Prescriptions.dart

@@ -1,40 +1,40 @@
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 
 class Prescriptions {
-  String setupID;
+  String? setupID;
-  int projectID;
+  int? projectID;
-  int patientID;
+  int? patientID;
-  int appointmentNo;
+  int? appointmentNo;
-  String appointmentDate;
+  String? appointmentDate;
-  String doctorName;
+  String? doctorName;
-  String clinicDescription;
+  String? clinicDescription;
-  String name;
+  String? name;
-  int episodeID;
+  int? episodeID;
-  int actualDoctorRate;
+  int? actualDoctorRate;
-  int admission;
+  int? admission;
-  int clinicID;
+  int? clinicID;
-  String companyName;
+  String? companyName;
-  String despensedStatus;
+  String? despensedStatus;
-  DateTime dischargeDate;
+  DateTime? dischargeDate;
-  int dischargeNo;
+  int? dischargeNo;
-  int doctorID;
+  int? doctorID;
-  String doctorImageURL;
+  String? doctorImageURL;
-  int doctorRate;
+  int? doctorRate;
-  String doctorTitle;
+  String? doctorTitle;
-  int gender;
+  int? gender;
-  String genderDescription;
+  String? genderDescription;
-  bool isActiveDoctorProfile;
+  bool? isActiveDoctorProfile;
-  bool isDoctorAllowVedioCall;
+  bool? isDoctorAllowVedioCall;
-  bool isExecludeDoctor;
+  bool? isExecludeDoctor;
-  bool isInOutPatient;
+  bool? isInOutPatient;
-  bool isLiveCareAppointment;
+  bool? isLiveCareAppointment;
-  String isInOutPatientDescription;
+  String? isInOutPatientDescription;
-  String isInOutPatientDescriptionN;
+  String? isInOutPatientDescriptionN;
-  bool isInsurancePatient;
+  bool? isInsurancePatient;
-  String nationalityFlagURL;
+  String? nationalityFlagURL;
-  int noOfPatientsRate;
+  int? noOfPatientsRate;
-  String qR;
+  String? qR;
-  List<String> speciality;
+  List<String>? speciality;
 
   Prescriptions(
       {this.setupID,
@@ -150,10 +150,10 @@ class Prescriptions {
 }
 
 class PrescriptionsList {
-  String filterName = "";
+  String? filterName = "";
-  List<Prescriptions> prescriptionsList = List();
+  List<Prescriptions>? prescriptionsList = [];
 
-  PrescriptionsList({this.filterName, Prescriptions prescriptions}) {
+  PrescriptionsList({this.filterName, Prescriptions? prescriptions}) {
-    prescriptionsList.add(prescriptions);
+    prescriptionsList!.add(prescriptions!);
   }
 }

lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart

@@ -1,40 +1,40 @@
 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 discountinueDatetime;
   dynamic rescheduleDatetime;
-  int status;
+  int? status;
-  String statusDescription;
+  String? statusDescription;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
   dynamic editedBy;
   dynamic editedOn;
   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(
       {this.setupID,

lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart

@@ -1,16 +1,16 @@
 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(
       {this.isDentalAllowedBackend,

lib/core/model/Prescriptions/in_patient_prescription_model.dart

@@ -1,5 +1,5 @@
 class InPatientPrescriptionRequestModel {
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
   dynamic patientMRN;
   dynamic appNo;
   dynamic admissionNo;

lib/core/model/Prescriptions/perscription_pharmacy.dart

@@ -1,28 +1,28 @@
 class PharmacyPrescriptions {
-  String expiryDate;
+  String? expiryDate;
   dynamic sellingPrice;
-  int quantity;
+  int? quantity;
-  int itemID;
+  int? itemID;
-  int locationID;
+  int? locationID;
-  int projectID;
+  int? projectID;
-  String setupID;
+  String? setupID;
-  String locationDescription;
+  String? locationDescription;
-  Null locationDescriptionN;
+  dynamic locationDescriptionN;
-  String itemDescription;
+  String? itemDescription;
-  Null itemDescriptionN;
+  dynamic itemDescriptionN;
-  String alias;
+  String? alias;
-  int locationTypeID;
+  int? locationTypeID;
-  int barcode;
+  int? barcode;
-  Null companybarcode;
+  dynamic companybarcode;
-  int cityID;
+  int? cityID;
-  String cityName;
+  String? cityName;
-  int distanceInKilometers;
+  int? distanceInKilometers;
-  String latitude;
+  String? latitude;
-  int locationType;
+  int? locationType;
-  String longitude;
+  String? longitude;
-  String phoneNumber;
+  String? phoneNumber;
-  String projectImageURL;
+  String? projectImageURL;
-  Null sortOrder;
+  dynamic sortOrder;
 
   PharmacyPrescriptions(
       {this.expiryDate,

lib/core/model/Prescriptions/post_prescrition_req_model.dart

@@ -1,10 +1,10 @@
 class PostPrescriptionReqModel {
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  int clinicID;
+  int? clinicID;
-  int episodeID;
+  int? episodeID;
-  int appointmentNo;
+  int? appointmentNo;
-  int patientMRN;
+  int? patientMRN;
-  List<PrescriptionRequestModel> prescriptionRequestModel;
+  List<PrescriptionRequestModel>? prescriptionRequestModel;
 
   PostPrescriptionReqModel(
       {this.vidaAuthTokenID,
@@ -21,9 +21,9 @@ class PostPrescriptionReqModel {
     appointmentNo = json['AppointmentNo'];
     patientMRN = json['PatientMRN'];
     if (json['prescriptionRequestModel'] != null) {
-      prescriptionRequestModel = new List<PrescriptionRequestModel>();
+      prescriptionRequestModel = <PrescriptionRequestModel>[];
       json['prescriptionRequestModel'].forEach((v) {
-        prescriptionRequestModel.add(new PrescriptionRequestModel.fromJson(v));
+        prescriptionRequestModel!.add(new PrescriptionRequestModel.fromJson(v));
       });
     }
   }
@@ -37,25 +37,25 @@ class PostPrescriptionReqModel {
     data['PatientMRN'] = this.patientMRN;
     if (this.prescriptionRequestModel != null) {
       data['prescriptionRequestModel'] =
-          this.prescriptionRequestModel.map((v) => v.toJson()).toList();
+          this.prescriptionRequestModel!.map((v) => v.toJson()).toList();
     }
     return data;
   }
 }
 
 class PrescriptionRequestModel {
-  int itemId;
+  int? itemId;
-  String doseStartDate;
+  String? doseStartDate;
-  int duration;
+  int? duration;
-  double dose;
+  double? dose;
-  int doseUnitId;
+  int? doseUnitId;
-  int route;
+  int? route;
-  int frequency;
+  int? frequency;
-  int doseTime;
+  int? doseTime;
-  bool covered;
+  bool? covered;
-  bool approvalRequired;
+  bool? approvalRequired;
-  String remarks;
+  String? remarks;
-  String icdcode10Id;
+  String? icdcode10Id;
 
   PrescriptionRequestModel({
     this.itemId,

lib/core/model/Prescriptions/prescription_in_patient.dart

@@ -1,50 +1,50 @@
 class PrescriotionInPatient {
-  int admissionNo;
+  int? admissionNo;
-  int authorizedBy;
+  int? authorizedBy;
   dynamic bedNo;
-  String comments;
+  String? comments;
-  int createdBy;
+  int? createdBy;
-  String createdByName;
+  String? createdByName;
   dynamic createdByNameN;
-  String createdOn;
+  String? createdOn;
-  String direction;
+  String? direction;
-  int directionID;
+  int? directionID;
   dynamic directionN;
-  String dose;
+  String? dose;
-  int editedBy;
+  int? editedBy;
   dynamic iVDiluentLine;
-  int iVDiluentType;
+  int? iVDiluentType;
   dynamic iVDiluentVolume;
   dynamic iVRate;
   dynamic iVStability;
-  String itemDescription;
+  String? itemDescription;
-  int itemID;
+  int? itemID;
-  int lineItemNo;
+  int? lineItemNo;
-  int locationId;
+  int? locationId;
-  int noOfDoses;
+  int? noOfDoses;
-  int orderNo;
+  int? orderNo;
-  int patientID;
+  int? patientID;
-  String pharmacyRemarks;
+  String? pharmacyRemarks;
-  String prescriptionDatetime;
+  String? prescriptionDatetime;
-  int prescriptionNo;
+  int? prescriptionNo;
-  String processedBy;
+  String? processedBy;
-  int projectID;
+  int? projectID;
-  int refillID;
+  int? refillID;
-  String refillType;
+  String? refillType;
   dynamic refillTypeN;
-  int reviewedPharmacist;
+  int? reviewedPharmacist;
   dynamic roomId;
-  String route;
+  String? route;
-  int routeId;
+  int? routeId;
   dynamic routeN;
   dynamic setupID;
-  String startDatetime;
+  String? startDatetime;
-  int status;
+  int? status;
-  String statusDescription;
+  String? statusDescription;
   dynamic statusDescriptionN;
-  String stopDatetime;
+  String? stopDatetime;
-  int unitofMeasurement;
+  int? unitofMeasurement;
-  String unitofMeasurementDescription;
+  String? unitofMeasurementDescription;
   dynamic unitofMeasurementDescriptionN;
 
   PrescriotionInPatient(

lib/core/model/Prescriptions/prescription_model.dart

@@ -1,7 +1,7 @@
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_model.dart';
 
 class PrescriptionModel {
-  List<PrescriptionEntityModel> entityList;
+  List<PrescriptionEntityModel>? entityList;
   dynamic rowcount;
   dynamic statusMessage;
 
@@ -9,9 +9,9 @@ class PrescriptionModel {
 
   PrescriptionModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<PrescriptionEntityModel>();
+      entityList = <PrescriptionEntityModel>[];
       json['entityList'].forEach((v) {
-        entityList.add(new PrescriptionEntityModel.fromJson(v));
+        entityList!.add(new PrescriptionEntityModel.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -21,7 +21,7 @@ class PrescriptionModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;

lib/core/model/Prescriptions/prescription_report.dart

@@ -1,48 +1,48 @@
 class PrescriptionReport {
-  String address;
+  String? address;
   dynamic appodynamicmentNo;
-  String clinic;
+  String? clinic;
-  String companyName;
+  String? companyName;
   dynamic days;
-  String doctorName;
+  String? doctorName;
   var doseDailyQuantity;
-  String frequency;
+  String? frequency;
   dynamic frequencyNumber;
-  String image;
+  String? image;
-  String imageExtension;
+  String? imageExtension;
-  String imageSRCUrl;
+  String? imageSRCUrl;
-  String imageString;
+  String? imageString;
-  String imageThumbUrl;
+  String? imageThumbUrl;
-  String isCovered;
+  String? isCovered;
-  String itemDescription;
+  String? itemDescription;
   dynamic itemID;
-  String orderDate;
+  String? orderDate;
   dynamic patientID;
-  String patientName;
+  String? patientName;
-  String phoneOffice1;
+  String? phoneOffice1;
-  String prescriptionQR;
+  String? prescriptionQR;
   dynamic prescriptionTimes;
-  String productImage;
+  String? productImage;
-  String productImageBase64;
+  String? productImageBase64;
-  String productImageString;
+  String? productImageString;
   dynamic projectID;
-  String projectName;
+  String? projectName;
-  String remarks;
+  String? remarks;
-  String route;
+  String? route;
-  String sKU;
+  String? sKU;
   dynamic scaleOffset;
-  String startDate;
+  String? startDate;
 
-  String patientAge;
+  String? patientAge;
-  String patientGender;
+  String? patientGender;
-  String phoneOffice;
+  String? phoneOffice;
   dynamic doseTimingID;
   dynamic frequencyID;
   dynamic routeID;
-  String name;
+  String? name;
-  String itemDescriptionN;
+  String? itemDescriptionN;
-  String routeN;
+  String? routeN;
-  String frequencyN;
+  String? frequencyN;
 
   PrescriptionReport({
     this.address,

lib/core/model/Prescriptions/prescription_report_enh.dart

@@ -1,37 +1,37 @@
 class PrescriptionReportEnh {
-  String address;
+  String? address;
   dynamic appodynamicmentNo;
-  String clinic;
+  String? clinic;
   dynamic companyName;
   dynamic days;
-  String doctorName;
+  String? doctorName;
   dynamic doseDailyQuantity;
-  String frequency;
+  String? frequency;
   dynamic frequencyNumber;
   dynamic image;
   dynamic imageExtension;
-  String imageSRCUrl;
+  String? imageSRCUrl;
   dynamic imageString;
-  String imageThumbUrl;
+  String? imageThumbUrl;
-  String isCovered;
+  String? isCovered;
-  String itemDescription;
+  String? itemDescription;
   dynamic itemID;
-  String orderDate;
+  String? orderDate;
   dynamic patientID;
-  String patientName;
+  String? patientName;
-  String phoneOffice1;
+  String? phoneOffice1;
   dynamic prescriptionQR;
   dynamic prescriptionTimes;
   dynamic productImage;
   dynamic productImageBase64;
-  String productImageString;
+  String? productImageString;
   dynamic projectID;
-  String projectName;
+  String? projectName;
-  String remarks;
+  String? remarks;
-  String route;
+  String? route;
-  String sKU;
+  String? sKU;
   dynamic scaleOffset;
-  String startDate;
+  String? startDate;
 
   PrescriptionReportEnh(
       {this.address,

lib/core/model/Prescriptions/prescriptions_order.dart

@@ -1,32 +1,32 @@
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 
 class PrescriptionsOrder {
-  int iD;
+  int? iD;
   dynamic patientID;
-  bool patientOutSA;
+  bool? patientOutSA;
-  bool isOutPatient;
+  bool? isOutPatient;
-  int projectID;
+  int? projectID;
-  int nearestProjectID;
+  int? nearestProjectID;
-  double longitude;
+  double? longitude;
-  double latitude;
+  double? latitude;
   dynamic appointmentNo;
   dynamic dischargeID;
-  int lineItemNo;
+  int? lineItemNo;
-  int status;
+  int? status;
   dynamic description;
   dynamic descriptionN;
-  DateTime createdOn;
+  DateTime? createdOn;
-  int serviceID;
+  int? serviceID;
-  int createdBy;
+  int? createdBy;
-  DateTime editedOn;
+  DateTime? editedOn;
-  int editedBy;
+  int? editedBy;
-  int channel;
+  int? channel;
   dynamic clientRequestID;
-  bool returnedToQueue;
+  bool? returnedToQueue;
   dynamic pickupDateTime;
   dynamic pickupLocationName;
   dynamic dropoffLocationName;
-  int realRRTHaveTransactions;
+  int? realRRTHaveTransactions;
   dynamic nearestProjectDescription;
   dynamic nearestProjectDescriptionN;
   dynamic projectDescription;

lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart

@@ -1,16 +1,16 @@
 class RequestGetListPharmacyForPrescriptions {
-  int latitude;
+  int? latitude;
-  int longitude;
+  int? longitude;
-  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;
-  int itemID;
+  int? itemID;
 
   RequestGetListPharmacyForPrescriptions(
       {this.latitude,

lib/core/model/Prescriptions/request_prescription_report.dart

@@ -1,23 +1,23 @@
 class RequestPrescriptionReport {
-  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;
-  int patientID;
+  int? patientID;
-  String tokenID;
+  String? tokenID;
-  int patientTypeID;
+  int? patientTypeID;
-  int patientType;
+  int? patientType;
-  int appointmentNo;
+  int? appointmentNo;
-  String setupID;
+  String? setupID;
-  int episodeID;
+  int? episodeID;
-  int clinicID;
+  int? clinicID;
-  int projectID;
+  int? projectID;
-  int dischargeNo;
+  int? dischargeNo;
 
   RequestPrescriptionReport(
       {this.versionID,

lib/core/model/Prescriptions/request_prescription_report_enh.dart

@@ -1,23 +1,23 @@
 class RequestPrescriptionReportEnh {
-  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;
-  int patientID;
+  int? patientID;
-  String tokenID;
+  String? tokenID;
-  int patientTypeID;
+  int? patientTypeID;
-  int patientType;
+  int? patientType;
-  int appointmentNo;
+  int? appointmentNo;
-  String setupID;
+  String? setupID;
-  int dischargeNo;
+  int? dischargeNo;
-  int episodeID;
+  int? episodeID;
-  int clinicID;
+  int? clinicID;
-  int projectID;
+  int? projectID;
 
   RequestPrescriptionReportEnh(
       {this.versionID,

lib/core/model/SOAP/allergy/get_allergies_request_model.dart

@@ -1,9 +1,9 @@
 class GetAllergiesRequestModel {
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
-  String doctorID;
+  String? doctorID;
 
   GetAllergiesRequestModel(
       {this.vidaAuthTokenID,

lib/core/model/SOAP/allergy/get_allergies_res_model.dart

@@ -1,17 +1,17 @@
 class GetAllergiesResModel {
-  int allergyDiseaseId;
+  int? allergyDiseaseId;
-  String allergyDiseaseName;
+  String? allergyDiseaseName;
-  int allergyDiseaseType;
+  int? allergyDiseaseType;
-  int appointmentNo;
+  int? appointmentNo;
-  int createdBy;
+  int? createdBy;
-  String createdByName;
+  String? createdByName;
-  String createdOn;
+  String? createdOn;
-  int episodeID;
+  int? episodeID;
-  bool isChecked;
+  bool? isChecked;
-  bool isUpdatedByNurse;
+  bool? isUpdatedByNurse;
-  int severity;
+  int? severity;
-  String severityName;
+  String? severityName;
-  String remarks;
+  String? remarks;
 
   GetAllergiesResModel(
       {this.allergyDiseaseId,

lib/core/model/SOAP/allergy/post_allergy_request_model.dart

@@ -1,16 +1,13 @@
 class PostAllergyRequestModel {
-  List<ListHisProgNotePatientAllergyDiseaseVM>
+  List<ListHisProgNotePatientAllergyDiseaseVM>? listHisProgNotePatientAllergyDiseaseVM;
-      listHisProgNotePatientAllergyDiseaseVM;
 
   PostAllergyRequestModel({this.listHisProgNotePatientAllergyDiseaseVM});
 
   PostAllergyRequestModel.fromJson(Map<String, dynamic> json) {
     if (json['listHisProgNotePatientAllergyDiseaseVM'] != null) {
-      listHisProgNotePatientAllergyDiseaseVM =
+      listHisProgNotePatientAllergyDiseaseVM = <ListHisProgNotePatientAllergyDiseaseVM>[];
-          new List<ListHisProgNotePatientAllergyDiseaseVM>();
       json['listHisProgNotePatientAllergyDiseaseVM'].forEach((v) {
-        listHisProgNotePatientAllergyDiseaseVM
+        listHisProgNotePatientAllergyDiseaseVM!.add(new ListHisProgNotePatientAllergyDiseaseVM.fromJson(v));
-            .add(new ListHisProgNotePatientAllergyDiseaseVM.fromJson(v));
       });
     }
   }
@@ -18,29 +15,26 @@ class PostAllergyRequestModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.listHisProgNotePatientAllergyDiseaseVM != null) {
-      data['listHisProgNotePatientAllergyDiseaseVM'] = this
+      data['listHisProgNotePatientAllergyDiseaseVM'] = this.listHisProgNotePatientAllergyDiseaseVM!.map((v) => v.toJson()).toList();
-          .listHisProgNotePatientAllergyDiseaseVM
-          .map((v) => v.toJson())
-          .toList();
     }
     return data;
   }
 }
 
 class ListHisProgNotePatientAllergyDiseaseVM {
-  int patientMRN;
+  int? patientMRN;
-  int allergyDiseaseType;
+  int? allergyDiseaseType;
-  int allergyDiseaseId;
+  int? allergyDiseaseId;
-  int episodeId;
+  int? episodeId;
-  int appointmentNo;
+  int? appointmentNo;
-  int severity;
+  int? severity;
-  bool isChecked;
+  bool? isChecked;
-  bool isUpdatedByNurse;
+  bool? isUpdatedByNurse;
-  String remarks;
+  String? remarks;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  int editedBy;
+  int? editedBy;
-  String editedOn;
+  String? editedOn;
 
   ListHisProgNotePatientAllergyDiseaseVM(
       {this.patientMRN,

lib/core/model/SOAP/assessment/get_assessment_req_model.dart

@@ -1,10 +1,10 @@
 class GetAssessmentReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  String episodeID;
+  String? episodeID;
-  String from;
+  String? from;
-  String to;
+  String? to;
-  int clinicID;
+  int? clinicID;
   dynamic doctorID;
   dynamic editedBy;
 

lib/core/model/SOAP/assessment/get_assessment_res_model.dart

@@ -1,19 +1,19 @@
 class GetAssessmentResModel {
-  int appointmentNo;
+  int? appointmentNo;
-  String asciiDesc;
+  String? asciiDesc;
-  String clinicDescription;
+  String? clinicDescription;
-  int clinicID;
+  int? clinicID;
-  bool complexDiagnosis;
+  bool? complexDiagnosis;
-  int conditionID;
+  int? conditionID;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  int diagnosisTypeID;
+  int? diagnosisTypeID;
-  int doctorID;
+  int? doctorID;
-  String doctorName;
+  String? doctorName;
-  int episodeId;
+  int? episodeId;
-  String icdCode10ID;
+  String? icdCode10ID;
-  int patientMRN;
+  int? patientMRN;
-  String remarks;
+  String? remarks;
 
   GetAssessmentResModel(
       {this.appointmentNo,

lib/core/model/SOAP/assessment/patch_assessment_req_model.dart

@@ -1,13 +1,13 @@
 class PatchAssessmentReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeID;
+  int? episodeID;
-  String icdcode10Id;
+  String? icdcode10Id;
-  String prevIcdCode10ID;
+  String? prevIcdCode10ID;
-  int conditionId;
+  int? conditionId;
-  int diagnosisTypeId;
+  int? diagnosisTypeId;
-  bool complexDiagnosis;
+  bool? complexDiagnosis;
-  String remarks;
+  String? remarks;
 
   PatchAssessmentReqModel(
       {this.patientMRN,

lib/core/model/SOAP/assessment/post_assessment_request_model.dart

@@ -1,8 +1,8 @@
 class PostAssessmentRequestModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
-  List<IcdCodeDetails> icdCodeDetails;
+  List<IcdCodeDetails>? icdCodeDetails;
 
   PostAssessmentRequestModel(
       {this.patientMRN,
@@ -15,9 +15,9 @@ class PostAssessmentRequestModel {
     appointmentNo = json['AppointmentNo'];
     episodeId = json['EpisodeID'];
     if (json['icdCodeDetails'] != null) {
-      icdCodeDetails = new List<IcdCodeDetails>();
+      icdCodeDetails = <IcdCodeDetails>[];
       json['icdCodeDetails'].forEach((v) {
-        icdCodeDetails.add(new IcdCodeDetails.fromJson(v));
+        icdCodeDetails!.add(new IcdCodeDetails.fromJson(v));
       });
     }
   }
@@ -29,18 +29,18 @@ class PostAssessmentRequestModel {
     data['EpisodeID'] = this.episodeId;
     if (this.icdCodeDetails != null) {
       data['icdCodeDetails'] =
-          this.icdCodeDetails.map((v) => v.toJson()).toList();
+          this.icdCodeDetails!.map((v) => v.toJson()).toList();
     }
     return data;
   }
 }
 
 class IcdCodeDetails {
-  String icdcode10Id;
+  String? icdcode10Id;
-  int conditionId;
+  int? conditionId;
-  int diagnosisTypeId;
+  int? diagnosisTypeId;
-  bool complexDiagnosis;
+  bool? complexDiagnosis;
-  String remarks;
+  String? remarks;
 
   IcdCodeDetails(
       {this.icdcode10Id,

lib/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart

@@ -1,10 +1,10 @@
 class GetChiefComplaintReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
-  int episodeID;
+  int? episodeID;
   dynamic doctorID;
-  int admissionNo;
+  int? admissionNo;
 
   GetChiefComplaintReqModel(
       {this.patientMRN,

lib/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart

@@ -1,16 +1,16 @@
 class GetChiefComplaintResModel {
-  int appointmentNo;
+  int? appointmentNo;
-  String ccdate;
+  String? ccdate;
-  String chiefComplaint;
+  String? chiefComplaint;
-  String clinicDescription;
+  String? clinicDescription;
-  int clinicID;
+  int? clinicID;
-  String currentMedication;
+  String? currentMedication;
-  int doctorID;
+  int? doctorID;
-  String doctorName;
+  String? doctorName;
-  int episodeId;
+  int? episodeId;
-  String hopi;
+  String? hopi;
-  int patientMRN;
+  int? patientMRN;
-  int status;
+  int? status;
 
   GetChiefComplaintResModel(
       {this.appointmentNo,

lib/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart

@@ -1,14 +1,14 @@
 class PostChiefComplaintRequestModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeID;
+  int? episodeID;
-  int patientMRN;
+  int? patientMRN;
-  int admissionNo;
+  int? admissionNo;
-  String chiefComplaint;
+  String? chiefComplaint;
-  String hopi;
+  String? hopi;
-  String currentMedication;
+  String? currentMedication;
-  bool ispregnant;
+  bool? ispregnant;
-  bool isLactation;
+  bool? isLactation;
-  int numberOfWeeks;
+  int? numberOfWeeks;
   dynamic doctorID;
   dynamic editedBy;
 

lib/core/model/SOAP/general_get_req_for_SOAP.dart

@@ -1,7 +1,7 @@
 class GeneralGetReqForSOAP {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
   dynamic editedBy;
   dynamic doctorID;
 

lib/core/model/SOAP/history/get_history_req_model.dart

@@ -1,11 +1,11 @@
 class GetHistoryReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int historyType;
+  int? historyType;
-  String episodeID;
+  String? episodeID;
-  String from;
+  String? from;
-  String to;
+  String? to;
-  int clinicID;
+  int? clinicID;
-  int appointmentNo;
+  int? appointmentNo;
   dynamic editedBy;
   dynamic doctorID;
 

lib/core/model/SOAP/history/get_history_res_model.dart

@@ -1,11 +1,11 @@
 class GetHistoryResModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
-  int historyId;
+  int? historyId;
-  int historyType;
+  int? historyType;
-  bool isChecked;
+  bool? isChecked;
-  int patientMRN;
+  int? patientMRN;
-  String remarks;
+  String? remarks;
 
   GetHistoryResModel(
       {this.appointmentNo,

lib/core/model/SOAP/history/post_histories_request_model.dart

@@ -1,14 +1,14 @@
 class PostHistoriesRequestModel {
-  List<ListMedicalHistoryVM> listMedicalHistoryVM;
+  List<ListMedicalHistoryVM>? listMedicalHistoryVM;
   dynamic doctorID;
 
   PostHistoriesRequestModel({this.listMedicalHistoryVM, this.doctorID});
 
   PostHistoriesRequestModel.fromJson(Map<String, dynamic> json) {
     if (json['listMedicalHistoryVM'] != null) {
-      listMedicalHistoryVM = new List<ListMedicalHistoryVM>();
+      listMedicalHistoryVM = <ListMedicalHistoryVM>[];
       json['listMedicalHistoryVM'].forEach((v) {
-        listMedicalHistoryVM.add(new ListMedicalHistoryVM.fromJson(v));
+        listMedicalHistoryVM!.add(new ListMedicalHistoryVM.fromJson(v));
       });
     }
     doctorID = json['DoctorID'];
@@ -18,7 +18,7 @@ class PostHistoriesRequestModel {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.listMedicalHistoryVM != null) {
       data['listMedicalHistoryVM'] =
-          this.listMedicalHistoryVM.map((v) => v.toJson()).toList();
+          this.listMedicalHistoryVM!.map((v) => v.toJson()).toList();
     }
     data['DoctorID'] = this.doctorID;
     return data;
@@ -26,13 +26,13 @@ class PostHistoriesRequestModel {
 }
 
 class ListMedicalHistoryVM {
-  int patientMRN;
+  int? patientMRN;
-  int historyType;
+  int? historyType;
-  int historyId;
+  int? historyId;
-  int episodeId;
+  int? episodeId;
-  int appointmentNo;
+  int? appointmentNo;
-  bool isChecked;
+  bool? isChecked;
-  String remarks;
+  String? remarks;
 
   ListMedicalHistoryVM(
       {this.patientMRN,

lib/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart

@@ -1,7 +1,7 @@
 class GetEpisodeForInpatientReqModel {
-  int patientID;
+  int? patientID;
-  int patientTypeID;
+  int? patientTypeID;
-  int admissionNo;
+  int? admissionNo;
 
   GetEpisodeForInpatientReqModel(
       {this.patientID, this.patientTypeID, this.admissionNo});

lib/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart

@@ -1,7 +1,7 @@
 class PostEpisodeForInpatientRequestModel {
-  int admissionNo;
+  int? admissionNo;
-  int patientID;
+  int? patientID;
-  int patientTypeID;
+  int? patientTypeID;
 
   PostEpisodeForInpatientRequestModel(
       {this.admissionNo, this.patientID, this.patientTypeID = 1});

lib/core/model/SOAP/master_key_model.dart

@@ -1,6 +1,6 @@
 class MasterKeyModel {
-  String alias;
+  String? alias;
-  String aliasN;
+  String? aliasN;
   dynamic code;
   dynamic description;
   dynamic detail1;
@@ -8,13 +8,13 @@ class MasterKeyModel {
   dynamic detail3;
   dynamic detail4;
   dynamic detail5;
-  int groupID;
+  int? groupID;
-  int id;
+  int? id;
-  String nameAr;
+  String? nameAr;
-  String nameEn;
+  String? nameEn;
   dynamic remarks;
-  int typeId;
+  int? typeId;
-  String valueList;
+  String? valueList;
 
   MasterKeyModel(
       {this.alias,

lib/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart

@@ -1,23 +1,23 @@
 class GetPhysicalExamResModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int createdBy;
+  int? createdBy;
-  String createdByName;
+  String? createdByName;
-  String createdOn;
+  String? createdOn;
-  Null editedBy;
+  dynamic editedBy;
-  String editedByName;
+  String? editedByName;
-  String editedOn;
+  String? editedOn;
-  int episodeId;
+  int? episodeId;
-  int examId;
+  int? examId;
-  String examName;
+  String? examName;
-  int examType;
+  int? examType;
-  int examinationType;
+  int? examinationType;
-  String examinationTypeName;
+  String? examinationTypeName;
-  bool isAbnormal;
+  bool? isAbnormal;
-  bool isNew;
+  bool? isNew;
-  bool isNormal;
+  bool? isNormal;
-  bool notExamined;
+  bool? notExamined;
-  int patientMRN;
+  int? patientMRN;
-  String remarks;
+  String? remarks;
 
   GetPhysicalExamResModel(
       {this.appointmentNo,

lib/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart

@@ -1,10 +1,10 @@
 class GetPhysicalExamReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int admissionNo;
+  int? admissionNo;
-  String episodeID;
+  String? episodeID;
-  String from;
+  String? from;
-  String to;
+  String? to;
   dynamic editedBy;
   dynamic doctorID;
 

lib/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart

@@ -1,16 +1,13 @@
 class PostPhysicalExamRequestModel {
-  List<ListHisProgNotePhysicalExaminationVM>
+  List<ListHisProgNotePhysicalExaminationVM>? listHisProgNotePhysicalExaminationVM;
-      listHisProgNotePhysicalExaminationVM;
 
   PostPhysicalExamRequestModel({this.listHisProgNotePhysicalExaminationVM});
 
   PostPhysicalExamRequestModel.fromJson(Map<String, dynamic> json) {
     if (json['listHisProgNotePhysicalExaminationVM'] != null) {
-      listHisProgNotePhysicalExaminationVM =
+      listHisProgNotePhysicalExaminationVM = <ListHisProgNotePhysicalExaminationVM>[];
-          new List<ListHisProgNotePhysicalExaminationVM>();
       json['listHisProgNotePhysicalExaminationVM'].forEach((v) {
-        listHisProgNotePhysicalExaminationVM
+        listHisProgNotePhysicalExaminationVM!.add(new ListHisProgNotePhysicalExaminationVM.fromJson(v));
-            .add(new ListHisProgNotePhysicalExaminationVM.fromJson(v));
       });
     }
   }
@@ -18,36 +15,33 @@ class PostPhysicalExamRequestModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.listHisProgNotePhysicalExaminationVM != null) {
-      data['listHisProgNotePhysicalExaminationVM'] = this
+      data['listHisProgNotePhysicalExaminationVM'] = this.listHisProgNotePhysicalExaminationVM!.map((v) => v.toJson()).toList();
-          .listHisProgNotePhysicalExaminationVM
-          .map((v) => v.toJson())
-          .toList();
     }
     return data;
   }
 }
 
 class ListHisProgNotePhysicalExaminationVM {
-  int episodeId;
+  int? episodeId;
-  int appointmentNo;
+  int? appointmentNo;
-  int admissionNo;
+  int? admissionNo;
-  int examType;
+  int? examType;
-  int examId;
+  int? examId;
-  int patientMRN;
+  int? patientMRN;
-  bool isNormal;
+  bool? isNormal;
-  bool isAbnormal;
+  bool? isAbnormal;
-  bool notExamined;
+  bool? notExamined;
-  String examName;
+  String? examName;
-  String examinationTypeName;
+  String? examinationTypeName;
-  int examinationType;
+  int? examinationType;
-  String remarks;
+  String? remarks;
-  bool isNew;
+  bool? isNew;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  String createdByName;
+  String? createdByName;
-  int editedBy;
+  int? editedBy;
-  String editedOn;
+  String? editedOn;
-  String editedByName;
+  String? editedByName;
 
   ListHisProgNotePhysicalExaminationVM(
       {this.episodeId,

lib/core/model/SOAP/post_episode_req_model.dart

@@ -1,8 +1,8 @@
 class PostEpisodeReqModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int patientMRN;
+  int? patientMRN;
-  int doctorID;
+  int? doctorID;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
 
   PostEpisodeReqModel(
       {this.appointmentNo,

lib/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart

@@ -1,15 +1,15 @@
 class GetPatientProgressNoteResModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int createdBy;
+  int? createdBy;
-  String createdByName;
+  String? createdByName;
-  String createdOn;
+  String? createdOn;
-  String dName;
+  String? dName;
-  String editedByName;
+  String? editedByName;
-  String editedOn;
+  String? editedOn;
-  int episodeId;
+  int? episodeId;
-  String mName;
+  String? mName;
-  int patientMRN;
+  int? patientMRN;
-  String planNote;
+  String? planNote;
 
   GetPatientProgressNoteResModel(
       {this.appointmentNo,

lib/core/model/SOAP/progress_note/get_progress_note_req_model.dart

@@ -1,10 +1,10 @@
 class GetProgressNoteReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  String episodeID;
+  String? episodeID;
-  String from;
+  String? from;
-  String to;
+  String? to;
-  int clinicID;
+  int? clinicID;
   dynamic doctorID;
   dynamic editedBy;
 

lib/core/model/SOAP/progress_note/post_progress_note_request_model.dart

@@ -1,8 +1,8 @@
 class PostProgressNoteRequestModel {
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeId;
+  int? episodeId;
-  int patientMRN;
+  int? patientMRN;
-  String planNote;
+  String? planNote;
   dynamic doctorID;
   dynamic editedBy;
 

lib/core/model/SOAP/selected_items/my_selected_allergy.dart

@@ -1,14 +1,14 @@
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 
 class MySelectedAllergy {
-  MasterKeyModel selectedAllergySeverity;
+  MasterKeyModel? selectedAllergySeverity;
-  MasterKeyModel selectedAllergy;
+  MasterKeyModel? selectedAllergy;
-  String remark;
+  String? remark;
-  bool isChecked;
+  bool? isChecked;
-  bool isExpanded;
+  bool? isExpanded;
-  bool isLocal;
+  bool? isLocal;
-  int createdBy;
+  int? createdBy;
-  bool hasValidationError;
+  bool? hasValidationError;
 
   MySelectedAllergy(
       {this.selectedAllergySeverity,

lib/core/model/SOAP/selected_items/my_selected_assement.dart

@@ -1,16 +1,16 @@
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 
 class MySelectedAssessment {
-  MasterKeyModel selectedICD;
+  MasterKeyModel? selectedICD;
-  MasterKeyModel selectedDiagnosisCondition;
+  MasterKeyModel? selectedDiagnosisCondition;
-  MasterKeyModel selectedDiagnosisType;
+  MasterKeyModel? selectedDiagnosisType;
-  String remark;
+  String? remark;
-  int appointmentId;
+  int? appointmentId;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  int doctorID;
+  int? doctorID;
-  String doctorName;
+  String? doctorName;
-  String icdCode10ID;
+  String? icdCode10ID;
 
   MySelectedAssessment(
       {this.selectedICD,

lib/core/model/SOAP/selected_items/my_selected_examination.dart

@@ -1,16 +1,16 @@
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 
 class MySelectedExamination {
-  MasterKeyModel selectedExamination;
+  MasterKeyModel? selectedExamination;
-  String remark;
+  String? remark;
-  bool isNormal;
+  bool? isNormal;
-  bool isAbnormal;
+  bool? isAbnormal;
-  bool notExamined;
+  bool? notExamined;
-  bool isNew;
+  bool? isNew;
-  bool isLocal;
+  bool? isLocal;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  String editedOn;
+  String? editedOn;
 
   MySelectedExamination({
     this.selectedExamination,

lib/core/model/SOAP/selected_items/my_selected_history.dart

@@ -1,10 +1,10 @@
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 
 class MySelectedHistory {
-  MasterKeyModel selectedHistory;
+  MasterKeyModel? selectedHistory;
-  String remark;
+  String? remark;
-  bool isChecked;
+  bool? isChecked;
-  bool isLocal;
+  bool? isLocal;
 
   MySelectedHistory(
       {this.selectedHistory, this.remark, this.isChecked, this.isLocal = true});

lib/core/model/auth/insert_imei_model.dart

@@ -1,22 +1,22 @@
 class InsertIMEIDetailsModel {
   String? iMEI;
   int? logInTypeID;
-  dynamic? outSA;
+  dynamic outSA;
   String? mobile;
-  dynamic? identificationNo;
+  dynamic identificationNo;
   int? doctorID;
   String? doctorName;
   String? doctorNameN;
   int? clinicID;
   String? clinicDescription;
-  Null? clinicDescriptionN;
+  dynamic clinicDescriptionN;
   String? projectName;
   String? genderDescription;
-  Null? genderDescriptionN;
+  dynamic genderDescriptionN;
   String? titleDescription;
-  Null? titleDescriptionN;
+  dynamic titleDescriptionN;
   bool? bioMetricEnabled;
-  Null? preferredLanguage;
+  dynamic preferredLanguage;
   bool? isActive;
   int? editedBy;
   int? projectID;

lib/core/model/calculate_box_request_model.dart

@@ -1,9 +1,9 @@
 class CalculateBoxQuantityRequestModel {
-  int itemCode;
+  int? itemCode;
-  double strength;
+  double? strength;
-  int frequency;
+  int? frequency;
-  int duration;
+  int? duration;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
 
   CalculateBoxQuantityRequestModel(
       {this.itemCode,

lib/core/model/chart_axis_model.dart

@@ -1,7 +1,7 @@
 /// Sample linear data type.
 class ChartAxis {
-  final int xAxis;
+  final int? xAxis;
-  final int yAxis;
+  final int? yAxis;
 
   ChartAxis(this.xAxis, this.yAxis);
 }

lib/core/model/charts/app_time_series_chart.dart

@@ -1,13 +1,13 @@
 class TimeSeriesSales {
   final DateTime time;
-  final int sales;
+  final int? sales;
 
   TimeSeriesSales(this.time, this.sales);
 }
 
 class TimeSeriesSales2 {
   final DateTime time;
-  final double sales;
+  final double? sales;
 
   TimeSeriesSales2(this.time, this.sales);
 }

lib/core/model/countries_model.dart

@@ -1,8 +1,8 @@
 class Countries {
-  String name;
+  String? name;
-  String nameAr;
+  String? nameAr;
-  String code;
+  String? code;
-  String countryCode;
+  String? countryCode;
 
   Countries({this.name, this.nameAr, this.code, this.countryCode});
 

lib/core/model/hospitals_model.dart

@@ -1,20 +1,20 @@
 class HospitalsModel {
-  String desciption;
+  String? desciption;
   dynamic desciptionN;
-  int iD;
+  int? iD;
-  String legalName;
+  String? legalName;
-  String legalNameN;
+  String? legalNameN;
-  String name;
+  String? name;
   dynamic nameN;
-  String phoneNumber;
+  String? phoneNumber;
-  String setupID;
+  String? setupID;
-  int distanceInKilometers;
+  int? distanceInKilometers;
-  bool isActive;
+  bool? isActive;
-  String latitude;
+  String? latitude;
-  String longitude;
+  String? longitude;
-  int mainProjectID;
+  int? mainProjectID;
   dynamic projectOutSA;
-  bool usingInDoctorApp;
+  bool? usingInDoctorApp;
 
   HospitalsModel(
       {this.desciption,

lib/core/model/insurance/insurance_approval.dart

@@ -155,48 +155,48 @@ class InsuranceApprovalModel {
 
 // class InsuranceApprovalModel {
 //   String setupID;
-//   int projectID;
+//   int? projectID;
-//   int approvalNo;
+//   int? approvalNo;
 //   String approvalDate;
-//   int patientType;
+//   int? patientType;
-//   int patientID;
+//   int? patientID;
-//   int companyID;
+//   int? companyID;
-//   int subCategoryID;
+//   int? subCategoryID;
-//   int doctorID;
+//   int? doctorID;
-//   int clinicID;
+//   int? clinicID;
-//   int approvalType;
+//   int? approvalType;
 //   Null inpatientApprovalSubType;
 //   String validFrom;
 //   Null vaildDays;
 //   String validTo;
 //   Null isApprovalOnGross;
 //   Null isPackage;
-//   int requestedAmount;
+//   int? requestedAmount;
-//   bool isDentalAllowedBackend;
+//   bool? isDentalAllowedBackend;
-//   int patientTypeID;
+//   int? patientTypeID;
 //
 //   String companyApprovalNo;
 //
 //   String submitOn;
 //   String receiptOn;
 //
-//   int status;
+//   int? status;
-//   int eXuldAPPNO;
+//   int? eXuldAPPNO;
 //   String feedbackStatusOn;
-//   int authorizerID;
+//   int? authorizerID;
 //   String expiryDate;
-//   int appointmentNo;
+//   int? appointmentNo;
-//   int admissionNo;
+//   int? admissionNo;
 //
-//   int createdBy;
+//   int? createdBy;
 //   String createdOn;
-//   int editedBy;
+//   int? editedBy;
 //   String editedOn;
 //
 //   String extendedOn;
 //
-//   int noOrderAuthorizerID;
+//   int? noOrderAuthorizerID;
-//   bool isVerbalApproval;
+//   bool? isVerbalApproval;
 //
 //   List<ApporvalDetails> apporvalDetails;
 //   String approvalStatusDescption;
@@ -206,23 +206,23 @@ class InsuranceApprovalModel {
 //   String doctorImageURL;
 //   String doctorName;
 //
-//   int doctorRate;
+//   int? doctorRate;
 //   String doctorTitle;
-//   int gender;
+//   int? gender;
 //   String genderDescription;
-//   bool isActiveDoctorProfile;
+//   bool? isActiveDoctorProfile;
-//   bool isExecludeDoctor;
+//   bool? isExecludeDoctor;
-//   bool isInOutPatient;
+//   bool? isInOutPatient;
 //   String isInOutPatientDescription;
 //   String isInOutPatientDescriptionN;
-//   bool isLiveCareAppointment;
+//   bool? isLiveCareAppointment;
 //   String projectName;
 //
 //   String qR;
 //   List<String> speciality;
 //
-//   int totaUnUsedCount;
+//   int? totaUnUsedCount;
-//   int unUsedCount;
+//   int? unUsedCount;
 //
 //   InsuranceApprovalModel(
 //       {this.setupID,
@@ -435,7 +435,7 @@ class InsuranceApprovalModel {
 // }
 //
 // class ApporvalDetails {
-//   int approvalNo;
+//   int? approvalNo;
 //
 //   String procedureName;
 //   //String procedureNameN;

lib/core/model/insurance_approval_request_model.dart

@@ -1,17 +1,17 @@
 class InsuranceApprovalInPatientRequestModel {
-  int patientID;
+  int? patientID;
-  int patientTypeID;
+  int? patientTypeID;
-  int eXuldAPPNO;
+  int? eXuldAPPNO;
-  int projectID;
+  int? projectID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
 
   InsuranceApprovalInPatientRequestModel(
       {this.patientID,

lib/core/model/labs/lab_result.dart

@@ -94,11 +94,11 @@ class LabResult {
     return data;
   }
 
-  int checkResultStatus() {
+  int? checkResultStatus() {
     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 (result > max) {
           return 1;

lib/core/model/live_care/AlternativeServicesList.dart

@@ -34,7 +34,7 @@ class AlternativeServicesList with ChangeNotifier {
     notifyListeners();
   }
 
-  setSelected(AlternativeService service, bool isSelected) {
+  setSelected(AlternativeService service, bool? isSelected) {
     List<AlternativeService> alternativeService = _alternativeServicesList
         .where((element) => service.serviceID == element.serviceID)
         .toList();

lib/core/model/patient/PatientArrivalEntity.dart

@@ -1,22 +1,22 @@
 class PatientArrivalEntity {
-  String age;
+  String? age;
-  String appointmentDate;
+  String? appointmentDate;
-  int appointmentNo;
+  int? appointmentNo;
-  String appointmentType;
+  String? appointmentType;
-  String arrivedOn;
+  String? arrivedOn;
-  String companyName;
+  String? companyName;
-  String endTime;
+  String? endTime;
-  int episodeNo;
+  int? episodeNo;
-  int fallRiskScore;
+  int? fallRiskScore;
-  String gender;
+  String? gender;
-  int medicationOrders;
+  int? medicationOrders;
-  String mobileNumber;
+  String? mobileNumber;
-  String nationality;
+  String? nationality;
-  int patientMRN;
+  int? patientMRN;
-  String patientName;
+  String? patientName;
-  int rowCount;
+  int? rowCount;
-  String startTime;
+  String? startTime;
-  String visitType;
+  String? visitType;
 
   PatientArrivalEntity(
       {this.age,

lib/core/model/patient/get_clinic_by_project_id_request.dart

@@ -1,39 +1,15 @@
 class ClinicByProjectIdRequest {
-  /*
+  int? projectID;
- *@author: Ibrahim Albitar
+  int? languageID;
- *@Date:03/06/2020
+  String? stamp;
- *@param:
+  String? iPAdress;
- *@return:
+  double? versionID;
- *@desc:   ClinicByProjectIdRequest
+  int? channel;
- */
+  String? tokenID;
-
+  String? sessionID;
-  int projectID;
+  bool? isLoginForDoctorApp;
-  int languageID;
+  bool? patientOutSA;
-  String stamp;
+  int? patientTypeID;
-  String iPAdress;
-  double versionID;
-  int channel;
-  String tokenID;
-  String sessionID;
-  bool isLoginForDoctorApp;
-  bool patientOutSA;
-  int patientTypeID;
-
-  /*
-  {
-    "ProjectID": 21,
-    "LanguageID": 2,
-    "stamp": "2020-06-03T11:18:19.979Z",
-    "IPAdress": "11.11.11.11",
-    "VersionID": 1.2,
-    "Channel": 9,
-    "TokenID": "gyIQFH4WWEm2Tq7xjYMjsg==",
-    "SessionID": "JBXRsDl37L",
-    "IsLoginForDoctorApp": true,
-    "PatientOutSA": false,
-    "PatientTypeID": 1
-}
-  */
   
   ClinicByProjectIdRequest(
       {this.projectID,

lib/core/model/patient/get_doctor_by_clinic_id_request.dart

@@ -1,16 +1,16 @@
 class DoctorsByClinicIdRequest {
-  int clinicID;
+  int? clinicID;
-  int projectID;
+  int? projectID;
-  bool continueDentalPlan;
+  bool? continueDentalPlan;
-  bool isSearchAppointmnetByClinicID;
+  bool? isSearchAppointmnetByClinicID;
-  int patientID;
+  int? patientID;
-  int gender;
+  int? gender;
-  bool isGetNearAppointment;
+  bool? isGetNearAppointment;
-  bool isVoiceCommand;
+  bool? isVoiceCommand;
-  int latitude;
+  int? latitude;
-  int longitude;
+  int? longitude;
-  bool license;
+  bool? license;
-  bool isDentalAllowedBackend;
+  bool? isDentalAllowedBackend;
 
   DoctorsByClinicIdRequest({
     this.clinicID,

lib/core/model/patient/get_list_stp_referral_frequency_request.dart

@@ -1,37 +1,16 @@
 class STPReferralFrequencyRequest {
-/*
- *@author: Ibrahim Albitar
- *@Date:03/06/2020
- *@param:
- *@return:
- *@desc:
- */
 
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
 
-  /*
-{
-    "LanguageID": 2,
-    "stamp": "2020-06-03T11:18:19.986Z",
-    "IPAdress": "11.11.11.11",
-    "VersionID": 1.2,
-    "Channel": 9,
-    "TokenID": "gyIQFH4WWEm2Tq7xjYMjsg==",
-    "SessionID": "JBXRsDl37L",
-    "IsLoginForDoctorApp": true,
-    "PatientOutSA": false,
-    "PatientTypeID": 1
-}
-  */
 
   STPReferralFrequencyRequest(
       {this.languageID = 2,

lib/core/model/patient/get_pending_patient_er_model.dart

@@ -1,10 +1,4 @@
-/*
+
- *@author: Amjad  Amireh
- *@Date:15/6/2020
- *@param:
- *@return:
- *@desc:   Find list of pending patients Model
- */
 import 'dart:convert';
 
 ListPendingPatientListModel listPendingPatientListModelFromJson(String str) =>
@@ -58,43 +52,43 @@ class ListPendingPatientListModel {
 
   dynamic acceptedBy;
   dynamic acceptedOn;
-  int age;
+  int? age;
   dynamic appointmentNo;
-  String arrivalTime;
+  String? arrivalTime;
-  String arrivalTimeD;
+  String? arrivalTimeD;
-  int callStatus;
+  int? callStatus;
-  String clientRequestId;
+  String? clientRequestId;
-  String clinicName;
+  String? clinicName;
   dynamic consoltationEnd;
   dynamic consultationNotes;
   dynamic createdOn;
-  DateTime dateOfBirth;
+  DateTime? dateOfBirth;
-  String deviceToken;
+  String? deviceToken;
-  String deviceType;
+  String? deviceType;
   dynamic doctorName;
-  String editOn;
+  String? editOn;
-  String gender;
+  String? gender;
-  bool isFollowUp;
+  bool? isFollowUp;
   dynamic isFromVida;
-  int isLoginB;
+  int? isLoginB;
-  bool isOutKsa;
+  bool? isOutKsa;
-  int isRejected;
+  int? isRejected;
-  String language;
+  String? language;
-  double latitude;
+  double? latitude;
-  double longitude;
+  double? longitude;
-  String mobileNumber;
+  String? mobileNumber;
   dynamic openSession;
   dynamic openTokenId;
-  String patientId;
+  String? patientId;
-  String patientName;
+  String? patientName;
-  int patientStatus;
+  int? patientStatus;
-  String preferredLanguage;
+  String? preferredLanguage;
-  int projectId;
+  int? projectId;
-  int scoring;
+  int? scoring;
-  int serviceId;
+  int? serviceId;
   dynamic tokenId;
-  int vcId;
+  int? vcId;
-  String voipToken;
+  String? voipToken;
 
   factory ListPendingPatientListModel.fromJson(Map<String, dynamic> json) =>
       ListPendingPatientListModel(
@@ -153,7 +147,7 @@ class ListPendingPatientListModel {
         "ConsultationNotes": consultationNotes,
         "CreatedOn": createdOn,
         "DateOfBirth":
-            "${dateOfBirth.year.toString().padLeft(4, '0')}-${dateOfBirth.month.toString().padLeft(2, '0')}-${dateOfBirth.day.toString().padLeft(2, '0')}",
+            "${dateOfBirth!.year.toString().padLeft(4, '0')}-${dateOfBirth!.month.toString().padLeft(2, '0')}-${dateOfBirth!.day.toString().padLeft(2, '0')}",
         "DeviceToken": deviceToken,
         "DeviceType": deviceType,
         "DoctorName": doctorName,

lib/core/model/patient/insurance_aprovals_request.dart

@@ -1,39 +1,18 @@
-/* 
- *@author: Ibrahim Albitar 
- *@Date:15/5/2020  
 
- *@param:
- {"PatientID":1089227,
- "PatientTypeID":1,
- "EXuldAPPNO":0,
- "ProjectID":12,
- "LanguageID":2,
- "stamp":"2020-04-01T09:47:19.643Z",
- "IPAdress":"11.11.11.11",
- "VersionID":1.2,
- "Channel":9,
- "TokenID":"yIwh6wNyUkOeQlJRohWjyw==",
- "SessionID":"LlBk8lUEJY",
- "IsLoginForDoctorApp":true,
- "PatientOutSA":false}  
-
- *@return:
- *@desc:
- */
 class InsuranceAprovalsRequest {
-  int exuldAppNO;
+  int? exuldAppNO;
-  int patientID;
+  int? patientID;
-  int channel;
+  int? channel;
-  int projectID;
+  int? projectID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String ipAdress;
+  String? ipAdress;
-  double versionID;
+  double? versionID;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
 
   InsuranceAprovalsRequest(
       {this.exuldAppNO,

lib/core/model/patient/orders_request.dart

@@ -1,40 +1,19 @@
-/*
- *@author: Ibrahim Albitar 
- *@Date:15/5/2020  
 
- *@param:
-{"VisitType":3,
-"AdmissionNo":2020004683,
-"ProjectID":12,
-"LanguageID":2,
-"stamp":"2020-04-01T09:53:50.410Z",
-"IPAdress":"11.11.11.11",
-"VersionID":1.2,
-"Channel":9,
-"TokenID":"yIwh6wNyUkOeQlJRohWjyw==",
-"SessionID":"LlBk8lUEJY",
-"IsLoginForDoctorApp":true,
-"PatientOutSA":false,
-"PatientTypeID":1} 
-
-*@return:
- *@desc:
- */
 
 class OrdersRequest {
-  int visitType;
+  int? visitType;
-  int admissionNo;
+  int? admissionNo;
-  int projectID;
+  int? projectID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
-  double versionID;
+  double? versionID;
 
   OrdersRequest(
       {this.visitType,

lib/core/model/patient/patiant_info_model.dart

@@ -4,81 +4,81 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 
 class PatiantInformtion {
-  PatiantInformtion patientDetails;
+  PatiantInformtion? patientDetails;
-  int genderInt;
+  int? genderInt;
   dynamic age;
-  String appointmentDate;
+  String? appointmentDate;
-  DateTime appointmentDateWithDateTimeForm;
+  DateTime? appointmentDateWithDateTimeForm;
   dynamic appointmentNo;
   dynamic appointmentType;
-  String arrivalTime;
+  String? arrivalTime;
-  String arrivalTimeD;
+  String? arrivalTimeD;
-  int callStatus;
+  int? callStatus;
   dynamic callStatusDisc;
-  int callTypeID;
+  int? callTypeID;
-  String clientRequestID;
+  String? clientRequestID;
-  String clinicName;
+  String? clinicName;
-  String consoltationEnd;
+  String? consoltationEnd;
-  String consultationNotes;
+  String? consultationNotes;
-  int appointmentTypeId;
+  int? appointmentTypeId;
-  String arrivedOn;
+  String? arrivedOn;
-  int clinicGroupId;
+  int? clinicGroupId;
-  String companyName;
+  String? companyName;
   dynamic dischargeStatus;
   dynamic doctorDetails;
-  int doctorId;
+  int? doctorId;
-  String endTime;
+  String? endTime;
-  int episodeNo;
+  int? episodeNo;
-  int fallRiskScore;
+  int? fallRiskScore;
-  bool isSigned;
+  bool? isSigned;
-  int medicationOrders;
+  int? medicationOrders;
-  String mobileNumber;
+  String? mobileNumber;
-  String nationality;
+  String? nationality;
-  int projectId;
+  int? projectId;
-  int clinicId;
+  int? clinicId;
   dynamic patientId;
-  String doctorName;
+  String? doctorName;
-  String doctorNameN;
+  String? doctorNameN;
-  String firstName;
+  String? firstName;
-  String middleName;
+  String? middleName;
-  String lastName;
+  String? lastName;
-  String firstNameN;
+  String? firstNameN;
-  String middleNameN;
+  String? middleNameN;
-  String lastNameN;
+  String? lastNameN;
-  String fullName;
+  String? fullName;
-  String fullNameN;
+  String? fullNameN;
-  int gender;
+  int? gender;
-  String dateofBirth;
+  String? dateofBirth;
-  String nationalityId;
+  String? nationalityId;
-  String emailAddress;
+  String? emailAddress;
-  String patientIdentificationNo;
+  String? patientIdentificationNo;
-  int patientType;
+  int? patientType;
-  int patientMRN;
+  int? patientMRN;
-  String admissionNo;
+  String? admissionNo;
-  String admissionDate;
+  String? admissionDate;
-  DateTime admissionDateWithDateTimeForm;
+  DateTime? admissionDateWithDateTimeForm;
-  String createdOn;
+  String? createdOn;
-  String roomId;
+  String? roomId;
-  String bedId;
+  String? bedId;
-  String nursingStationId;
+  String? nursingStationId;
-  String description;
+  String? description;
-  String clinicDescription;
+  String? clinicDescription;
-  String clinicDescriptionN;
+  String? clinicDescriptionN;
-  String nationalityName;
+  String? nationalityName;
-  String nationalityNameN;
+  String? nationalityNameN;
-  String genderDescription;
+  String? genderDescription;
-  String nursingStationName;
+  String? nursingStationName;
-  String startTime;
+  String? startTime;
-  String visitType;
+  String? visitType;
-  String nationalityFlagURL;
+  String? nationalityFlagURL;
-  int patientStatus;
+  int? patientStatus;
-  int patientStatusType;
+  int? patientStatusType;
-  int visitTypeId;
+  int? visitTypeId;
-  String startTimes;
+  String? startTimes;
-  String dischargeDate;
+  String? dischargeDate;
-  int status;
+  int? status;
-  int vcId;
+  int? vcId;
-  String voipToken;
+  String? voipToken;
 
   PatiantInformtion(
       {this.patientDetails,
@@ -167,7 +167,7 @@ class PatiantInformtion {
       doctorId = json["DoctorID"] ?? json["doctorID"];
       patientId = json["PatientID"] != null
           ? json["PatientID"] is String
-              ? int.parse(json["PatientID"])
+              ? int?.parse(json["PatientID"])
               : json["PatientID"]
           : json["patientID"] ?? json['patientMRN'] ?? json['PatientMRN'];
       doctorName = json["DoctorName"] ?? json["doctorName"];
@@ -180,7 +180,7 @@ class PatiantInformtion {
       lastNameN = json["LastNameN"] ?? json["lastNameN"];
       gender = json["Gender"] != null
           ? json["Gender"] is String
-              ? int.parse(json["Gender"])
+              ? int?.parse(json["Gender"])
               : json["Gender"]
           : json["gender"];
       fullName = json["fullName"] ?? json["fullName"] ?? json["PatientName"];
@@ -319,7 +319,7 @@ class PatiantInformtion {
 
     data['Age'] = this.age;
     data['AppointmentDate'] =
-        this.appointmentDate.isNotEmpty ? this.appointmentDate : null;
+        this.appointmentDate!.isNotEmpty ? this.appointmentDate : null;
 
     data['AppointmentNo'] = this.appointmentNo;
     data['ArrivalTime'] = this.arrivalTime;

lib/core/model/patient/patient_model.dart

@@ -1,62 +1,55 @@
-/*
+
- *@author:Modified by amjad add getter and setter Amjad Amireh 
- *@Date:11/5/2020
- *@param:
- *@return:PatientsScreen Search textbox filter
-
- *@desc:
- */
 class PatientModel {
-  int ProjectID;
+  int? ProjectID;
-  int ClinicID;
+  int? ClinicID;
-  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 LanguageID;
+  int? LanguageID;
-  String stamp;
+  String? stamp;
-  String IPAdress;
+  String? IPAdress;
-  double VersionID;
+  double? VersionID;
-  int Channel;
+  int? Channel;
-  String TokenID;
+  String? TokenID;
-  String SessionID;
+  String? SessionID;
-  bool IsLoginForDoctorApp;
+  bool? IsLoginForDoctorApp;
-  bool PatientOutSA;
+  bool? PatientOutSA;
-  int Searchtype;
+  int? Searchtype;
-  String IdentificationNo;
+  String? IdentificationNo;
-  String MobileNo;
+  String? MobileNo;
 
-  int get getProjectID => ProjectID;
+  int? get getProjectID => ProjectID;
 
-  set setProjectID(int ProjectID) => this.ProjectID = ProjectID;
+  set setProjectID(int? ProjectID) => this.ProjectID = ProjectID;
 
-  int get getClinicID => ClinicID;
+  int? get getClinicID => ClinicID;
 
-  set setClinicID(int ClinicID) => this.ClinicID = ClinicID;
+  set setClinicID(int? ClinicID) => this.ClinicID = ClinicID;
 
-  int get getDoctorID => DoctorID;
+  int? get getDoctorID => DoctorID;
 
-  set setDoctorID(int DoctorID) => this.DoctorID = DoctorID;
+  set setDoctorID(int? DoctorID) => this.DoctorID = DoctorID;
 
-  String get getFirstName => FirstName;
+  String? get getFirstName => FirstName;
 
   set setFirstName(String FirstName) => this.FirstName = FirstName;
 
-  String get getMiddleName => MiddleName;
+  String? get getMiddleName => MiddleName;
 
   set setMiddleName(String MiddleName) => this.MiddleName = MiddleName;
 
-  String get getLastName => LastName;
+  String? get getLastName => LastName;
 
   set setLastName(String LastName) => this.LastName = LastName;
 
-  String get getPatientMobileNumber => PatientMobileNumber;
+  String? get getPatientMobileNumber => PatientMobileNumber;
 
   set setPatientMobileNumber(String PatientMobileNumber) =>
       this.PatientMobileNumber = PatientMobileNumber;
@@ -65,54 +58,54 @@ class PatientModel {
 
 //  set setPatientIdentificationID(String PatientIdentificationID) => this.PatientIdentificationID = PatientIdentificationID;
 
-  int get getPatientID => PatientID;
+  int? get getPatientID => PatientID;
 
-  set setPatientID(int PatientID) => this.PatientID = PatientID;
+  set setPatientID(int? PatientID) => this.PatientID = PatientID;
 
-  String get getFrom => From;
+  String? get getFrom => From;
 
   set setFrom(String From) => this.From = From;
 
-  String get getTo => To;
+  String? get getTo => To;
 
   set setTo(String To) => this.To = To;
 
-  int get getLanguageID => LanguageID;
+  int? get getLanguageID => LanguageID;
 
-  set setLanguageID(int LanguageID) => this.LanguageID = LanguageID;
+  set setLanguageID(int? LanguageID) => this.LanguageID = LanguageID;
 
-  String get getStamp => stamp;
+  String? get getStamp => stamp;
 
   set setStamp(String stamp) => this.stamp = stamp;
 
-  String get getIPAdress => IPAdress;
+  String? get getIPAdress => IPAdress;
 
   set setIPAdress(String IPAdress) => this.IPAdress = IPAdress;
 
-  double get getVersionID => VersionID;
+  double? get getVersionID => VersionID;
 
-  set setVersionID(double VersionID) => this.VersionID = VersionID;
+  set setVersionID(double? VersionID) => this.VersionID = VersionID;
 
-  int get getChannel => Channel;
+  int? get getChannel => Channel;
 
-  set setChannel(int Channel) => this.Channel = Channel;
+  set setChannel(int? Channel) => this.Channel = Channel;
 
-  String get getTokenID => TokenID;
+  String? get getTokenID => TokenID;
 
   set setTokenID(String TokenID) => this.TokenID = TokenID;
 
-  String get getSessionID => SessionID;
+  String? get getSessionID => SessionID;
 
   set setSessionID(String SessionID) => this.SessionID = SessionID;
 
-  bool get getIsLoginForDoctorApp => IsLoginForDoctorApp;
+  bool? get getIsLoginForDoctorApp => IsLoginForDoctorApp;
 
-  set setIsLoginForDoctorApp(bool IsLoginForDoctorApp) =>
+  set setIsLoginForDoctorApp(bool? IsLoginForDoctorApp) =>
       this.IsLoginForDoctorApp = IsLoginForDoctorApp;
 
-  bool get getPatientOutSA => PatientOutSA;
+  bool? get getPatientOutSA => PatientOutSA;
 
-  set setPatientOutSA(bool PatientOutSA) => this.PatientOutSA = PatientOutSA;
+  set setPatientOutSA(bool? PatientOutSA) => this.PatientOutSA = PatientOutSA;
 
   PatientModel(
       {this.ProjectID,

lib/core/model/patient/progress_note_request.dart

@@ -1,39 +1,17 @@
-/*
- *@author: Ibrahim Albitar 
- *@Date:15/5/2020  
- 
- *@param:
-{"VisitType":5,
-"AdmissionNo":2020004683,
-"ProjectID":12,
-"LanguageID":2,
-"stamp":"2020-04-01T09:41:59.089Z",
-"IPAdress":"11.11.11.11",
-"VersionID":1.2,
-"Channel":9,
-"TokenID":"yIwh6wNyUkOeQlJRohWjyw==",
-"SessionID":"LlBk8lUEJY",
-"IsLoginForDoctorApp":true,
-"PatientOutSA":false,
-"PatientTypeID":1}
-
-*@return:
- *@desc:
- */
 
 class ProgressNoteRequest {
-  int visitType;
+  int? visitType;
-  int admissionNo;
+  int? admissionNo;
-  int projectID;
+  int? projectID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
 
   ProgressNoteRequest(
       {this.visitType,

lib/core/model/patient/reauest_prescription_report_for_in_patient.dart

@@ -1,17 +1,17 @@
 class RequestPrescriptionReportForInPatient {
-  int patientID;
+  int? patientID;
-  int projectID;
+  int? projectID;
-  int admissionNo;
+  int? admissionNo;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
 
   RequestPrescriptionReportForInPatient(
       {this.patientID,

lib/core/model/patient/refer_to_doctor_request.dart

@@ -1,38 +1,31 @@
 import 'package:flutter/cupertino.dart';
 
 class ReferToDoctorRequest {
-/*
- *@author: Ibrahim Albitar
- *@Date:03/06/2020
- *@param:
- *@return:
- *@desc:   ReferToDoctor
- */
 
-  int projectID;
+  int? projectID;
-  int admissionNo;
+  int? admissionNo;
-  String roomID;
+  String? roomID;
-  String referralClinic;
+  String? referralClinic;
-  String referralDoctor;
+  String? referralDoctor;
-  int createdBy;
+  int? createdBy;
-  int editedBy;
+  int? editedBy;
-  int patientID;
+  int? patientID;
-  int patientTypeID;
+  int? patientTypeID;
-  int referringClinic;
+  int? referringClinic;
-  int referringDoctor;
+  int? referringDoctor;
-  String referringDoctorRemarks;
+  String? referringDoctorRemarks;
-  String priority;
+  String? priority;
-  String frequency;
+  String? frequency;
-  String extension;
+  String? extension;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
 
   /*
 {

lib/core/model/patient/request_my_referral_patient_model.dart

@@ -1,24 +1,24 @@
 class RequestMyReferralPatientModel {
-  int projectID;
+  int? projectID;
-  int clinicID;
+  int? clinicID;
-  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 languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
 
   RequestMyReferralPatientModel(
       {this.projectID,

lib/core/model/patient/topten_users_res_model.dart

@@ -1,17 +1,10 @@
-/*
- *@author: Amjad Amireh
- *@Date:27/4/2020  
- *@param: 
- *@return:pass a List<dynamic> to a List<MyModel> from a JSON
 
- *@desc:   
- */
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 
 //ModelResponse
 class ModelResponse {
-  final List<PatiantInformtion> list;
+  final List<PatiantInformtion>? list;
-  String firstName;
+  String? firstName;
 
   ModelResponse({
     this.list,
@@ -19,7 +12,7 @@ class ModelResponse {
   });
 
   factory ModelResponse.fromJson(List<dynamic> parsedJson) {
-    List<PatiantInformtion> list = new List<PatiantInformtion>();
+    List<PatiantInformtion> list = <PatiantInformtion>[];
 
     list = parsedJson.map((i) => PatiantInformtion.fromJson(i)).toList();
 

lib/core/model/patient/vital_sign/vital_sign_res_model.dart

@@ -1,10 +1,3 @@
-/* 
- *@author: Elham Rababah 
- *@Date:6/5/2020  
- *@param: 
- *@return:VitalSignResModel
- *@desc:   VitalSignResModel class
- */
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 
 class VitalSignResModel {
@@ -34,9 +27,9 @@ class VitalSignResModel {
   var painDuration;
   var painCharacter;
   var painFrequency;
-  bool isPainManagementDone;
+  bool? isPainManagementDone;
   var status;
-  bool isVitalsRequired;
+  bool? isVitalsRequired;
   var patientID;
   var createdOn;
   var doctorID;
@@ -44,7 +37,7 @@ class VitalSignResModel {
   var triageCategory;
   var gCScore;
   var lineItemNo;
-  DateTime vitalSignDate;
+  DateTime? vitalSignDate;
   var actualTimeTaken;
   var sugarLevel;
   var fBS;

lib/core/model/patient_muse/PatientMuseResultsModel.dart

@@ -1,19 +1,19 @@
 import 'package:doctor_app_flutter/utils/date-utils.dart';
 
 class PatientMuseResultsModel {
-  int rowID;
+  int? rowID;
-  String setupID;
+  String? setupID;
-  int projectID;
+  int? projectID;
-  String orderNo;
+  String? orderNo;
-  int lineItemNo;
+  int? lineItemNo;
-  int patientType;
+  int? patientType;
-  int patientID;
+  int? patientID;
-  String procedureID;
+  String? procedureID;
   dynamic reportData;
-  String imageURL;
+  String? imageURL;
-  String createdBy;
+  String? createdBy;
-  String createdOn;
+  String? createdOn;
-  DateTime createdOnDateTime;
+  DateTime? createdOnDateTime;
 
   PatientMuseResultsModel(
       {this.rowID,

lib/core/model/patient_muse/PatientSearchRequestModel.dart

@@ -1,20 +1,20 @@
 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;
-  int clinicID = 0;
+  int? clinicID = 0;
-  int loginDoctorID;
+  int? loginDoctorID;
 
 
   PatientSearchRequestModel(

lib/core/model/pending_orders/pending_order_request_model.dart

@@ -1,20 +1,20 @@
 class PendingOrderRequestModel {
-  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;
-  String setupID;
+  String? setupID;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientType;
+  int? patientType;
-  int patientTypeID;
+  int? patientTypeID;
 
   PendingOrderRequestModel(
       {this.isDentalAllowedBackend,

lib/core/model/pending_orders/pending_orders_model.dart

@@ -1,5 +1,5 @@
 class PendingOrderModel {
-  String notes;
+  String? notes;
 
   PendingOrderModel({this.notes});
 

lib/core/model/pharmacies/pharmacies_List_request_model.dart

@@ -1,23 +1,16 @@
-/*
- *@author: Ibrahim Albitar 
- *@Date:27/4/2020  
- *@param: 
- *@return:
- *@desc:
- */
 
 class PharmaciesListRequestModel {
-  int itemID;
+  int? itemID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String ipAdress;
+  String? ipAdress;
-  double versionID;
+  double? versionID;
-  String tokenID;
+  String? tokenID;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int patientTypeID;
+  int? patientTypeID;
-  int channel;
+  int? channel;
 
   PharmaciesListRequestModel(
       {this.itemID,

lib/core/model/pharmacies/pharmacies_items_request_model.dart

@@ -1,23 +1,16 @@
-/* 
- *@author: Ibrahim Albitar 
- *@Date:27/4/2020  
- *@param: 
- *@return:
- *@desc:
- */
 
 class PharmaciesItemsRequestModel {
-  String pHRItemName;
+  String? pHRItemName;
-  int pageIndex = 0;
+  int? pageIndex = 0;
-  int pageSize = 20;
+  int? pageSize = 20;
-  int channel = 3;
+  int? channel = 3;
-  int languageID = 2;
+  int? languageID = 2;
-  String iPAdress = "10.20.10.20";
+  String? iPAdress = "10.20.10.20";
-  String generalid = "Cs2020@2016\$2958";
+  String? generalid = "Cs2020@2016\$2958";
-  int patientOutSA = 0;
+  int? patientOutSA = 0;
-  String sessionID = "KvFJENeAUCxyVdIfEkHw";
+  String? sessionID = "KvFJENeAUCxyVdIfEkHw";
-  bool isDentalAllowedBackend = false;
+  bool? isDentalAllowedBackend = false;
-  int deviceTypeID = 2;
+  int? deviceTypeID = 2;
 
   PharmaciesItemsRequestModel(
       {this.pHRItemName,

lib/core/model/pharmacy-intervention-model/accept_or_reject_req_model.dart

@@ -1,17 +1,17 @@
 class AcceptOrRejectReqModel {
-  int patientID;
+  int? patientID;
-  int projectID;
+  int? projectID;
-  int admissionNo;
+  int? admissionNo;
-  int prescriptionNo;
+  int? prescriptionNo;
-  int orderNo;
+  int? orderNo;
-  String remarks;
+  String? remarks;
-  int memberID;
+  int? memberID;
-  int accessLevel;
+  int? accessLevel;
-  int languageID;
+  int? languageID;
-  int lineItemNo;
+  int? lineItemNo;
-  bool patientOutSA;
+  bool? patientOutSA;
-  int interventionStatus;
+  int? interventionStatus;
-  int status;
+  int? status;
 
   AcceptOrRejectReqModel(
       {this.patientID,

lib/core/model/pharmacy-intervention-model/intervention_medication_history_req_model.dart

@@ -1,9 +1,9 @@
 class InterventionMedicationHistoryReqModel {
-  int projectID;
+  int? projectID;
-  int patientID;
+  int? patientID;
-  int admissionNo;
+  int? admissionNo;
-  int orderNo;
+  int? orderNo;
-  int prescriptionNo;
+  int? prescriptionNo;
 
   InterventionMedicationHistoryReqModel(
       {this.projectID,

lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart

@@ -1,25 +1,25 @@
 class InterventionMedicationHistoryResModel {
-  String setupId;
+  String? setupId;
-  String projectId;
+  String? projectId;
-  int patientId;
+  int? patientId;
-  int admissionNo;
+  int? admissionNo;
-  int prescriptionId;
+  int? prescriptionId;
-  int orderNo;
+  int? orderNo;
-  int id;
+  int? id;
-  int interventionId;
+  int? interventionId;
-  Null intervention;
+  dynamic intervention;
-  String remark;
+  String? remark;
-  int commentedBy;
+  int? commentedBy;
-  bool isDoctor;
+  bool? isDoctor;
-  bool isActive;
+  bool? isActive;
-  int createdBy;
+  int? createdBy;
-  String createdByName;
+  String? createdByName;
-  String createdByNameN;
+  String? createdByNameN;
-  String createdOn;
+  String? createdOn;
-  Null editedBy;
+  dynamic editedBy;
-  Null editedByName;
+  dynamic editedByName;
-  Null editedByNameN;
+  dynamic editedByNameN;
-  Null editedOn;
+  dynamic editedOn;
 
   InterventionMedicationHistoryResModel(
       {this.setupId,

lib/core/model/pharmacy-intervention-model/new_medication_req_model.dart

@@ -1,8 +1,8 @@
 class InterventionMedicationReqModel {
-  int projectID;
+  int? projectID;
-  int patientID;
+  int? patientID;
-  String fromDate;
+  String? fromDate;
-  String toDate;
+  String? toDate;
 
   InterventionMedicationReqModel(
       {this.projectID, this.patientID, this.fromDate, this.toDate});

lib/core/model/pharmacy-intervention-model/new_medication_res_model.dart

@@ -1,26 +1,26 @@
 class InterventionMedicationResModel {
-  String cS;
+  String? cS;
-  String iHR;
+  String? iHR;
-  String setupID;
+  String? setupID;
-  int projectID;
+  int? projectID;
-  int accessLevel;
+  int? accessLevel;
-  int patientID;
+  int? patientID;
-  String patientName;
+  String? patientName;
-  String description;
+  String? description;
-  int admissionNo;
+  int? admissionNo;
-  int orderNo;
+  int? orderNo;
-  int prescriptionNo;
+  int? prescriptionNo;
-  int lineItemNo;
+  int? lineItemNo;
-  int itemID;
+  int? itemID;
-  String medication;
+  String? medication;
-  String doctorComments;
+  String? doctorComments;
-  String startDatetime;
+  String? startDatetime;
-  String stopDatetime;
+  String? stopDatetime;
-  int status;
+  int? status;
-  int createdBy;
+  int? createdBy;
-  int authorizedby;
+  int? authorizedby;
-  Null pharmacyRemarks;
+  dynamic pharmacyRemarks;
-  String statusDescription;
+  String? statusDescription;
 
   InterventionMedicationResModel(
       {this.cS,

lib/core/model/procedure/ControlsModel.dart

@@ -1,6 +1,6 @@
 class Controls {
-  String code;
+  String? code;
-  String controlValue;
+  String? controlValue;
 
   Controls({this.code, this.controlValue});
 

lib/core/model/procedure/Procedure_template_request_model.dart

@@ -1,31 +1,31 @@
 class ProcedureTempleteRequestModel {
-  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;
-  String mobileNo;
+  String? mobileNo;
-  String identificationNo;
+  String? identificationNo;
-  int editedBy;
+  int? editedBy;
-  int projectID;
+  int? projectID;
-  int clinicID;
+  int? clinicID;
-  String tokenID;
+  String? tokenID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  String vidaRefreshTokenID;
+  String? vidaRefreshTokenID;
-  int deviceTypeID;
+  int? deviceTypeID;
 
   ProcedureTempleteRequestModel(
       {this.doctorID,

lib/core/model/procedure/categories_procedure.dart

@@ -1,6 +1,6 @@
 class CategoriseProcedureModel {
-  List<EntityList> entityList;
+  List<EntityList>? entityList;
-  int rowcount;
+  int? rowcount;
   dynamic statusMessage;
 
   CategoriseProcedureModel(
@@ -8,9 +8,9 @@ class CategoriseProcedureModel {
 
   CategoriseProcedureModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<EntityList>();
+      entityList = <EntityList>[];
       json['entityList'].forEach((v) {
-        entityList.add(new EntityList.fromJson(v));
+        entityList!.add(new EntityList.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -20,7 +20,7 @@ class CategoriseProcedureModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;
@@ -29,20 +29,20 @@ class CategoriseProcedureModel {
 }
 
 class EntityList {
-  bool allowedClinic;
+  bool? allowedClinic;
-  String category;
+  String? category;
-  String categoryID;
+  String? categoryID;
-  String genderValidation;
+  String? genderValidation;
-  String group;
+  String? group;
-  String orderedValidation;
+  String? orderedValidation;
   dynamic price;
-  String procedureId;
+  String? procedureId;
-  String procedureName;
+  String? procedureName;
-  String specialPermission;
+  String? specialPermission;
-  String subGroup;
+  String? subGroup;
-  String template;
+  String? template;
-  String remarks;
+  String? remarks;
-  String type;
+  String? type;
 
   EntityList(
       {this.allowedClinic,

lib/core/model/procedure/get_ordered_procedure_model.dart

@@ -1,6 +1,6 @@
 class GetOrderedProcedureModel {
-  List<EntityList> entityList;
+  List<EntityList>? entityList;
-  int rowcount;
+  int? rowcount;
   dynamic statusMessage;
 
   GetOrderedProcedureModel(
@@ -8,9 +8,9 @@ class GetOrderedProcedureModel {
 
   GetOrderedProcedureModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<EntityList>();
+      entityList = <EntityList>[];
       json['entityList'].forEach((v) {
-        entityList.add(new EntityList.fromJson(v));
+        entityList!.add(new EntityList.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -20,7 +20,7 @@ class GetOrderedProcedureModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;
@@ -29,31 +29,31 @@ class GetOrderedProcedureModel {
 }
 
 class EntityList {
-  String achiCode;
+  String? achiCode;
-  String appointmentDate;
+  String? appointmentDate;
-  int appointmentNo;
+  int? appointmentNo;
-  int categoryID;
+  int? categoryID;
-  String clinicDescription;
+  String? clinicDescription;
-  String cptCode;
+  String? cptCode;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  String doctorName;
+  String? doctorName;
-  bool isApprovalCreated;
+  bool? isApprovalCreated;
-  bool isApprovalRequired;
+  bool? isApprovalRequired;
-  bool isCovered;
+  bool? isCovered;
-  bool isInvoiced;
+  bool? isInvoiced;
-  bool isReferralInvoiced;
+  bool? isReferralInvoiced;
-  bool isUncoveredByDoctor;
+  bool? isUncoveredByDoctor;
-  int lineItemNo;
+  int? lineItemNo;
-  String orderDate;
+  String? orderDate;
-  int orderNo;
+  int? orderNo;
-  int orderType;
+  int? orderType;
-  String procedureId;
+  String? procedureId;
-  String procedureName;
+  String? procedureName;
-  String remarks;
+  String? remarks;
-  String status;
+  String? status;
-  String template;
+  String? template;
-  int doctorID;
+  int? doctorID;
 
   EntityList(
       {this.achiCode,

lib/core/model/procedure/get_ordered_procedure_request_model.dart

@@ -1,7 +1,7 @@
 class GetOrderedProcedureRequestModel {
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
 
   GetOrderedProcedureRequestModel(
       {this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});

lib/core/model/procedure/get_procedure_model.dart

@@ -1,15 +1,15 @@
 class GetProcedureModel {
-  List<EntityList> entityList;
+  List<EntityList>? entityList;
-  int rowcount;
+  int? rowcount;
   dynamic statusMessage;
 
   GetProcedureModel({this.entityList, this.rowcount, this.statusMessage});
 
   GetProcedureModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<EntityList>();
+      entityList =  <EntityList>[];
       json['entityList'].forEach((v) {
-        entityList.add(new EntityList.fromJson(v));
+        entityList!.add(new EntityList.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -19,7 +19,7 @@ class GetProcedureModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;
@@ -28,18 +28,18 @@ class GetProcedureModel {
 }
 
 class EntityList {
-  bool allowedClinic;
+  bool? allowedClinic;
-  String category;
+  String? category;
-  String categoryID;
+  String? categoryID;
-  String genderValidation;
+  String? genderValidation;
-  String group;
+  String? group;
-  String orderedValidation;
+  String? orderedValidation;
   dynamic price;
-  String procedureId;
+  String? procedureId;
-  String procedureName;
+  String? procedureName;
-  String specialPermission;
+  String? specialPermission;
-  String subGroup;
+  String? subGroup;
-  String template;
+  String? template;
 
   EntityList(
       {this.allowedClinic,

lib/core/model/procedure/get_procedure_req_model.dart

@@ -1,11 +1,11 @@
 class GetProcedureReqModel {
-  int clinicId;
+  int? clinicId;
-  int patientMRN;
+  int? patientMRN;
-  int pageSize;
+  int? pageSize;
-  int pageIndex;
+  int? pageIndex;
-  List<String> search;
+  List<String>? search;
   dynamic category;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
 
   GetProcedureReqModel(
       {this.clinicId,

lib/core/model/procedure/order-procedure.dart

@@ -1,28 +1,28 @@
 class OrderProcedure {
-  String achiCode;
+  String? achiCode;
-  String appointmentDate;
+  String? appointmentDate;
-  int appointmentNo;
+  int? appointmentNo;
-  int categoryID;
+  int? categoryID;
-  String clinicDescription;
+  String? clinicDescription;
-  String cptCode;
+  String? cptCode;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
-  String doctorName;
+  String? doctorName;
-  bool isApprovalCreated;
+  bool? isApprovalCreated;
-  bool isApprovalRequired;
+  bool? isApprovalRequired;
-  bool isCovered;
+  bool? isCovered;
-  bool isInvoiced;
+  bool? isInvoiced;
-  bool isReferralInvoiced;
+  bool? isReferralInvoiced;
-  bool isUncoveredByDoctor;
+  bool? isUncoveredByDoctor;
-  int lineItemNo;
+  int? lineItemNo;
-  String orderDate;
+  String? orderDate;
-  int orderNo;
+  int? orderNo;
-  int orderType;
+  int? orderType;
-  String procedureId;
+  String? procedureId;
-  String procedureName;
+  String? procedureName;
-  String remarks;
+  String? remarks;
-  String status;
+  String? status;
-  String template;
+  String? template;
 
   OrderProcedure(
       {this.achiCode,

lib/core/model/procedure/post_procedure_req_model.dart

@@ -1,11 +1,11 @@
 import 'ControlsModel.dart';
 
 class PostProcedureReqModel {
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeID;
+  int? episodeID;
-  List<Procedures> procedures;
+  List<Procedures>? procedures;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
 
   PostProcedureReqModel(
       {this.patientMRN,
@@ -19,9 +19,9 @@ class PostProcedureReqModel {
     appointmentNo = json['AppointmentNo'];
     episodeID = json['EpisodeID'];
     if (json['Procedures'] != null) {
-      procedures = new List<Procedures>();
+      procedures = <Procedures>[];
       json['Procedures'].forEach((v) {
-        procedures.add(new Procedures.fromJson(v));
+        procedures!.add(new Procedures.fromJson(v));
       });
     }
     vidaAuthTokenID = json['VidaAuthTokenID'];
@@ -33,7 +33,7 @@ class PostProcedureReqModel {
     data['AppointmentNo'] = this.appointmentNo;
     data['EpisodeID'] = this.episodeID;
     if (this.procedures != null) {
-      data['Procedures'] = this.procedures.map((v) => v.toJson()).toList();
+      data['Procedures'] = this.procedures!.map((v) => v.toJson()).toList();
     }
     data['VidaAuthTokenID'] = this.vidaAuthTokenID;
     return data;
@@ -41,9 +41,9 @@ class PostProcedureReqModel {
 }
 
 class Procedures {
-  String procedure;
+  String? procedure;
-  String category;
+  String? category;
-  List<Controls> controls;
+  List<Controls>? controls;
 
   Procedures({this.procedure, this.category, this.controls});
 
@@ -51,9 +51,9 @@ class Procedures {
     procedure = json['Procedure'];
     category = json['Category'];
     if (json['Controls'] != null) {
-      controls = new List<Controls>();
+      controls = <Controls>[];
       json['Controls'].forEach((v) {
-        controls.add(new Controls.fromJson(v));
+        controls!.add(new Controls.fromJson(v));
       });
     }
   }
@@ -63,7 +63,7 @@ class Procedures {
     data['Procedure'] = this.procedure;
     data['Category'] = this.category;
     if (this.controls != null) {
-      data['Controls'] = this.controls.map((v) => v.toJson()).toList();
+      data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
     }
     return data;
   }

lib/core/model/procedure/procedure_category_list_model.dart

@@ -1,6 +1,6 @@
 class ProcedureCategoryListModel {
-  List<EntityList> entityList;
+  List<EntityList>? entityList;
-  int rowcount;
+  int? rowcount;
   dynamic statusMessage;
 
   ProcedureCategoryListModel(
@@ -8,9 +8,9 @@ class ProcedureCategoryListModel {
 
   ProcedureCategoryListModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<EntityList>();
+      entityList = <EntityList>[];
       json['entityList'].forEach((v) {
-        entityList.add(new EntityList.fromJson(v));
+        entityList!.add(new EntityList.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -20,7 +20,7 @@ class ProcedureCategoryListModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;
@@ -29,8 +29,8 @@ class ProcedureCategoryListModel {
 }
 
 class EntityList {
-  int categoryId;
+  int? categoryId;
-  String categoryName;
+  String? categoryName;
 
   EntityList({this.categoryId, this.categoryName});
 

lib/core/model/procedure/procedure_templateModel.dart

@@ -1,13 +1,13 @@
 class ProcedureTempleteModel {
-  String setupID;
+  String? setupID;
-  int projectID;
+  int? projectID;
-  int clinicID;
+  int? clinicID;
-  int doctorID;
+  int? doctorID;
-  int templateID;
+  int? templateID;
-  String templateName;
+  String? templateName;
-  bool isActive;
+  bool? isActive;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
   dynamic editedBy;
   dynamic editedOn;
 

lib/core/model/procedure/procedure_template_details_model.dart

@@ -1,29 +1,29 @@
 class ProcedureTempleteDetailsModel {
-  String setupID;
+  String? setupID;
-  int projectID;
+  int? projectID;
-  int clinicID;
+  int? clinicID;
-  int doctorID;
+  int? doctorID;
-  int templateID;
+  int? templateID;
-  String templateName;
+  String? templateName;
-  String procedureID;
+  String? procedureID;
-  bool isActive;
+  bool? isActive;
-  int createdBy;
+  int? createdBy;
-  String createdOn;
+  String? createdOn;
   dynamic editedBy;
   dynamic editedOn;
-  String procedureName;
+  String? procedureName;
-  String procedureNameN;
+  String? procedureNameN;
-  String alias;
+  String? alias;
-  String aliasN;
+  String? aliasN;
-  String categoryID;
+  String? categoryID;
-  String subGroupID;
+  String? subGroupID;
-  String categoryDescription;
+  String? categoryDescription;
-  String categoryDescriptionN;
+  String? categoryDescriptionN;
-  String categoryAlias;
+  String? categoryAlias;
   dynamic riskCategoryID;
-  String type = "1";
+  String? type = "1";
-  String remarks;
+  String? remarks;
-  int selectedType = 0;
+  int? selectedType = 0;
 
   ProcedureTempleteDetailsModel(
       {this.setupID,
@@ -106,14 +106,14 @@ class ProcedureTempleteDetailsModel {
 }
 
 class ProcedureTempleteDetailsModelList {
-  List<ProcedureTempleteDetailsModel> procedureTemplate = List();
+  List<ProcedureTempleteDetailsModel> procedureTemplate = [];
-  String templateName;
+  String? templateName;
-  int templateId;
+  int? templateId;
 
   ProcedureTempleteDetailsModelList(
       {this.templateName,
       this.templateId,
-      ProcedureTempleteDetailsModel template}) {
+      ProcedureTempleteDetailsModel? template}) {
-    procedureTemplate.add(template);
+    procedureTemplate.add(template!);
   }
 }

lib/core/model/procedure/procedure_template_details_request_model.dart

@@ -1,32 +1,32 @@
 class ProcedureTempleteDetailsRequestModel {
-  int doctorID;
+  int? doctorID;
-  String firstName;
+  String? firstName;
-  int templateID;
+  int? templateID;
-  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;
-  String mobileNo;
+  String? mobileNo;
-  String identificationNo;
+  String? identificationNo;
-  int editedBy;
+  int? editedBy;
-  int projectID;
+  int? projectID;
-  int clinicID;
+  int? clinicID;
-  String tokenID;
+  String? tokenID;
-  int languageID;
+  int? languageID;
-  String stamp;
+  String? stamp;
-  String iPAdress;
+  String? iPAdress;
-  double versionID;
+  double? versionID;
-  int channel;
+  int? channel;
-  String sessionID;
+  String? sessionID;
-  bool isLoginForDoctorApp;
+  bool? isLoginForDoctorApp;
-  bool patientOutSA;
+  bool? patientOutSA;
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  String vidaRefreshTokenID;
+  String? vidaRefreshTokenID;
-  int deviceTypeID;
+  int? deviceTypeID;
 
   ProcedureTempleteDetailsRequestModel(
       {this.doctorID,

lib/core/model/procedure/procedure_valadate_model.dart

@@ -1,6 +1,6 @@
 class ProcedureValadteModel {
-  List<EntityList> entityList;
+  List<EntityList>? entityList;
-  int rowcount;
+  int? rowcount;
   dynamic statusMessage;
   dynamic success;
 
@@ -9,9 +9,9 @@ class ProcedureValadteModel {
 
   ProcedureValadteModel.fromJson(Map<String, dynamic> json) {
     if (json['entityList'] != null) {
-      entityList = new List<EntityList>();
+      entityList = <EntityList>[];
       json['entityList'].forEach((v) {
-        entityList.add(new EntityList.fromJson(v));
+        entityList!.add(new EntityList.fromJson(v));
       });
     }
     rowcount = json['rowcount'];
@@ -22,7 +22,7 @@ class ProcedureValadteModel {
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
     if (this.entityList != null) {
-      data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
+      data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
     }
     data['rowcount'] = this.rowcount;
     data['statusMessage'] = this.statusMessage;
@@ -32,8 +32,8 @@ class ProcedureValadteModel {
 }
 
 class EntityList {
-  String procedureId;
+  String? procedureId;
-  List<String> warringMessages;
+  List<String>? warringMessages;
 
   EntityList({this.procedureId, this.warringMessages});
 

lib/core/model/procedure/procedure_valadate_request_model.dart

@@ -1,9 +1,9 @@
 class ProcedureValidationRequestModel {
-  String vidaAuthTokenID;
+  String? vidaAuthTokenID;
-  int patientMRN;
+  int? patientMRN;
-  int appointmentNo;
+  int? appointmentNo;
-  int episodeID;
+  int? episodeID;
-  List<String> procedure;
+  List<String>? procedure;
 
   ProcedureValidationRequestModel(
       {this.vidaAuthTokenID,