reverting manully step 2

dev_v2.8_reverting
Elham Rababh 4 years ago
parent 6fe3cecc9b
commit 47d18dacfd

@ -1,116 +1,218 @@
class RequestSendRadReportEmail {
int? channel;
String? clinicName;
String? dateofBirth;
int? deviceTypeID;
String? doctorName;
String? generalid;
int? invoiceNo;
String? iPAdress;
bool ?isDentalAllowedBackend;
int? languageID;
String? orderDate;
import 'package:doctor_app_flutter/util/date-utils.dart';
class DischargeReferralPatient {
dynamic rowID;
int? projectID;
int? lineItemNo;
int? doctorID;
int? patientID;
String? patientIditificationNum;
String? patientMobileNumber;
String? patientName;
int? patientOutSA;
String? doctorName;
dynamic doctorNameN;
String? firstName;
String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType;
int? patientTypeID;
int? projectID;
String? projectName;
String? radResult;
String? sessionID;
String? setupID;
String? to;
String? tokenID;
double? versionID;
String? admissionNo;
String? admissionDate;
String? roomID;
String? bedID;
dynamic nursingStationID;
dynamic description;
String? nationalityName;
dynamic nationalityNameN;
int? referralDoctor;
int? referringDoctor;
int? referralClinic;
int? referringClinic;
int? referralStatus;
DateTime ?referralDate;
String? referringDoctorRemarks;
String? referredDoctorRemarks;
String? referralResponseOn;
int? priority;
int? frequency;
String? mAXResponseTime;
String? dischargeDate;
dynamic clinicID;
String? age;
String? clinicDescription;
String? frequencyDescription;
String? genderDescription;
bool?isDoctorLate;
bool? isDoctorResponse;
String? nursingStationName;
String? priorityDescription;
String? referringClinicDescription;
String? referringDoctorName;
RequestSendRadReportEmail(
{this.channel,
this.clinicName,
this.dateofBirth,
this.deviceTypeID,
this.doctorName,
this.generalid,
this.invoiceNo,
this.iPAdress,
this.isDentalAllowedBackend,
this.languageID,
this.orderDate,
DischargeReferralPatient(
{this.rowID,
this.projectID,
this.lineItemNo,
this.doctorID,
this.patientID,
this.patientIditificationNum,
this.patientMobileNumber,
this.patientName,
this.patientOutSA,
this.doctorName,
this.doctorNameN,
this.firstName,
this.middleName,
this.lastName,
this.firstNameN,
this.middleNameN,
this.lastNameN,
this.gender,
this.dateofBirth,
this.mobileNumber,
this.emailAddress,
this.patientIdentificationNo,
this.patientType,
this.patientTypeID,
this.projectID,
this.projectName,
this.radResult,
this.sessionID,
this.setupID,
this.to,
this.tokenID,
this.versionID});
this.admissionNo,
this.admissionDate,
this.roomID,
this.bedID,
this.nursingStationID,
this.description,
this.nationalityName,
this.nationalityNameN,
this.referralDoctor,
this.referringDoctor,
this.referralClinic,
this.referringClinic,
this.referralStatus,
this.referralDate,
this.referringDoctorRemarks,
this.referredDoctorRemarks,
this.referralResponseOn,
this.priority,
this.frequency,
this.mAXResponseTime,
this.dischargeDate,
this.clinicID,
this.age,
this.clinicDescription,
this.frequencyDescription,
this.genderDescription,
this.isDoctorLate,
this.isDoctorResponse,
this.nursingStationName,
this.priorityDescription,
this.referringClinicDescription,
this.referringDoctorName});
RequestSendRadReportEmail.fromJson(Map<String?, dynamic> json) {
channel = json['Channel'];
clinicName = json['ClinicName'];
dateofBirth = json['DateofBirth'];
deviceTypeID = json['DeviceTypeID'];
doctorName = json['DoctorName'];
generalid = json['generalid'];
invoiceNo = json['InvoiceNo'];
iPAdress = json['IPAdress'];
isDentalAllowedBackend = json['isDentalAllowedBackend'];
languageID = json['LanguageID'];
orderDate = json['OrderDate'];
DischargeReferralPatient.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID'];
projectID = json['ProjectID'];
lineItemNo = json['LineItemNo'];
doctorID = json['DoctorID'];
patientID = json['PatientID'];
patientIditificationNum = json['PatientIditificationNum'];
patientMobileNumber = json['PatientMobileNumber'];
patientName = json['PatientName'];
patientOutSA = json['PatientOutSA'];
doctorName = json['DoctorName'];
doctorNameN = json['DoctorNameN'];
firstName = json['FirstName'];
middleName = json['MiddleName'];
lastName = json['LastName'];
firstNameN = json['FirstNameN'];
middleNameN = json['MiddleNameN'];
lastNameN = json['LastNameN'];
gender = json['Gender'];
dateofBirth = json['DateofBirth'];
mobileNumber = json['MobileNumber'];
emailAddress = json['EmailAddress'];
patientIdentificationNo = json['PatientIdentificationNo'];
patientType = json['PatientType'];
patientTypeID = json['PatientTypeID'];
projectID = json['ProjectID'];
projectName = json['ProjectName'];
radResult = json['RadResult'];
sessionID = json['SessionID'];
setupID = json['SetupID'];
to = json['To'];
tokenID = json['TokenID'];
versionID = json['VersionID'];
admissionNo = json['AdmissionNo'];
admissionDate = json['AdmissionDate'];
roomID = json['RoomID'];
bedID = json['BedID'];
nursingStationID = json['NursingStationID'];
description = json['Description'];
nationalityName = json['NationalityName'];
nationalityNameN = json['NationalityNameN'];
referralDoctor = json['ReferralDoctor'];
referringDoctor = json['ReferringDoctor'];
referralClinic = json['ReferralClinic'];
referringClinic = json['ReferringClinic'];
referralStatus = json['ReferralStatus'];
referralDate = AppDateUtils.convertStringToDate(json['ReferralDate']);
referringDoctorRemarks = json['ReferringDoctorRemarks'];
referredDoctorRemarks = json['ReferredDoctorRemarks'];
referralResponseOn = json['ReferralResponseOn'];
priority = json['Priority'];
frequency = json['Frequency'];
mAXResponseTime = json['MAXResponseTime'];
dischargeDate = json['DischargeDate'];
clinicID = json['ClinicID'];
age = json['Age'];
clinicDescription = json['ClinicDescription'];
frequencyDescription = json['FrequencyDescription'];
genderDescription = json['GenderDescription'];
isDoctorLate = json['IsDoctorLate'];
isDoctorResponse = json['IsDoctorResponse'];
nursingStationName = json['NursingStationName'];
priorityDescription = json['PriorityDescription'];
referringClinicDescription = json['ReferringClinicDescription'];
referringDoctorName = json['ReferringDoctorName'];
}
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Channel'] = this.channel;
data['ClinicName'] = this.clinicName;
data['DateofBirth'] = this.dateofBirth;
data['DeviceTypeID'] = this.deviceTypeID;
data['DoctorName'] = this.doctorName;
data['generalid'] = this.generalid;
data['InvoiceNo'] = this.invoiceNo;
data['IPAdress'] = this.iPAdress;
data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
data['LanguageID'] = this.languageID;
data['OrderDate'] = this.orderDate;
data['RowID'] = this.rowID;
data['ProjectID'] = this.projectID;
data['LineItemNo'] = this.lineItemNo;
data['DoctorID'] = this.doctorID;
data['PatientID'] = this.patientID;
data['PatientIditificationNum'] = this.patientIditificationNum;
data['PatientMobileNumber'] = this.patientMobileNumber;
data['PatientName'] = this.patientName;
data['PatientOutSA'] = this.patientOutSA;
data['DoctorName'] = this.doctorName;
data['DoctorNameN'] = this.doctorNameN;
data['FirstName'] = this.firstName;
data['MiddleName'] = this.middleName;
data['LastName'] = this.lastName;
data['FirstNameN'] = this.firstNameN;
data['MiddleNameN'] = this.middleNameN;
data['LastNameN'] = this.lastNameN;
data['Gender'] = this.gender;
data['DateofBirth'] = this.dateofBirth;
data['MobileNumber'] = this.mobileNumber;
data['EmailAddress'] = this.emailAddress;
data['PatientIdentificationNo'] = this.patientIdentificationNo;
data['PatientType'] = this.patientType;
data['PatientTypeID'] = this.patientTypeID;
data['ProjectID'] = this.projectID;
data['ProjectName'] = this.projectName;
data['RadResult'] = this.radResult;
data['SessionID'] = this.sessionID;
data['SetupID'] = this.setupID;
data['To'] = this.to;
data['TokenID'] = this.tokenID;
data['VersionID'] = this.versionID;
data['AdmissionNo'] = this.admissionNo;
data['AdmissionDate'] = this.admissionDate;
data['RoomID'] = this.roomID;
data['BedID'] = this.bedID;
data['NursingStationID'] = this.nursingStationID;
data['Description'] = this.description;
data['NationalityName'] = this.nationalityName;
data['NationalityNameN'] = this.nationalityNameN;
data['ReferralDoctor'] = this.referralDoctor;
data['ReferringDoctor'] = this.referringDoctor;
data['ReferralClinic'] = this.referralClinic;
data['ReferringClinic'] = this.referringClinic;
data['ReferralStatus'] = this.referralStatus;
data['ReferralDate'] = this.referralDate;
data['ReferringDoctorRemarks'] = this.referringDoctorRemarks;
data['ReferredDoctorRemarks'] = this.referredDoctorRemarks;
data['ReferralResponseOn'] = this.referralResponseOn;
data['Priority'] = this.priority;
data['Frequency'] = this.frequency;
data['MAXResponseTime'] = this.mAXResponseTime;
data['DischargeDate'] = this.dischargeDate;
data['ClinicID'] = this.clinicID;
data['Age'] = this.age;
data['ClinicDescription'] = this.clinicDescription;
data['FrequencyDescription'] = this.frequencyDescription;
data['GenderDescription'] = this.genderDescription;
data['IsDoctorLate'] = this.isDoctorLate;
data['IsDoctorResponse'] = this.isDoctorResponse;
data['NursingStationName'] = this.nursingStationName;
data['PriorityDescription'] = this.priorityDescription;
data['ReferringClinicDescription'] = this.referringClinicDescription;
data['ReferringDoctorName'] = this.referringDoctorName;
return data;
}
}

@ -6,7 +6,7 @@ class AnalyticsService {
FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics);
Future logEvent({@required String eventCategory, @required String eventAction}) async {
Future logEvent({required String eventCategory, required String eventAction}) async {
await _analytics.logEvent(name: 'event', parameters: {
"eventCategory": eventCategory,
"eventAction": eventAction,

@ -3,24 +3,24 @@ import 'package:flutter/material.dart';
class NavigationService {
final GlobalKey<NavigatorState> navigatorKey =
new GlobalKey<NavigatorState>();
Future<dynamic> navigateTo(String routeName,{Object arguments}) {
return navigatorKey.currentState.pushNamed(routeName,arguments: arguments);
Future<dynamic> navigateTo(String routeName,{required Object arguments}) {
return navigatorKey.currentState!.pushNamed(routeName,arguments: arguments);
}
Future<dynamic> pushReplacementNamed(String routeName,{Object arguments}) {
return navigatorKey.currentState.pushReplacementNamed(routeName,arguments: arguments);
Future<dynamic> pushReplacementNamed(String routeName,{required Object arguments}) {
return navigatorKey.currentState!.pushReplacementNamed(routeName,arguments: arguments);
}
Future<dynamic> pushNamedAndRemoveUntil(String routeName) {
return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false);
return navigatorKey.currentState!.pushNamedAndRemoveUntil(routeName,(asd)=>false);
}
Future<dynamic> pushAndRemoveUntil(Route newRoute) {
return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false);
return navigatorKey.currentState!.pushAndRemoveUntil(newRoute,(asd)=>false);
}
pop() {
return navigatorKey.currentState.pop();
return navigatorKey.currentState!.pop();
}
}

@ -9,8 +9,8 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
class PatientRegistrationService extends BaseService {
GetPatientInfoResponseModel getPatientInfoResponseModel;
String logInTokenID;
late GetPatientInfoResponseModel getPatientInfoResponseModel;
late String logInTokenID;
checkPatientForRegistration(
CheckPatientForRegistrationModel registrationModel) async {
@ -39,13 +39,12 @@ class PatientRegistrationService extends BaseService {
}
sendActivationCodeByOTPNotificationType(
{SendActivationCodeByOTPNotificationTypeForRegistrationModel
registrationModel,
int otpType,
PatientRegistrationViewModel model,
CheckPatientForRegistrationModel
{
required int otpType,
required PatientRegistrationViewModel model,
required CheckPatientForRegistrationModel
checkPatientForRegistrationModel}) async {
registrationModel =
SendActivationCodeByOTPNotificationTypeForRegistrationModel registrationModel =
SendActivationCodeByOTPNotificationTypeForRegistrationModel(
oTPSendType: otpType,
patientIdentificationID: checkPatientForRegistrationModel

@ -16,17 +16,17 @@ import '../../locator.dart';
import '../../routes.dart';
import 'NavigationService.dart';
class VideoCallService extends BaseService {
StartCallRes startCallRes;
PatiantInformtion patient;
LiveCarePatientServices _liveCarePatientServices =
locator<LiveCarePatientServices>();
class VideoCallService extends BaseService{
late StartCallRes startCallRes;
late PatiantInformtion patient;
LiveCarePatientServices _liveCarePatientServices = locator<LiveCarePatientServices>();
openVideo(StartCallRes startModel, PatiantInformtion patientModel,
bool isRecording,VoidCallback onCallConnected, VoidCallback onCallDisconnected) async {
this.startCallRes = startModel;
this.patient = patientModel;
DoctorProfileModel doctorProfile =
DoctorProfileModel? doctorProfile =
await getDoctorProfile(isGetProfile: true);
await VideoChannel.openVideoCallScreen(
// TODO MOSA TEST
@ -51,16 +51,16 @@ class VideoCallService extends BaseService {
onCallConnected: onCallConnected,
onCallDisconnected: onCallDisconnected,
onCallEnd: () {
WidgetsBinding.instance.addPostFrameCallback((_) async {
WidgetsBinding.instance!.addPostFrameCallback((_) async {
GifLoaderDialogUtils.showMyDialog(
locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext!);
endCall(
patient.vcId,
patient.vcId!,
false,
).then((value) {
GifLoaderDialogUtils.hideDialog(
locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext!);
if (hasError) {
DrAppToastMsg.showErrorToast(error);
} else
@ -72,15 +72,15 @@ class VideoCallService extends BaseService {
});
},
onCallNotRespond: (SessionStatusModel sessionStatusModel) {
WidgetsBinding.instance.addPostFrameCallback((_) {
WidgetsBinding.instance!.addPostFrameCallback((_) {
GifLoaderDialogUtils.showMyDialog(
locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext!);
endCall(
patient.vcId,
patient.vcId!,
sessionStatusModel.sessionStatus == 3,
).then((value) {
GifLoaderDialogUtils.hideDialog(
locator<NavigationService>().navigatorKey.currentContext);
locator<NavigationService>().navigatorKey.currentContext!);
if (hasError) {
DrAppToastMsg.showErrorToast(error);
} else {
@ -104,7 +104,7 @@ class VideoCallService extends BaseService {
endCallReq.isDestroy = isPatient;
await _liveCarePatientServices.endCall(endCallReq);
if (_liveCarePatientServices.hasError) {
error = _liveCarePatientServices.error;
error = _liveCarePatientServices.error!;
}
}
}

@ -49,7 +49,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -66,9 +66,8 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async {
@ -84,7 +83,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -102,7 +101,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -119,7 +118,7 @@ class AuthenticationService extends BaseService {
}, body: checkActivationCodeRequestModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -139,7 +138,7 @@ class AuthenticationService extends BaseService {
}, body: insertIMEIDetailsModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -158,7 +157,7 @@ class AuthenticationService extends BaseService {
}, body: profileReqModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
}

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService {
String error='';
String ?error;
bool hasError = false;
BaseAppClient baseAppClient = BaseAppClient();
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();

@ -82,13 +82,13 @@ class MyReferralInPatientService extends BaseService {
hasError = false;
await getDoctorProfile();
RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks();
_requestAddReferredDoctorRemarks.projectID = referral.projectID;
_requestAddReferredDoctorRemarks.projectID = referral.projectID!;
_requestAddReferredDoctorRemarks.admissionNo = referral.admissionNo.toString();
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID;
_requestAddReferredDoctorRemarks.patientID = referral.patientID;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.patientID = referral.patientID!;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor!;
await baseAppClient.post(
ADD_REFERRED_DOCTOR_REMARKS,
body: _requestAddReferredDoctorRemarks.toJson(),
@ -104,17 +104,17 @@ class MyReferralInPatientService extends BaseService {
hasError = false;
await getDoctorProfile();
AddReferredRemarksRequestModel _requestAddReferredDoctorRemarks = AddReferredRemarksRequestModel(
editedBy: doctorProfile!.doctorID,
projectID: doctorProfile!.projectID,
editedBy: doctorProfile!.doctorID!,
projectID: doctorProfile!.projectID!,
referredDoctorRemarks: referredDoctorRemarks,
referalStatus: referralStatus);
_requestAddReferredDoctorRemarks.projectID = referral.projectID;
_requestAddReferredDoctorRemarks.projectID = referral.projectID!;
//TODO Check this in case out patient
_requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo);
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo!);
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.referalStatus = referralStatus;
// _requestAddReferredDoctorRemarks.patientID = referral.patientID;

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class PatientMuseService extends BaseService {
List<PatientMuseResultsModel> patientMuseResultsModelList = [];
getECGPatient({int patientType, int patientOutSA, int patientID}) async {
getECGPatient({int? patientType, int? patientOutSA, int? patientID}) async {
Map<String, dynamic> body = Map();
body['PatientType'] = patientType == 7 ? 1 : patientType;
body['PatientOutSA'] = patientOutSA;

@ -4,16 +4,16 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class ReferralService extends BaseService {
Future referralPatient(
{int admissionNo,
String roomID,
int referralClinic,
int referralDoctor,
int patientID,
int patientTypeID,
int priority,
int frequency,
String referringDoctorRemarks,
String extension}) async {
{int? admissionNo,
String? roomID,
int? referralClinic,
int? referralDoctor,
int? patientID,
int? patientTypeID,
int? priority,
int? frequency,
String? referringDoctorRemarks,
String? extension}) async {
await getDoctorProfile();
ReferralRequest referralRequest = ReferralRequest();
referralRequest.admissionNo = admissionNo;

@ -57,8 +57,7 @@ class PatientReferralService extends LookupService {
Map<String, dynamic> body = Map();
body['isSameBranch'] = false;
await baseAppClient.post(GET_REFERRAL_FACILITIES,
onSuccess: (response, statusCode) async {
await baseAppClient.post(GET_REFERRAL_FACILITIES, onSuccess: (response, statusCode) async {
projectsList = response['ProjectInfo'];
}, onFailure: (String error, int statusCode) {
hasError = true;
@ -85,8 +84,7 @@ class PatientReferralService extends LookupService {
Future getClinicsList(int projectId) async {
hasError = false;
ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest();
ClinicByProjectIdRequest _clinicByProjectIdRequest = ClinicByProjectIdRequest();
_clinicByProjectIdRequest.projectID = projectId;
await baseAppClient.post(
@ -104,11 +102,9 @@ class PatientReferralService extends LookupService {
);
}
Future getDoctorsList(
PatiantInformtion patient, int clinicId, int branchId) async {
Future getDoctorsList(PatiantInformtion patient, int clinicId, int branchId) async {
hasError = false;
DoctorsByClinicIdRequest _doctorsByClinicIdRequest =
DoctorsByClinicIdRequest();
DoctorsByClinicIdRequest _doctorsByClinicIdRequest = DoctorsByClinicIdRequest();
_doctorsByClinicIdRequest.projectID = branchId;
_doctorsByClinicIdRequest.clinicID = clinicId;
@ -129,9 +125,8 @@ class PatientReferralService extends LookupService {
Future getMyReferredPatient() async {
hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile();
RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post(
GET_MY_REFERRED_PATIENT,
@ -141,8 +136,7 @@ class PatientReferralService extends LookupService {
response['List_MyReferredPatient'].forEach((v) {
MyReferredPatientModel item = MyReferredPatientModel.fromJson(v);
if (doctorProfile != null) {
item.isReferralDoctorSameBranch =
doctorProfile!.projectID == item.projectID;
item.isReferralDoctorSameBranch = doctorProfile.projectID == item.projectID;
} else {
item.isReferralDoctorSameBranch = false;
}
@ -162,7 +156,7 @@ class PatientReferralService extends LookupService {
hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post(
GET_MY_REFERRED_OUT_PATIENT,
@ -173,7 +167,7 @@ class PatientReferralService extends LookupService {
MyReferredPatientModel item = MyReferredPatientModel.fromJson(v);
if (doctorProfile != null) {
item.isReferralDoctorSameBranch =
doctorProfile!.projectID == item.projectID;
doctorProfile.projectID == item.projectID;
} else {
item.isReferralDoctorSameBranch = false;
}
@ -190,7 +184,7 @@ class PatientReferralService extends LookupService {
Future getPendingReferralList() async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
Map<String, dynamic> body = Map();
// body['ClinicID'] = 0;
body['DoctorID'] = doctorProfile!.doctorID;
@ -202,8 +196,7 @@ class PatientReferralService extends LookupService {
response['PendingReferralList'].forEach((v) {
PendingReferral item = PendingReferral.fromJson(v);
item.isReferralDoctorSameBranch =
item.targetProjectId == item.sourceProjectId;
item.isReferralDoctorSameBranch = item.targetProjectId == item.sourceProjectId;
pendingReferralList.add(item);
});
},
@ -228,8 +221,7 @@ class PatientReferralService extends LookupService {
response['ReferralList']['entityList'].forEach((v) {
PendingReferral item = PendingReferral.fromJson(v);
item.isReferralDoctorSameBranch =
item.targetProjectId == item.sourceProjectId;
item.isReferralDoctorSameBranch = item.targetProjectId == item.sourceProjectId;
patientReferralList.add(item);
});
},
@ -242,10 +234,9 @@ class PatientReferralService extends LookupService {
);
}
Future responseReferral(
MyReferralPatientModel referralPatient, bool isAccepted) async {
Future responseReferral(MyReferralPatientModel referralPatient, bool isAccepted) async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
Map<String, dynamic> body = Map();
body['PatientMRN'] = referralPatient.patientID;
@ -327,8 +318,7 @@ class PatientReferralService extends LookupService {
);
}
Future verifyReferralDoctorRemarks(
MyReferredPatientModel referredPatient) async {
Future verifyReferralDoctorRemarks(MyReferredPatientModel referredPatient) async {
hasError = false;
Map<String, dynamic> body = Map();

@ -7,8 +7,7 @@ class PatientInPatientService extends BaseService {
List<PatiantInformtion> inPatientList = [];
List<PatiantInformtion> myInPatientList = [];
Future getInPatientList(
PatientSearchRequestModel requestModel, bool isMyInpatient) async {
Future getInPatientList(PatientSearchRequestModel requestModel, bool isMyInpatient) async {
hasError = false;
await getDoctorProfile(isGetProfile: true);
@ -27,7 +26,7 @@ class PatientInPatientService extends BaseService {
response['List_MyInPatient'].forEach((v) {
PatiantInformtion patient = PatiantInformtion.fromJson(v);
inPatientList.add(patient);
if(patient.doctorId == doctorProfile!.doctorID){
if (patient.doctorId == doctorProfile!.doctorID) {
myInPatientList.add(patient);
}
});

@ -99,7 +99,7 @@ class PatientService extends BaseService {
DoctorsByClinicIdRequest _doctorsByClinicIdRequest = DoctorsByClinicIdRequest();
STPReferralFrequencyRequest _referralFrequencyRequest = STPReferralFrequencyRequest();
ClinicByProjectIdRequest _clinicByProjectIdRequest = ClinicByProjectIdRequest();
ReferToDoctorRequest _referToDoctorRequest;
ReferToDoctorRequest? _referToDoctorRequest;
Future<dynamic> getPatientList(patient, patientType, {isView}) async {
hasError = false;
@ -157,7 +157,7 @@ class PatientService extends BaseService {
await getDoctorProfile();
if (isMyInpatient) {
requestModel.doctorID = doctorProfile!.doctorID;
requestModel.doctorID = doctorProfile!.doctorID!;
} else {
requestModel.doctorID = 0;
}
@ -171,7 +171,7 @@ class PatientService extends BaseService {
response['List_MyInPatient'].forEach((v) {
PatiantInformtion patient = PatiantInformtion.fromJson(v);
inPatientList.add(patient);
if (patient.doctorId == doctorProfile!.doctorID) {
if (patient.doctorId == doctorProfile!.doctorID!) {
myInPatientList.add(patient);
}
});
@ -420,39 +420,39 @@ class PatientService extends BaseService {
// TODO send the total model insted of each parameter
Future referToDoctor(
{String selectedDoctorID,
String selectedClinicID,
int admissionNo,
String extension,
String priority,
String frequency,
String referringDoctorRemarks,
int patientID,
int patientTypeID,
String roomID,
int projectID}) async {
{String? selectedDoctorID,
String? selectedClinicID,
int? admissionNo,
String? extension,
String? priority,
String? frequency,
String? referringDoctorRemarks,
int? patientID,
int? patientTypeID,
String? roomID,
int? projectID}) async {
hasError = false;
// TODO Change it to use it when we implement authentication user
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile);
int doctorID = doctorProfile!.doctorID;
int clinicId = doctorProfile!.clinicID;
Map<String, dynamic> profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel? doctorProfile = new DoctorProfileModel.fromJson(profile);
int? doctorID = doctorProfile.doctorID;
int? clinicId = doctorProfile.clinicID;
_referToDoctorRequest = ReferToDoctorRequest(
projectID: projectID,
admissionNo: admissionNo,
roomID: roomID,
projectID: projectID!,
admissionNo: admissionNo!,
roomID: roomID!,
referralClinic: selectedClinicID.toString(),
referralDoctor: selectedDoctorID.toString(),
createdBy: doctorID,
createdBy: doctorID!,
editedBy: doctorID,
patientID: patientID,
patientTypeID: patientTypeID,
referringClinic: clinicId,
patientID: patientID!,
patientTypeID: patientTypeID!,
referringClinic: clinicId!,
referringDoctor: doctorID,
referringDoctorRemarks: referringDoctorRemarks,
priority: priority,
frequency: frequency,
extension: extension,
referringDoctorRemarks: referringDoctorRemarks!,
priority: priority!,
frequency: frequency!,
extension: extension!,
);
await baseAppClient.post(
PATIENT_PROGRESS_NOTE_URL,
@ -461,7 +461,7 @@ class PatientService extends BaseService {
hasError = true;
super.error = error;
},
body: _referToDoctorRequest.toJson(),
body: _referToDoctorRequest!.toJson(),
);
}

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

@ -23,10 +23,9 @@ class InsuranceCardService extends BaseService {
List<InsuranceApprovalInPatientModel> get insuranceApprovalInPatient =>
_insuranceApprovalInPatient;
Future getInsuranceApprovalInPatient({int mrn}) async {
_insuranceApprovalInPatientRequestModel =
InsuranceApprovalInPatientRequestModel(
patientID: mrn,
Future getInsuranceApprovalInPatient({int? mrn}) async {
_insuranceApprovalInPatientRequestModel = InsuranceApprovalInPatientRequestModel(
patientID: mrn!,
patientTypeID: 1,
);
hasError = false;
@ -45,8 +44,7 @@ class InsuranceCardService extends BaseService {
}, body: _insuranceApprovalInPatientRequestModel.toJson());
}
Future getInsuranceApproval(PatiantInformtion patient,
{int appointmentNo, int projectId}) async {
Future getInsuranceApproval(PatiantInformtion patient, {int? appointmentNo, int? projectId}) async {
hasError = false;
// _cardList.clear();
// if (appointmentNo != null) {

@ -59,11 +59,11 @@ class LabsService extends BaseService {
List<LabResultHistory> labOrdersResultHistoryList = [];
Future getLaboratoryResult(
{String projectID,
int clinicID,
String invoiceNo,
String orderNo,
PatiantInformtion patient,
{String? projectID,
int? clinicID,
String? invoiceNo,
String? orderNo,
PatiantInformtion? patient,
bool isInpatient = false}) async {
hasError = false;
@ -74,7 +74,7 @@ class LabsService extends BaseService {
_requestPatientLabSpecialResult.orderNo = orderNo;
body = _requestPatientLabSpecialResult.toJson();
await baseAppClient.postPatient(GET_Patient_LAB_SPECIAL_RESULT, patient: patient,
await baseAppClient.postPatient(GET_Patient_LAB_SPECIAL_RESULT, patient: patient!,
onSuccess: (dynamic response, int statusCode) {
patientLabSpecialResult.clear();
@ -87,25 +87,25 @@ class LabsService extends BaseService {
}, body: body);
}
Future getPatientLabResult({PatientLabOrders patientLabOrder, PatiantInformtion patient, bool isInpatient}) async {
Future getPatientLabResult({PatientLabOrders? patientLabOrder, PatiantInformtion? patient, bool? isInpatient}) async {
hasError = false;
String url = "";
if (isInpatient) {
if (isInpatient!) {
url = GET_PATIENT_LAB_RESULTS;
} else {
url = GET_Patient_LAB_RESULT;
}
Map<String, dynamic> body = Map();
body['InvoiceNo'] = patientLabOrder.invoiceNo;
body['InvoiceNo'] = patientLabOrder!.invoiceNo;
body['OrderNo'] = patientLabOrder.orderNo;
body['isDentalAllowedBackend'] = false;
body['SetupID'] = patientLabOrder.setupID;
body['ProjectID'] = patientLabOrder.projectID;
body['ClinicID'] = patientLabOrder.clinicID ?? 0;
await baseAppClient.postPatient(url, patient: patient, onSuccess: (dynamic response, int statusCode) {
await baseAppClient.postPatient(url, patient: patient!, onSuccess: (dynamic response, int statusCode) {
patientLabSpecialResult = [];
labResultList = [];
@ -128,7 +128,7 @@ class LabsService extends BaseService {
}
Future getPatientLabOrdersResults(
{PatientLabOrders patientLabOrder, String procedure, PatiantInformtion patient}) async {
{PatientLabOrders? patientLabOrder, String? procedure, PatiantInformtion? patient}) async {
hasError = false;
Map<String, dynamic> body = Map();
if (patientLabOrder != null) {
@ -140,7 +140,7 @@ class LabsService extends BaseService {
}
body['isDentalAllowedBackend'] = false;
body['Procedure'] = procedure;
await baseAppClient.postPatient(GET_Patient_LAB_ORDERS_RESULT, patient: patient,
await baseAppClient.postPatient(GET_Patient_LAB_ORDERS_RESULT, patient: patient!,
onSuccess: (dynamic response, int statusCode) {
labOrdersResultsList.clear();
response['ListPLR'].forEach((lab) {
@ -154,7 +154,7 @@ class LabsService extends BaseService {
RequestSendLabReportEmail _requestSendLabReportEmail = RequestSendLabReportEmail();
Future sendLabReportEmail({PatientLabOrders patientLabOrder}) async {
Future sendLabReportEmail({PatientLabOrders? patientLabOrder}) async {
// _requestSendLabReportEmail.projectID = patientLabOrder.projectID;
// _requestSendLabReportEmail.invoiceNo = patientLabOrder.invoiceNo;
// _requestSendLabReportEmail.doctorName = patientLabOrder.doctorName;
@ -179,7 +179,7 @@ class LabsService extends BaseService {
}
Future getPatientLabOrdersResultHistoryByDescription(
{PatientLabOrders patientLabOrder, String procedureDescription, PatiantInformtion patient}) async {
{required PatientLabOrders patientLabOrder, required String procedureDescription, required PatiantInformtion patient}) async {
hasError = false;
Map<String, dynamic> body = Map();
if (patientLabOrder != null) {
@ -201,7 +201,7 @@ class LabsService extends BaseService {
}, body: body);
}
Future getAllSpecialLabResult({int mrn}) async {
Future getAllSpecialLabResult({required int mrn}) async {
_allSpecialLabResultRequestModel = AllSpecialLabResultRequestModel(
patientID: mrn,
patientType: 1,

@ -17,6 +17,7 @@ class PatientMedicalReportService extends BaseService {
body['ProjectID'] = doctorProfile!.projectID;
medicalReportList = [];
await baseAppClient.postPatient(PATIENT_MEDICAL_REPORT_GET_LIST, onSuccess: (dynamic response, int statusCode) {
if (response['DAPP_ListMedicalReportList'] != null) {
response['DAPP_ListMedicalReportList'].forEach((v) {
medicalReportList.add(MedicalReportModel.fromJson(v));

@ -13,7 +13,7 @@ class MedicalFileService extends BaseService {
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU",
);
Future getMedicalFile({int mrn}) async {
Future getMedicalFile({int? mrn}) async {
_fileRequestModel = MedicalFileRequestModel(patientMRN: mrn);
_fileRequestModel.iPAdress = "9.9.9.9";
hasError = false;

@ -44,9 +44,8 @@ class PrescriptionService extends LookupService {
PostPrescriptionReqModel _postPrescriptionReqModel =
PostPrescriptionReqModel();
Future getItem({int itemID}) async {
_itemByMedicineRequestModel =
ItemByMedicineRequestModel(medicineCode: itemID);
Future getItem({int? itemID}) async {
_itemByMedicineRequestModel = ItemByMedicineRequestModel(medicineCode: itemID);
hasError = false;
@ -78,7 +77,7 @@ class PrescriptionService extends LookupService {
}, body: getAssessmentReqModel.toJson());
}
Future getPrescription({int mrn}) async {
Future getPrescription({int? mrn}) async {
_prescriptionReqModel = PrescriptionReqModel(
patientMRN: mrn,
);
@ -94,8 +93,8 @@ class PrescriptionService extends LookupService {
}, body: _prescriptionReqModel.toJson());
}
Future getDrugs({String drugName}) async {
_drugRequestModel = SearchDrugRequestModel(search: [drugName]);
Future getDrugs({String? drugName}) async {
_drugRequestModel = SearchDrugRequestModel(search: [drugName!]);
hasError = false;
@ -242,13 +241,9 @@ class PrescriptionService extends LookupService {
}, body: request);
}
Future calculateBoxQuantity(
{int freq, int duration, int itemCode, double strength}) async {
_boxQuantityRequestModel = CalculateBoxQuantityRequestModel(
frequency: freq,
duration: duration,
itemCode: itemCode,
strength: strength);
Future calculateBoxQuantity({int? freq, int? duration, int? itemCode, double? strength}) async {
_boxQuantityRequestModel =
CalculateBoxQuantityRequestModel(frequency: freq, duration: duration, itemCode: itemCode, strength: strength);
hasError = false;

@ -26,7 +26,7 @@ class PrescriptionsService extends BaseService {
GetMedicationForInPatientRequestModel _getMedicationForInPatientRequestModel =
GetMedicationForInPatientRequestModel();
Future getPrescriptionInPatient({int mrn, String adn}) async {
Future getPrescriptionInPatient({int? mrn, String? adn}) async {
_inPatientPrescriptionRequestModel = InPatientPrescriptionRequestModel(
patientMRN: mrn,
admissionNo: adn,
@ -64,9 +64,9 @@ class PrescriptionsService extends BaseService {
RequestPrescriptionReport(appointmentNo: 0, isDentalAllowedBackend: false);
List<PrescriptionReport> prescriptionReportList = [];
Future getPrescriptionReport({Prescriptions prescriptions, @required PatiantInformtion patient}) async {
Future getPrescriptionReport({Prescriptions? prescriptions, @required PatiantInformtion? patient}) async {
hasError = false;
_requestPrescriptionReport.dischargeNo = prescriptions.dischargeNo;
_requestPrescriptionReport.dischargeNo = prescriptions!.dischargeNo;
_requestPrescriptionReport.projectID = prescriptions.projectID;
_requestPrescriptionReport.clinicID = prescriptions.clinicID;
_requestPrescriptionReport.setupID = prescriptions.setupID;
@ -74,11 +74,11 @@ class PrescriptionsService extends BaseService {
_requestPrescriptionReport.appointmentNo = prescriptions.appointmentNo;
await baseAppClient.postPatient(
prescriptions.isInOutPatient ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW,
patient: patient, onSuccess: (dynamic response, int statusCode) {
prescriptions.isInOutPatient! ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW,
patient: patient!, onSuccess: (dynamic response, int statusCode) {
prescriptionReportList.clear();
prescriptionReportEnhList.clear();
if (prescriptions.isInOutPatient) {
if (prescriptions.isInOutPatient!) {
response['ListPRM'].forEach((prescriptions) {
prescriptionReportList.add(PrescriptionReport.fromJson(prescriptions));
prescriptionReportEnhList.add(PrescriptionReportEnh.fromJson(prescriptions));
@ -102,10 +102,10 @@ class PrescriptionsService extends BaseService {
);
List<PharmacyPrescriptions> pharmacyPrescriptionsList = [];
Future getListPharmacyForPrescriptions({int itemId, @required PatiantInformtion patient}) async {
Future getListPharmacyForPrescriptions({int? itemId, @required PatiantInformtion? patient}) async {
hasError = false;
requestGetListPharmacyForPrescriptions.itemID = itemId;
await baseAppClient.postPatient(GET_PHARMACY_LIST, patient: patient, onSuccess: (dynamic response, int statusCode) {
await baseAppClient.postPatient(GET_PHARMACY_LIST, patient: patient!, onSuccess: (dynamic response, int statusCode) {
pharmacyPrescriptionsList.clear();
response['PharmList'].forEach((prescriptions) {
pharmacyPrescriptionsList.add(PharmacyPrescriptions.fromJson(prescriptions));
@ -122,11 +122,11 @@ class PrescriptionsService extends BaseService {
List<PrescriptionReportEnh> prescriptionReportEnhList = [];
Future getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder, @required PatiantInformtion patient}) async {
Future getPrescriptionReportEnh({PrescriptionsOrder? prescriptionsOrder, @required PatiantInformtion? patient}) async {
///This logic copy from the old app from class [order-history.component.ts] in line 45
bool isInPatient = false;
prescriptionsList.forEach((element) {
if (prescriptionsOrder.appointmentNo == "0") {
if (prescriptionsOrder!.appointmentNo == "0") {
if (element.dischargeNo == int.parse(prescriptionsOrder.dischargeID)) {
_requestPrescriptionReportEnh.appointmentNo = element.appointmentNo;
_requestPrescriptionReportEnh.clinicID = element.clinicID;
@ -134,7 +134,7 @@ class PrescriptionsService extends BaseService {
_requestPrescriptionReportEnh.episodeID = element.episodeID;
_requestPrescriptionReportEnh.setupID = element.setupID;
_requestPrescriptionReportEnh.dischargeNo = element.dischargeNo;
isInPatient = element.isInOutPatient;
isInPatient = element.isInOutPatient!;
}
} else {
if (int.parse(prescriptionsOrder.appointmentNo) == element.appointmentNo) {
@ -144,7 +144,7 @@ class PrescriptionsService extends BaseService {
_requestPrescriptionReportEnh.episodeID = element.episodeID;
_requestPrescriptionReportEnh.setupID = element.setupID;
_requestPrescriptionReportEnh.dischargeNo = element.dischargeNo;
isInPatient = element.isInOutPatient;
isInPatient = element.isInOutPatient!;
///call inpGetPrescriptionReport
}
@ -192,9 +192,9 @@ class PrescriptionsService extends BaseService {
hasError = false;
_getMedicationForInPatientRequestModel = GetMedicationForInPatientRequestModel(
isDentalAllowedBackend: false,
admissionNo: int.parse(patient.admissionNo),
admissionNo: int.parse(patient!.admissionNo!),
tokenID: "@dm!n",
projectID: patient.projectId,
projectID: patient!.projectId!,
);
await baseAppClient.postPatient(GET_MEDICATION_FOR_IN_PATIENT, patient: patient,
onSuccess: (dynamic response, int statusCode) {

@ -59,7 +59,7 @@ class ProcedureService extends BaseService {
//search: ["DENTAL"],
);
Future getProcedureTemplate({int doctorId, int projectId, int clinicId, String categoryID}) async {
Future getProcedureTemplate({int? doctorId, int? projectId, int? clinicId, String? categoryID}) async {
_procedureTempleteRequestModel = ProcedureTempleteRequestModel(
// tokenID: "@dm!n",
patientID: 0,
@ -72,7 +72,7 @@ class ProcedureService extends BaseService {
templateList.clear();
response['DAPP_TemplateGetList'].forEach((template) {
ProcedureTempleteDetailsModel templateElement = ProcedureTempleteDetailsModel.fromJson(template);
if (categoryID != null) {
if (categoryID != null ) {
if (categoryID == templateElement.categoryID) {
templateList.add(templateElement);
}
@ -89,7 +89,7 @@ class ProcedureService extends BaseService {
}, body: _procedureTempleteRequestModel.toJson());
}
Future getProcedureTemplateDetails({int doctorId, int projectId, int clinicId, int templateId}) async {
Future getProcedureTemplateDetails({int? doctorId, int? projectId, int? clinicId, int? templateId}) async {
_procedureTempleteDetailsRequestModel =
ProcedureTempleteDetailsRequestModel(templateID: templateId, searchType: 1, patientID: 0);
hasError = false;
@ -107,7 +107,7 @@ class ProcedureService extends BaseService {
}, body: _procedureTempleteDetailsRequestModel.toJson());
}
Future getProcedure({int mrn, int appointmentNo}) async {
Future getProcedure({int? mrn, required int appointmentNo}) async {
_getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel(
patientMRN: mrn,
);
@ -133,7 +133,7 @@ class ProcedureService extends BaseService {
}, body: Map());
}
Future getProcedureCategory({String categoryName, String categoryID, patientId}) async {
Future getProcedureCategory({String? categoryName, String? categoryID, patientId}) async {
_getProcedureCategoriseReqModel = GetProcedureReqModel(
search: ["$categoryName"],
patientMRN: patientId,

@ -9,14 +9,14 @@ class RadiologyService extends BaseService {
List<FinalRadiology> finalRadiologyList = [];
String url = '';
Future getRadImageURL({int invoiceNo, int lineItem, int projectId, @required PatiantInformtion patient}) async {
Future getRadImageURL({int? invoiceNo, int? lineItem, int? projectId, @required PatiantInformtion? patient}) async {
hasError = false;
final Map<String, dynamic> body = new Map<String, dynamic>();
body['InvoiceNo'] = invoiceNo;
body['LineItemNo'] = lineItem;
body['ProjectID'] = projectId;
await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient, onSuccess: (dynamic response, int statusCode) {
await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient!, onSuccess: (dynamic response, int statusCode) {
url = response['Data'];
}, onFailure: (String error, int statusCode) {
hasError = true;

@ -164,7 +164,7 @@ class SickLeaveService extends BaseService {
_getReScheduleLeave.sort((a, b) {
var adate = a.dateTimeFrom; //before -> var adate = a.date;
var bdate = b.dateTimeFrom; //var bdate = b.date;
return -adate.compareTo(bdate);
return -adate!.compareTo(bdate!);
});
},
onFailure: (String error, int statusCode) {

@ -34,7 +34,7 @@ class SOAPService extends LookupService {
List<GetPatientProgressNoteResModel> patientProgressNoteList = [];
List<GetAssessmentResModel> patientAssessmentList = [];
int episodeID;
int? episodeID;
Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
await baseAppClient.post(
GET_ALLERGIES,
@ -80,12 +80,11 @@ class SOAPService extends LookupService {
Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async {
hasError = false;
await baseAppClient.post(POST_ALLERGY,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(POST_ALLERGY, onSuccess: (dynamic response, int statusCode) {
print("Success");
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = super.error+ "\n"+error;
super.error = super.error!+ "\n"+error;
}, body: postAllergyRequestModel.toJson());
}
@ -97,12 +96,11 @@ class SOAPService extends LookupService {
print("Success");
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error =super.error + "\n"+error;
super.error =super.error! + "\n"+error;
}, body: postHistoriesRequestModel.toJson());
}
Future postChiefComplaint(
PostChiefComplaintRequestModel postChiefComplaintRequestModel) async {
Future postChiefComplaint(PostChiefComplaintRequestModel postChiefComplaintRequestModel) async {
hasError = false;
super.error ="";
await baseAppClient.post(POST_CHIEF_COMPLAINT,
@ -114,8 +112,7 @@ class SOAPService extends LookupService {
}, body: postChiefComplaintRequestModel.toJson());
}
Future postPhysicalExam(
PostPhysicalExamRequestModel postPhysicalExamRequestModel) async {
Future postPhysicalExam(PostPhysicalExamRequestModel postPhysicalExamRequestModel) async {
hasError = false;
await baseAppClient.post(POST_PHYSICAL_EXAM,
onSuccess: (dynamic response, int statusCode) {
@ -170,7 +167,7 @@ class SOAPService extends LookupService {
print("Success");
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = super.error +"\n"+error;
super.error = super.error!+"\n"+error;
}, body: patchHistoriesRequestModel.toJson());
}

@ -8,11 +8,11 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
class UcafService extends LookupService {
List<GetChiefComplaintResModel> patientChiefComplaintList;
List<VitalSignHistory> patientVitalSignsHistory;
late List<GetChiefComplaintResModel> patientChiefComplaintList;
late List<VitalSignHistory> patientVitalSignsHistory;
List<GetAssessmentResModel> patientAssessmentList = [];
List<OrderProcedure> orderProcedureList = [];
PrescriptionModel prescriptionList;
PrescriptionModel? prescriptionList;
Future getPatientChiefComplaint(PatiantInformtion patient) async {
hasError = false;
@ -22,14 +22,13 @@ class UcafService extends LookupService {
body['EpisodeID'] = patient.episodeNo;
body['DoctorID'] = "";
patientChiefComplaintList = null;
await baseAppClient.post(GET_CHIEF_COMPLAINT,
onSuccess: (dynamic response, int statusCode) {
patientChiefComplaintList = [];
await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) {
print("Success");
if (patientChiefComplaintList != null) {
patientChiefComplaintList.clear();
} else {
patientChiefComplaintList = new [];
patientChiefComplaintList = [];
}
response['List_ChiefComplaint']['entityList'].forEach((v) {
patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v));
@ -52,14 +51,14 @@ class UcafService extends LookupService {
body['InOutPatientType'] = 2;
}
patientVitalSignsHistory = null;
patientVitalSignsHistory = [];
await baseAppClient.post(
GET_PATIENT_VITAL_SIGN,
onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear();
} else {
patientVitalSignsHistory = new [];
patientVitalSignsHistory = [];
}
if (response['List_DoctorPatientVitalSign'] != null) {
response['List_DoctorPatientVitalSign'].forEach((v) {
@ -89,14 +88,14 @@ class UcafService extends LookupService {
body['From'] = fromDate;
body['To'] = toDate;
patientVitalSignsHistory = null;
patientVitalSignsHistory = [];
await baseAppClient.post(
GET_PATIENT_VITAL_SIGN_DATA,
onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear();
} else {
patientVitalSignsHistory = new [];
patientVitalSignsHistory = [];
}
if (response['VitalSignsHistory'] != null) {
response['VitalSignsHistory'].forEach((v) {

@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-
import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
class VitalSignsService extends BaseService {
VitalSignData patientVitalSigns;
VitalSignData? patientVitalSigns;
List<VitalSignHistory> patientVitalSignsHistory = [];
Future getPatientVitalSign(PatiantInformtion patient) async {

@ -13,10 +13,10 @@ class PendingOrderService extends BaseService {
List<AdmissionOrdersModel> get admissionOrderList => _admissionOrderList;
Future getPendingOrders(
{PendingOrderRequestModel pendingOrderRequestModel,
int patientId,
int admissionNo}) async {
pendingOrderRequestModel = PendingOrderRequestModel(
{
required int patientId,
required int admissionNo}) async {
PendingOrderRequestModel pendingOrderRequestModel = PendingOrderRequestModel(
patientID: patientId,
admissionNo: admissionNo,
patientTypeID: 1,
@ -40,10 +40,10 @@ class PendingOrderService extends BaseService {
}
Future getAdmissionOrders(
{AdmissionOrdersRequestModel admissionOrdersRequestModel,
int patientId,
int admissionNo}) async {
admissionOrdersRequestModel = AdmissionOrdersRequestModel(
{
required int patientId,
required int admissionNo}) async {
AdmissionOrdersRequestModel admissionOrdersRequestModel = AdmissionOrdersRequestModel(
patientID: patientId,
admissionNo: admissionNo,
patientTypeID: 1,

@ -23,8 +23,8 @@ import 'package:flutter/widgets.dart';
class DoctorApp {
DoctorApp._();
static const _kFontFam = 'DoctorApp';
static const String _kFontPkg = null;
static const _kFontFam = 'DoctorApp';
static const String? _kFontPkg = null;
static const IconData female_icon = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData male = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,23 +1,19 @@
class PostAssessmentRequestModel {
int patientMRN;
int appointmentNo;
int episodeId;
List<IcdCodeDetails> icdCodeDetails;
int? patientMRN;
int? appointmentNo;
int? episodeId;
List<IcdCodeDetails>? icdCodeDetails;
PostAssessmentRequestModel(
{this.patientMRN,
this.appointmentNo,
this.episodeId,
this.icdCodeDetails});
PostAssessmentRequestModel({this.patientMRN, this.appointmentNo, this.episodeId, this.icdCodeDetails});
PostAssessmentRequestModel.fromJson(Map<String, dynamic> json) {
patientMRN = json['PatientMRN'];
appointmentNo = json['AppointmentNo'];
episodeId = json['EpisodeID'];
if (json['icdCodeDetails'] != null) {
icdCodeDetails = new List<IcdCodeDetails>();
icdCodeDetails = [];
json['icdCodeDetails'].forEach((v) {
icdCodeDetails.add(new IcdCodeDetails.fromJson(v));
icdCodeDetails!.add(new IcdCodeDetails.fromJson(v));
});
}
}
@ -28,26 +24,20 @@ class PostAssessmentRequestModel {
data['AppointmentNo'] = this.appointmentNo;
data['EpisodeID'] = this.episodeId;
if (this.icdCodeDetails != null) {
data['icdCodeDetails'] =
this.icdCodeDetails.map((v) => v.toJson()).toList();
data['icdCodeDetails'] = this.icdCodeDetails!.map((v) => v.toJson()).toList();
}
return data;
}
}
class IcdCodeDetails {
String icdcode10Id;
int conditionId;
int diagnosisTypeId;
bool complexDiagnosis;
String remarks;
String? icdcode10Id;
int? conditionId;
int? diagnosisTypeId;
bool? complexDiagnosis;
String? remarks;
IcdCodeDetails(
{this.icdcode10Id,
this.conditionId,
this.diagnosisTypeId,
this.complexDiagnosis,
this.remarks});
IcdCodeDetails({this.icdcode10Id, this.conditionId, this.diagnosisTypeId, this.complexDiagnosis, this.remarks});
IcdCodeDetails.fromJson(Map<String, dynamic> json) {
icdcode10Id = json['icdcode10Id'];

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

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

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

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

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

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

@ -1,15 +1,15 @@
class AdmissionOrdersModel {
int procedureID;
String procedureName;
String procedureNameN;
int orderNo;
int doctorID;
int clinicID;
String createdOn;
int createdBy;
String editedOn;
int editedBy;
String createdByName;
int? procedureID;
String? procedureName;
String? procedureNameN;
int? orderNo;
int? doctorID;
int? clinicID;
String? createdOn;
int? createdBy;
String? editedOn;
int? editedBy;
String? createdByName;
AdmissionOrdersModel(
{this.procedureID,

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

@ -16,10 +16,10 @@
// }
class Countries {
String name;
String nameAr;
String code;
String countryCode;
String? name;
String? nameAr;
String? code;
String? countryCode;
Countries({this.name, this.nameAr, this.code, this.countryCode});

@ -1,7 +1,7 @@
class DashboardModel {
String kPIName;
int displaySequence;
List<Summaryoptions> summaryoptions;
String? kPIName;
int? displaySequence;
List<Summaryoptions>? summaryoptions;
DashboardModel({this.kPIName, this.displaySequence, this.summaryoptions});
@ -9,9 +9,9 @@ class DashboardModel {
kPIName = json['KPIName'];
displaySequence = json['displaySequence'];
if (json['summaryoptions'] != null) {
summaryoptions = new List<Summaryoptions>();
summaryoptions = <Summaryoptions>[];
json['summaryoptions'].forEach((v) {
summaryoptions.add(new Summaryoptions.fromJson(v));
summaryoptions!.add(new Summaryoptions.fromJson(v));
});
}
}
@ -21,30 +21,29 @@ class DashboardModel {
data['KPIName'] = this.kPIName;
data['displaySequence'] = this.displaySequence;
if (this.summaryoptions != null) {
data['summaryoptions'] =
this.summaryoptions.map((v) => v.toJson()).toList();
data['summaryoptions'] = this.summaryoptions!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Summaryoptions {
String kPIParameter;
String captionColor;
bool isCaptionBold;
bool isValueBold;
int order;
int value;
String valueColor;
String? kPIParameter;
String? captionColor;
bool? isCaptionBold;
bool? isValueBold;
int? order;
int? value;
String? valueColor;
Summaryoptions(
{this.kPIParameter,
this.captionColor,
this.isCaptionBold,
this.isValueBold,
this.order,
this.value,
this.valueColor});
this.captionColor,
this.isCaptionBold,
this.isValueBold,
this.order,
this.value,
this.valueColor});
Summaryoptions.fromJson(Map<String, dynamic> json) {
kPIParameter = json['KPIParameter'];

@ -1,9 +1,9 @@
class GetSpecialClinicalCareListResponseModel {
int projectID;
int clinicID;
String clinicDescription;
String clinicDescriptionN;
bool isActive;
int? projectID;
int? clinicID;
String? clinicDescription;
String? clinicDescriptionN;
bool? isActive;
GetSpecialClinicalCareListResponseModel(
{this.projectID,

@ -1,10 +1,10 @@
class GetSpecialClinicalCareMappingListResponseModel {
int mappingProjectID;
int clinicID;
int nursingStationID;
bool isActive;
int projectID;
String description;
int? mappingProjectID;
int? clinicID;
int? nursingStationID;
bool? isActive;
int? projectID;
String? description;
GetSpecialClinicalCareMappingListResponseModel(
{this.mappingProjectID,

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

@ -1,33 +1,33 @@
class GetDischargeSummaryResModel {
String setupID;
int projectID;
int dischargeNo;
String dischargeDate;
int admissionNo;
int assessmentNo;
int patientType;
int patientID;
int clinicID;
int doctorID;
String finalDiagnosis;
String persentation;
String pastHistory;
String planOfCare;
String investigations;
String followupPlan;
String conditionOnDischarge;
String significantFindings;
String planedProcedure;
int daysStayed;
String remarks;
String eRCare;
int status;
bool isActive;
int createdBy;
String createdOn;
int editedBy;
String editedOn;
bool isPatientDied;
String? setupID;
int? projectID;
int? dischargeNo;
String? dischargeDate;
int? admissionNo;
int? assessmentNo;
int? patientType;
int? patientID;
int? clinicID;
int? doctorID;
String? finalDiagnosis;
String? persentation;
String? pastHistory;
String? planOfCare;
String? investigations;
String? followupPlan;
String? conditionOnDischarge;
String? significantFindings;
String? planedProcedure;
int? daysStayed;
String? remarks;
String? eRCare;
int? status;
bool? isActive;
int? createdBy;
String? createdOn;
int? editedBy;
String? editedOn;
bool? isPatientDied;
dynamic isMedicineApproved;
dynamic isOpenBillDischarge;
dynamic activatedDate;
@ -36,16 +36,16 @@ class GetDischargeSummaryResModel {
dynamic patientCodition;
dynamic others;
dynamic reconciliationInstruction;
String dischargeInstructions;
String reason;
String? dischargeInstructions;
String? reason;
dynamic dischargeDisposition;
dynamic hospitalID;
String createdByName;
String? createdByName;
dynamic createdByNameN;
String editedByName;
String? editedByName;
dynamic editedByNameN;
String clinicName;
String projectName;
String? clinicName;
String? projectName;
GetDischargeSummaryResModel(
{this.setupID,

@ -6,20 +6,14 @@
*@desc: Clinic Model
*/
class ClinicModel {
Null setupID;
int projectID;
int doctorID;
int clinicID;
bool isActive;
String clinicName;
dynamic setupID;
int? projectID;
int? doctorID;
int? clinicID;
bool? isActive;
String? clinicName;
ClinicModel(
{this.setupID,
this.projectID,
this.doctorID,
this.clinicID,
this.isActive,
this.clinicName});
ClinicModel({this.setupID, this.projectID, this.doctorID, this.clinicID, this.isActive, this.clinicName});
ClinicModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];

@ -1,45 +1,45 @@
class DoctorProfileModel {
int doctorID;
String doctorName;
Null doctorNameN;
int clinicID;
String clinicDescription;
Null clinicDescriptionN;
Null licenseExpiry;
int employmentType;
int? doctorID;
String? doctorName;
dynamic doctorNameN;
int? clinicID;
String? clinicDescription;
dynamic clinicDescriptionN;
dynamic licenseExpiry;
int? employmentType;
dynamic setupID;
int projectID;
String projectName;
String nationalityID;
String nationalityName;
Null nationalityNameN;
int gender;
String genderDescription;
Null genderDescriptionN;
Null doctorTitle;
Null projectNameN;
bool isAllowWaitList;
String titleDescription;
Null titleDescriptionN;
Null isRegistered;
Null isDoctorDummy;
bool isActive;
Null isDoctorAppointmentDisplayed;
bool doctorClinicActive;
Null isbookingAllowed;
String doctorCases;
Null doctorPicture;
String doctorProfileInfo;
List<String> specialty;
int actualDoctorRate;
String doctorImageURL;
int doctorRate;
String doctorTitleForProfile;
bool isAppointmentAllowed;
String nationalityFlagURL;
int noOfPatientsRate;
String qR;
int serviceID;
int? projectID;
String? projectName;
String? nationalityID;
String? nationalityName;
dynamic nationalityNameN;
int? gender;
String? genderDescription;
dynamic genderDescriptionN;
dynamic doctorTitle;
dynamic projectNameN;
bool? isAllowWaitList;
String? titleDescription;
dynamic titleDescriptionN;
dynamic isRegistered;
dynamic isDoctorDummy;
bool? isActive;
dynamic isDoctorAppointmentDisplayed;
bool? doctorClinicActive;
dynamic isbookingAllowed;
String? doctorCases;
dynamic doctorPicture;
String? doctorProfileInfo;
List<String>? specialty;
int? actualDoctorRate;
String? doctorImageURL;
int? doctorRate;
String? doctorTitleForProfile;
bool? isAppointmentAllowed;
String? nationalityFlagURL;
int? noOfPatientsRate;
String? qR;
int? serviceID;
DoctorProfileModel(
{this.doctorID,
@ -84,7 +84,7 @@ class DoctorProfileModel {
this.qR,
this.serviceID});
DoctorProfileModel.fromJson(Map<String, dynamic> json) {
DoctorProfileModel.fromJson(Map<dynamic, dynamic> json) {
doctorID = json['DoctorID'];
doctorName = json['DoctorName'];
doctorNameN = json['DoctorNameN'];
@ -110,26 +110,26 @@ class DoctorProfileModel {
isRegistered = json['IsRegistered'];
isDoctorDummy = json['IsDoctorDummy'];
isActive = json['IsActive'];
isDoctorAppointmentDisplayed = json['IsDoctorAppointmentDisplayed'];
isDoctorAppointmentDisplayed = json['IsDoctorAppoint?mentDisplayed'];
doctorClinicActive = json['DoctorClinicActive'];
isbookingAllowed = json['IsbookingAllowed'];
doctorCases = json['DoctorCases'];
doctorPicture = json['DoctorPicture'];
doctorProfileInfo = json['DoctorProfileInfo'];
specialty = json['Specialty'].cast<String>();
specialty = json['Specialty'].cast<String?>();
actualDoctorRate = json['ActualDoctorRate'];
doctorImageURL = json['DoctorImageURL'];
doctorRate = json['DoctorRate'];
doctorTitleForProfile = json['DoctorTitleForProfile'];
isAppointmentAllowed = json['IsAppointmentAllowed'];
isAppointmentAllowed = json['IsAppoint?mentAllowed'];
nationalityFlagURL = json['NationalityFlagURL'];
noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR'];
serviceID = json['ServiceID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<dynamic?, dynamic> toJson() {
final Map<dynamic, dynamic> data = new Map<dynamic, dynamic>();
data['DoctorID'] = this.doctorID;
data['DoctorName'] = this.doctorName;
data['DoctorNameN'] = this.doctorNameN;
@ -155,7 +155,7 @@ class DoctorProfileModel {
data['IsRegistered'] = this.isRegistered;
data['IsDoctorDummy'] = this.isDoctorDummy;
data['IsActive'] = this.isActive;
data['IsDoctorAppointmentDisplayed'] = this.isDoctorAppointmentDisplayed;
data['IsDoctorAppoint?mentDisplayed'] = this.isDoctorAppointmentDisplayed;
data['DoctorClinicActive'] = this.doctorClinicActive;
data['IsbookingAllowed'] = this.isbookingAllowed;
data['DoctorCases'] = this.doctorCases;
@ -166,7 +166,7 @@ class DoctorProfileModel {
data['DoctorImageURL'] = this.doctorImageURL;
data['DoctorRate'] = this.doctorRate;
data['DoctorTitleForProfile'] = this.doctorTitleForProfile;
data['IsAppointmentAllowed'] = this.isAppointmentAllowed;
data['IsAppoint?mentAllowed'] = this.isAppointmentAllowed;
data['NationalityFlagURL'] = this.nationalityFlagURL;
data['NoOfPatientsRate'] = this.noOfPatientsRate;
data['QR'] = this.qR;

@ -1,12 +1,11 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class ListDoctorWorkingHoursTable {
DateTime date;
String dayName;
String workingHours;
String projectName;
String clinicName;
DateTime? date;
String? dayName;
String? workingHours;
String? projectName;
String? clinicName;
ListDoctorWorkingHoursTable({
this.date,
@ -35,7 +34,7 @@ class ListDoctorWorkingHoursTable {
}
class WorkingHours {
String from;
String to;
String? from;
String? to;
WorkingHours({this.from, this.to});
}

@ -1,74 +1,75 @@
class ListGtMyPatientsQuestions {
Null rowID;
String setupID;
int projectID;
int transactionNo;
int patientType;
int patientID;
int doctorID;
int requestType;
String requestDate;
String requestTime;
String remarks;
int status;
int createdBy;
String createdOn;
int editedBy;
String editedOn;
String patientName;
String? setupID;
int? projectID;
int? transactionNo;
int? patientType;
int? patientID;
int? doctorID;
int? requestType;
String? requestDate;
String? requestTime;
String? remarks;
int? status;
int? createdBy;
String? createdOn;
int? editedBy;
String? editedOn;
String? patientName;
Null patientNameN;
int gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
int infoStatus;
String infoDesc;
String doctorResponse;
dynamic responseDate;
int memberID;
String memberName;
String memberNameN;
String age;
String genderDescription;
bool isVidaCall;
String requestTypeDescription;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
int? infoStatus;
String? infoDesc;
String? doctorResponse;
dynamic? responseDate;
int? memberID;
String? memberName;
String? memberNameN;
String? age;
String? genderDescription;
bool? isVidaCall;
String? requestTypeDescription;
ListGtMyPatientsQuestions(
{this.rowID,
this.setupID,
this.projectID,
this.transactionNo,
this.patientType,
this.patientID,
this.doctorID,
this.requestType,
this.requestDate,
this.requestTime,
this.remarks,
this.status,
this.createdBy,
this.createdOn,
this.editedBy,
this.editedOn,
this.patientName,
this.patientNameN,
this.gender,
this.dateofBirth,
this.mobileNumber,
this.emailAddress,
this.infoStatus,
this.projectID,
this.transactionNo,
this.patientType,
this.patientID,
this.doctorID,
this.requestType,
this.requestDate,
this.requestTime,
this.remarks,
this.status,
this.createdBy,
this.createdOn,
this.editedBy,
this.editedOn,
this.patientName,
this.patientNameN,
this.gender,
this.dateofBirth,
this.mobileNumber,
this.emailAddress,
this.infoStatus,
this.infoDesc,
this.doctorResponse,
this.responseDate,
this.memberID,
this.memberName,
this.memberNameN,
this.age,
this.genderDescription,
this.isVidaCall,
this.memberName,
this.memberNameN,
this.age,
this.genderDescription,
this.isVidaCall,
this.requestTypeDescription});
ListGtMyPatientsQuestions.fromJson(Map<String, dynamic> json) {
ListGtMyPatientsQuestions.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID'];
setupID = json['SetupID'];
projectID = json['ProjectID'];
@ -104,8 +105,8 @@ class ListGtMyPatientsQuestions {
requestTypeDescription = json['RequestTypeDescription'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['RowID'] = this.rowID;
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;

@ -6,34 +6,34 @@
*@desc: ProfileReqModel
*/
class ProfileReqModel {
int projectID;
int clinicID;
int doctorID;
bool isRegistered;
bool license;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
int? projectID;
int? clinicID;
int? doctorID;
bool? isRegistered;
bool? license;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
ProfileReqModel(
{this.projectID,
this.clinicID,
this.doctorID,
this.isRegistered = true,
this.license,
this.languageID,
this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress = '11.11.11.11',
// this.versionID=5.5,
this.channel = 9,
this.sessionID = 'E2bsEeYEJo',
this.tokenID,
this.isLoginForDoctorApp = true});
this.clinicID,
this.doctorID,
this.isRegistered = true,
this.license,
this.languageID,
this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress = '11.11.11.11',
// this.versionID = 5.5,
this.channel = 9,
this.sessionID = 'E2bsEeYEJo',
this.tokenID,
this.isLoginForDoctorApp = true});
ProfileReqModel.fromJson(Map<String, dynamic> json) {
projectID = json['ProjectID'];

@ -1,24 +1,24 @@
class CreateDoctorResponseModel {
String setupID;
int projectID;
String transactionNo;
int infoEnteredBy;
int infoStatus;
int createdBy;
int editedBy;
String doctorResponse;
int doctorID;
String? setupID;
int? projectID;
String? transactionNo;
int? infoEnteredBy;
int? infoStatus;
int? createdBy;
int? editedBy;
String? doctorResponse;
int? doctorID;
CreateDoctorResponseModel(
{this.setupID,
this.projectID,
this.transactionNo,
this.infoEnteredBy,
this.infoStatus,
this.createdBy,
this.editedBy,
this.doctorResponse,
this.doctorID});
this.projectID,
this.transactionNo,
this.infoEnteredBy,
this.infoStatus,
this.createdBy,
this.editedBy,
this.doctorResponse,
this.doctorID});
CreateDoctorResponseModel.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];

@ -1,21 +1,21 @@
import 'package:doctor_app_flutter/config/config.dart';
class RequestDoctorReply {
int projectID;
int doctorID;
int transactionNo;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int pageIndex;
int pageSize;
int infoStatus;
int? projectID;
int? doctorID;
int? transactionNo;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? pageIndex;
int? pageSize;
int? infoStatus;
RequestDoctorReply(
{this.projectID,

@ -1,23 +1,22 @@
import 'package:doctor_app_flutter/config/config.dart';
class RequestAddReferredDoctorRemarks {
int projectID;
String admissionNo;
int lineItemNo;
String referredDoctorRemarks;
int editedBy;
int patientID;
int referringDoctor;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? projectID;
String? admissionNo;
int? lineItemNo;
String? referredDoctorRemarks;
int? editedBy;
int? patientID;
int? referringDoctor;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
RequestAddReferredDoctorRemarks(
{this.projectID,
@ -31,7 +30,7 @@ class RequestAddReferredDoctorRemarks {
this.stamp = STAMP,
this.iPAdress = IP_ADDRESS,
this.versionID = VERSION_ID,
this.channel= CHANNEL,
this.channel = CHANNEL,
this.tokenID,
this.sessionID = SESSION_ID,
this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,

@ -1,20 +1,18 @@
class RequestSchedule {
int projectID;
int clinicID;
int doctorID;
int doctorWorkingHoursDays;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? projectID;
int? clinicID;
int? doctorID;
int? doctorWorkingHoursDays;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
RequestSchedule(
{this.projectID,

@ -1,18 +1,13 @@
class StatsticsForCertainDoctorRequest {
bool outSA;
int doctorID;
String tokenID;
int channel;
int projectID;
String generalid;
bool? outSA;
int? doctorID;
String? tokenID;
int? channel;
int? projectID;
String? generalid;
StatsticsForCertainDoctorRequest(
{this.outSA,
this.doctorID,
this.tokenID,
this.channel,
this.projectID,
this.generalid});
{this.outSA, this.doctorID, this.tokenID, this.channel, this.projectID, this.generalid});
StatsticsForCertainDoctorRequest.fromJson(Map<String, dynamic> json) {
outSA = json['OutSA'];

@ -1,16 +1,16 @@
class UserModel {
String userID;
String password;
int projectID;
int languageID;
String iPAdress;
double versionID;
int channel;
String sessionID;
String tokenID;
String stamp;
bool isLoginForDoctorApp;
int patientOutSA;
String? userID;
String? password;
int? projectID;
int? languageID;
String? iPAdress;
double? versionID;
int? channel;
String? sessionID;
String? tokenID;
String? stamp;
bool? isLoginForDoctorApp;
int? patientOutSA;
UserModel(
{this.userID,

@ -1,54 +1,54 @@
import 'package:doctor_app_flutter/config/config.dart';
class VerifyReferralDoctorRemarks {
int projectID;
String admissionNo;
int lineItemNo;
String referredDoctorRemarks;
int editedBy;
int patientID;
int referringDoctor;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
String firstName;
int? projectID;
String? admissionNo;
int? lineItemNo;
String? referredDoctorRemarks;
int? editedBy;
int? patientID;
int? referringDoctor;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
String? firstName;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
String? middleName;
String? lastName;
String? patientMobileNumber;
String? patientIdentificationID;
VerifyReferralDoctorRemarks(
{this.projectID,
this.admissionNo,
this.lineItemNo,
this.referredDoctorRemarks,
this.editedBy,
this.patientID,
this.referringDoctor,
this.languageID = LANGUAGE_ID,
this.stamp = STAMP,
this.iPAdress = IP_ADDRESS,
this.versionID = VERSION_ID,
this.channel= CHANNEL,
this.tokenID,
this.sessionID = SESSION_ID,
this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
this.patientOutSA = PATIENT_OUT_SA,
this.firstName,
this.middleName,
this.lastName,
this.patientMobileNumber,
this.patientIdentificationID,
});
VerifyReferralDoctorRemarks({
this.projectID,
this.admissionNo,
this.lineItemNo,
this.referredDoctorRemarks,
this.editedBy,
this.patientID,
this.referringDoctor,
this.languageID = LANGUAGE_ID,
this.stamp = STAMP,
this.iPAdress = IP_ADDRESS,
this.versionID = VERSION_ID,
this.channel = CHANNEL,
this.tokenID,
this.sessionID = SESSION_ID,
this.isLoginForDoctorApp = IS_LOGIN_FOR_DOCTOR_APP,
this.patientOutSA = PATIENT_OUT_SA,
this.firstName,
this.middleName,
this.lastName,
this.patientMobileNumber,
this.patientIdentificationID,
});
VerifyReferralDoctorRemarks.fromJson(Map<String, dynamic> json) {
VerifyReferralDoctorRemarks.fromJson(Map<String?, dynamic> json) {
projectID = json['ProjectID'];
admissionNo = json['AdmissionNo'];
lineItemNo = json['LineItemNo'];
@ -65,18 +65,15 @@ class VerifyReferralDoctorRemarks {
sessionID = json['SessionID'];
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA'];
firstName= json["FirstName"];
middleName= json["MiddleName"];
lastName= json["LastName"];
patientMobileNumber= json["PatientMobileNumber"];
patientIdentificationID = json["PatientIdentificationID"];
firstName = json["FirstName"];
middleName = json["MiddleName"];
lastName = json["LastName"];
patientMobileNumber = json["PatientMobileNumber"];
patientIdentificationID = json["PatientIdentificationID"];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['ProjectID'] = this.projectID;
data['AdmissionNo'] = this.admissionNo;
data['LineItemNo'] = this.lineItemNo;

@ -1,12 +1,11 @@
class EndCallReq {
int vCID;
String tokenID;
String generalid;
int doctorId;
bool isDestroy;
int? vCID;
String? tokenID;
String? generalid;
int? doctorId;
bool? isDestroy;
EndCallReq(
{this.vCID, this.tokenID, this.generalid, this.doctorId, this.isDestroy});
EndCallReq({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isDestroy});
EndCallReq.fromJson(Map<String, dynamic> json) {
vCID = json['VC_ID'];

@ -1,16 +1,11 @@
class LiveCarePendingListRequest {
PatientData patientData;
int doctorID;
String sErServiceID;
int projectID;
int sourceID;
LiveCarePendingListRequest(
{this.patientData,
this.doctorID,
this.sErServiceID,
this.projectID,
this.sourceID});
PatientData? patientData;
int? doctorID;
String? sErServiceID;
int? projectID;
int? sourceID;
LiveCarePendingListRequest({this.patientData, this.doctorID, this.sErServiceID, this.projectID, this.sourceID});
LiveCarePendingListRequest.fromJson(Map<String, dynamic> json) {
patientData = new PatientData.fromJson(json['PatientData']);
@ -23,7 +18,7 @@ class LiveCarePendingListRequest {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['PatientData'] = this.patientData.toJson();
data['PatientData'] = this.patientData!.toJson();
data['DoctorID'] = this.doctorID;
data['SErServiceID'] = this.sErServiceID;
data['ProjectID'] = this.projectID;
@ -33,9 +28,9 @@ class LiveCarePendingListRequest {
}
class PatientData {
bool isOutKSA;
bool? isOutKSA;
PatientData({this.isOutKSA});
PatientData({required this.isOutKSA});
PatientData.fromJson(Map<String, dynamic> json) {
isOutKSA = json['IsOutKSA'];

@ -1,90 +1,90 @@
class LiveCarePendingListResponse {
dynamic acceptedBy;
dynamic acceptedOn;
int age;
int? age;
dynamic appointmentNo;
String arrivalTime;
String arrivalTimeD;
int callStatus;
String clientRequestID;
String clinicName;
String? arrivalTime;
String? arrivalTimeD;
int? callStatus;
String? clientRequestID;
String? clinicName;
dynamic consoltationEnd;
dynamic consultationNotes;
dynamic createdOn;
String dateOfBirth;
String deviceToken;
String deviceType;
String? dateOfBirth;
String? deviceToken;
String? deviceType;
dynamic doctorName;
String editOn;
String gender;
bool isFollowUP;
String? editOn;
String? gender;
bool? isFollowUP;
dynamic isFromVida;
int isLoginB;
bool isOutKSA;
int isRejected;
String language;
double latitude;
double longitude;
String mobileNumber;
int? isLoginB;
bool? isOutKSA;
int? isRejected;
String? language;
double? latitude;
double? longitude;
String? mobileNumber;
dynamic openSession;
dynamic openTokenID;
String patientID;
String patientName;
int patientStatus;
String preferredLanguage;
int projectID;
double scoring;
int serviceID;
String? patientID;
String? patientName;
int? patientStatus;
String? preferredLanguage;
int? projectID;
double? scoring;
int? serviceID;
dynamic tokenID;
int vCID;
String voipToken;
int? vCID;
String? voipToken;
LiveCarePendingListResponse(
{this.acceptedBy,
this.acceptedOn,
this.age,
this.appointmentNo,
this.arrivalTime,
this.arrivalTimeD,
this.callStatus,
this.clientRequestID,
this.clinicName,
this.consoltationEnd,
this.consultationNotes,
this.createdOn,
this.dateOfBirth,
this.deviceToken,
this.deviceType,
this.doctorName,
this.editOn,
this.gender,
this.isFollowUP,
this.isFromVida,
this.isLoginB,
this.isOutKSA,
this.isRejected,
this.language,
this.latitude,
this.longitude,
this.mobileNumber,
this.openSession,
this.openTokenID,
this.patientID,
this.patientName,
this.patientStatus,
this.preferredLanguage,
this.projectID,
this.scoring,
this.serviceID,
this.tokenID,
this.vCID,
this.voipToken});
this.acceptedOn,
this.age,
this.appointmentNo,
this.arrivalTime,
this.arrivalTimeD,
this.callStatus,
this.clientRequestID,
this.clinicName,
this.consoltationEnd,
this.consultationNotes,
this.createdOn,
this.dateOfBirth,
this.deviceToken,
this.deviceType,
this.doctorName,
this.editOn,
this.gender,
this.isFollowUP,
this.isFromVida,
this.isLoginB,
this.isOutKSA,
this.isRejected,
this.language,
this.latitude,
this.longitude,
this.mobileNumber,
this.openSession,
this.openTokenID,
this.patientID,
this.patientName,
this.patientStatus,
this.preferredLanguage,
this.projectID,
this.scoring,
this.serviceID,
this.tokenID,
this.vCID,
this.voipToken});
LiveCarePendingListResponse.fromJson(Map<String, dynamic> json) {
LiveCarePendingListResponse.fromJson(Map<String?, dynamic> json) {
acceptedBy = json['AcceptedBy'];
acceptedOn = json['AcceptedOn'];
age = json['Age'];
appointmentNo = json['AppointmentNo'];
appointmentNo = json['Appoint?mentNo'];
arrivalTime = json['ArrivalTime'];
arrivalTimeD = json['ArrivalTimeD'];
callStatus = json['CallStatus'];
@ -122,12 +122,12 @@ class LiveCarePendingListResponse {
voipToken = json['VoipToken'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['AcceptedBy'] = this.acceptedBy;
data['AcceptedOn'] = this.acceptedOn;
data['Age'] = this.age;
data['AppointmentNo'] = this.appointmentNo;
data['Appoint?mentNo'] = this.appointmentNo;
data['ArrivalTime'] = this.arrivalTime;
data['ArrivalTimeD'] = this.arrivalTimeD;
data['CallStatus'] = this.callStatus;

@ -1,14 +1,10 @@
class SessionStatusModel {
bool isAuthenticated;
int messageStatus;
String result;
int sessionStatus;
bool? isAuthenticated;
int? messageStatus;
String? result;
int? sessionStatus;
SessionStatusModel(
{this.isAuthenticated,
this.messageStatus,
this.result,
this.sessionStatus});
SessionStatusModel({this.isAuthenticated, this.messageStatus, this.result, this.sessionStatus});
SessionStatusModel.fromJson(Map<dynamic, dynamic> json) {
isAuthenticated = json['IsAuthenticated'];

@ -1,15 +1,15 @@
class StartCallReq {
String clincName;
int clinicId;
String docSpec;
String docotrName;
int doctorId;
String generalid;
bool isOutKsa;
bool isrecall;
String projectName;
String tokenID;
int vCID;
String ?clincName;
int ?clinicId;
String ?docSpec;
String? docotrName;
int ?doctorId;
String? generalid;
bool? isOutKsa;
bool ? isrecall;
String? projectName;
String ?tokenID;
int ?vCID;
StartCallReq(
{this.clincName,

@ -1,21 +1,21 @@
class StartCallRes {
String result;
String openSessionID;
String openTokenID;
bool isAuthenticated;
int messageStatus;
String appointmentNo;
bool isRecording;
String? result;
String? openSessionID;
String? openTokenID;
bool? isAuthenticated;
int? messageStatus;
String? appointmentNo;
bool? isRecording;
StartCallRes(
{this.result,
this.openSessionID,
this.openTokenID,
this.isAuthenticated,
this.appointmentNo,
this.messageStatus,
this.isRecording = true,
});
StartCallRes({
this.result,
this.openSessionID,
this.openTokenID,
this.isAuthenticated,
this.appointmentNo,
this.messageStatus,
this.isRecording = true,
});
StartCallRes.fromJson(Map<String, dynamic> json) {
result = json['Result'];

@ -1,18 +1,12 @@
class TransferToAdminReq {
int vCID;
String tokenID;
String generalid;
int doctorId;
bool isOutKsa;
String notes;
int? vCID;
String? tokenID;
String? generalid;
int? doctorId;
bool? isOutKsa;
String? notes;
TransferToAdminReq(
{this.vCID,
this.tokenID,
this.generalid,
this.doctorId,
this.isOutKsa,
this.notes});
TransferToAdminReq({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.notes});
TransferToAdminReq.fromJson(Map<String, dynamic> json) {
vCID = json['VC_ID'];

@ -1,28 +1,28 @@
class CreateUpdateOperationReportRequestModel {
String setupID;
int patientID;
int reservationNo;
int admissionNo;
String preOpDiagmosis;
String postOpDiagmosis;
String surgeon;
String assistant;
String anasthetist;
String operation;
String inasion;
String finding;
String surgeryProcedure;
String postOpInstruction;
int createdBy;
int editedBy;
String complicationDetails;
String bloodLossDetail;
String histopathSpecimen;
String microbiologySpecimen;
String otherSpecimen;
String scrubNurse;
String circulatingNurse;
String bloodTransfusedDetail;
String? setupID;
int? patientID;
int? reservationNo;
int? admissionNo;
String? preOpDiagmosis;
String? postOpDiagmosis;
String? surgeon;
String? assistant;
String? anasthetist;
String? operation;
String? inasion;
String? finding;
String? surgeryProcedure;
String? postOpInstruction;
int? createdBy;
int? editedBy;
String? complicationDetails;
String? bloodLossDetail;
String? histopathSpecimen;
String? microbiologySpecimen;
String? otherSpecimen;
String? scrubNurse;
String? circulatingNurse;
String? bloodTransfusedDetail;
CreateUpdateOperationReportRequestModel(
{this.setupID,

@ -1,34 +1,34 @@
class GetOperationDetailsRequestModel {
bool isDentalAllowedBackend;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int deviceTypeID;
String tokenID;
int patientID;
int reservationNo;
String sessionID;
int projectID;
String setupID;
bool patientOutSA;
bool? isDentalAllowedBackend;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? deviceTypeID;
String? tokenID;
int? patientID;
int? reservationNo;
String? sessionID;
int? projectID;
String? setupID;
bool? patientOutSA;
GetOperationDetailsRequestModel(
{this.isDentalAllowedBackend = false,
this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.deviceTypeID,
this.tokenID,
this.patientID,
this.reservationNo,
this.sessionID,
this.projectID,
this.setupID,
this.patientOutSA});
this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.deviceTypeID,
this.tokenID,
this.patientID,
this.reservationNo,
this.sessionID,
this.projectID,
this.setupID,
this.patientOutSA});
GetOperationDetailsRequestModel.fromJson(Map<String, dynamic> json) {
isDentalAllowedBackend = json['isDentalAllowedBackend'];

@ -1,35 +1,35 @@
class GetOperationDetailsResponseModel {
String setupID;
int projectID;
int reservationNo;
int patientID;
int admissionID;
String? setupID;
int? projectID;
int? reservationNo;
int? patientID;
int? admissionID;
dynamic surgeryDate;
String preOpDiagnosis;
String postOpDiagnosis;
String surgeon;
String assistant;
String anasthetist;
String operation;
String inasion;
String finding;
String surgeryProcedure;
String postOpInstruction;
bool isActive;
int createdBy;
String createdName;
String? preOpDiagnosis;
String? postOpDiagnosis;
String? surgeon;
String? assistant;
String? anasthetist;
String? operation;
String? inasion;
String? finding;
String? surgeryProcedure;
String? postOpInstruction;
bool? isActive;
int? createdBy;
String? createdName;
dynamic createdNameN;
String createdOn;
String? createdOn;
dynamic editedBy;
dynamic editedByName;
dynamic editedByNameN;
dynamic editedOn;
dynamic oRBookStatus;
String complicationDetail;
String bloodLossDetail;
String histopathSpecimen;
String microbiologySpecimen;
String otherSpecimen;
String? complicationDetail;
String? bloodLossDetail;
String? histopathSpecimen;
String? microbiologySpecimen;
String? otherSpecimen;
dynamic scrubNurse;
dynamic circulatingNurse;
dynamic bloodTransfusedDetail;

@ -1,17 +1,17 @@
class GetReservationsRequestModel {
int patientID;
int projectID;
String doctorID;
int clinicID;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
bool patientOutSA;
int deviceTypeID;
String tokenID;
String sessionID;
int? patientID;
int? projectID;
String? doctorID;
int? clinicID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
bool? patientOutSA;
int? deviceTypeID;
String? tokenID;
String? sessionID;
GetReservationsRequestModel(
{this.patientID,

@ -1,38 +1,38 @@
class GetReservationsResponseModel {
String setupID;
int projectID;
int oTReservationID;
String oTReservationDate;
String oTReservationDateN;
int oTID;
int admissionRequestNo;
int admissionNo;
int primaryDoctorID;
int patientType;
int patientID;
int patientStatusType;
int clinicID;
int doctorID;
String operationDate;
int operationType;
String endDate;
String timeStart;
String timeEnd;
String? setupID;
int? projectID;
int? oTReservationID;
String? oTReservationDate;
String? oTReservationDateN;
int? oTID;
int? admissionRequestNo;
int? admissionNo;
int? primaryDoctorID;
int? patientType;
int? patientID;
int? patientStatusType;
int? clinicID;
int? doctorID;
String? operationDate;
int? operationType;
String? endDate;
String? timeStart;
String? timeEnd;
dynamic remarks;
int status;
int createdBy;
String createdOn;
int editedBy;
String editedOn;
String patientName;
int? status;
int? createdBy;
String? createdOn;
int? editedBy;
String? editedOn;
String? patientName;
Null patientNameN;
Null gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
String doctorName;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? doctorName;
Null doctorNameN;
String clinicDescription;
String? clinicDescription;
Null clinicDescriptionN;
GetReservationsResponseModel(

@ -1,30 +1,30 @@
class MedicalReportTemplate {
String setupID;
int projectID;
int templateID;
String procedureID;
int reportType;
String templateName;
String templateNameN;
String templateText;
String templateTextN;
bool isActive;
String templateTextHtml;
String templateTextNHtml;
String? setupID;
int? projectID;
int? templateID;
String? procedureID;
int? reportType;
String? templateName;
String? templateNameN;
String? templateText;
String? templateTextN;
bool? isActive;
String? templateTextHtml;
String? templateTextNHtml;
MedicalReportTemplate(
{this.setupID,
this.projectID,
this.templateID,
this.procedureID,
this.reportType,
this.templateName,
this.templateNameN,
this.templateText,
this.templateTextN,
this.isActive,
this.templateTextHtml,
this.templateTextNHtml});
this.projectID,
this.templateID,
this.procedureID,
this.reportType,
this.templateName,
this.templateNameN,
this.templateText,
this.templateTextN,
this.isActive,
this.templateTextHtml,
this.templateTextNHtml});
MedicalReportTemplate.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];
@ -41,8 +41,8 @@ class MedicalReportTemplate {
templateTextNHtml = json['TemplateTextNHtml'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['TemplateID'] = this.templateID;

@ -1,30 +1,30 @@
class MedicalReportModel {
String reportData;
String setupID;
int projectID;
String projectName;
String projectNameN;
int patientID;
String invoiceNo;
int status;
String verifiedOn;
String? reportData;
String? setupID;
int? projectID;
String? projectName;
String? projectNameN;
int? patientID;
String? invoiceNo;
int? status;
String? verifiedOn;
dynamic verifiedBy;
String editedOn;
int editedBy;
int lineItemNo;
String createdOn;
int templateID;
int doctorID;
int doctorGender;
String doctorGenderDescription;
String doctorGenderDescriptionN;
String doctorImageURL;
String doctorName;
String doctorNameN;
int clinicID;
String clinicName;
String clinicNameN;
String reportDataHtml;
String? editedOn;
int? editedBy;
int? lineItemNo;
String? createdOn;
int? templateID;
int? doctorID;
int? doctorGender;
String? doctorGenderDescription;
String? doctorGenderDescriptionN;
String? doctorImageURL;
String? doctorName;
String? doctorNameN;
int? clinicID;
String? clinicName;
String? clinicNameN;
String? reportDataHtml;
MedicalReportModel(
{this.reportData,

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

@ -1,6 +1,5 @@
class ClinicByProjectIdRequest {
/*
/*
*@author: Ibrahim Albitar
*@Date:03/06/2020
*@param:
@ -8,17 +7,17 @@ class ClinicByProjectIdRequest {
*@desc: ClinicByProjectIdRequest
*/
int projectID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? projectID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
/*
{
"ProjectID": 21,

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

@ -1,6 +1,5 @@
class STPReferralFrequencyRequest {
/*
/*
*@author: Ibrahim Albitar
*@Date:03/06/2020
*@param:
@ -8,16 +7,16 @@ class STPReferralFrequencyRequest {
*@desc:
*/
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
/*
{
"LanguageID": 2,

@ -7,9 +7,10 @@
*/
import 'dart:convert';
ListPendingPatientListModel listPendingPatientListModelFromJson(String str) => ListPendingPatientListModel.fromJson(json.decode(str));
ListPendingPatientListModel listPendingPatientListModelFromJson(String? str) =>
ListPendingPatientListModel.fromJson(json.decode(str!));
String listPendingPatientListModelToJson(ListPendingPatientListModel data) => json.encode(data.toJson());
String? listPendingPatientListModelToJson(ListPendingPatientListModel data) => json.encode(data.toJson());
class ListPendingPatientListModel {
ListPendingPatientListModel({
@ -56,45 +57,45 @@ class ListPendingPatientListModel {
dynamic acceptedBy;
dynamic acceptedOn;
int age;
int? age;
dynamic appointmentNo;
String arrivalTime;
String arrivalTimeD;
int callStatus;
String clientRequestId;
String clinicName;
String? arrivalTime;
String? arrivalTimeD;
int? callStatus;
String? clientRequestId;
String? clinicName;
dynamic consoltationEnd;
dynamic consultationNotes;
dynamic createdOn;
DateTime dateOfBirth;
String deviceToken;
String deviceType;
DateTime? dateOfBirth;
String? deviceToken;
String? deviceType;
dynamic doctorName;
String editOn;
String gender;
bool isFollowUp;
String? editOn;
String? gender;
bool? isFollowUp;
dynamic isFromVida;
int isLoginB;
bool isOutKsa;
int isRejected;
String language;
double latitude;
double longitude;
String mobileNumber;
int? isLoginB;
bool? isOutKsa;
int? isRejected;
String? language;
double? latitude;
double? longitude;
String? mobileNumber;
dynamic openSession;
dynamic openTokenId;
String patientId;
String patientName;
int patientStatus;
String preferredLanguage;
int projectId;
int scoring;
int serviceId;
String? patientId;
String? patientName;
int? patientStatus;
String? preferredLanguage;
int? projectId;
int? scoring;
int? serviceId;
dynamic tokenId;
int vcId;
String voipToken;
int? vcId;
String? voipToken;
factory ListPendingPatientListModel.fromJson(Map<String, dynamic> json) => ListPendingPatientListModel(
factory ListPendingPatientListModel.fromJson(Map<String?, dynamic> json) => ListPendingPatientListModel(
acceptedBy: json["AcceptedBy"],
acceptedOn: json["AcceptedOn"],
age: json["Age"],
@ -136,7 +137,7 @@ class ListPendingPatientListModel {
voipToken: json["VoipToken"],
);
Map<String, dynamic> toJson() => {
Map<String?, dynamic> toJson() => {
"AcceptedBy": acceptedBy,
"AcceptedOn": acceptedOn,
"Age": age,
@ -149,7 +150,8 @@ class ListPendingPatientListModel {
"ConsoltationEnd": consoltationEnd,
"ConsultationNotes": consultationNotes,
"CreatedOn": createdOn,
"DateOfBirth": "${dateOfBirth.year.toString().padLeft(4, '0')}-${dateOfBirth.month.toString().padLeft(2, '0')}-${dateOfBirth.day.toString().padLeft(2, '0')}",
"DateOfBirth":
"${dateOfBirth!.year.toString().padLeft(4, '0')}-${dateOfBirth!.month.toString().padLeft(2, '0')}-${dateOfBirth!.day.toString().padLeft(2, '0')}",
"DeviceToken": deviceToken,
"DeviceType": deviceType,
"DoctorName": doctorName,

@ -21,19 +21,19 @@
*@desc:
*/
class InsuranceAprovalsRequest {
int exuldAppNO;
int patientID;
int channel;
int projectID;
int languageID;
String stamp;
String ipAdress;
double versionID;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? exuldAppNO;
int? patientID;
int? channel;
int? projectID;
int? languageID;
String? stamp;
String? ipAdress;
double? versionID;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
InsuranceAprovalsRequest(
{

@ -1,24 +1,23 @@
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
/*
*@author: Elham Rababah
*@Date:6/5/2020
*@param:
*@return:LabOrdersReqModel
*@desc: LabOrdersReqModel class
*/
class LabOrdersReqModel {
int patientID;
int patientTypeID;
int projectID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? patientID;
int? patientTypeID;
int? projectID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
LabOrdersReqModel(
{this.patientID,

@ -3,27 +3,27 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class LabOrdersResModel {
String setupID;
int projectID;
int patientID;
int patientType;
int orderNo;
String orderDate;
int invoiceTransactionType;
int invoiceNo;
int clinicId;
int doctorId;
int status;
String createdBy;
Null createdByN;
DateTime createdOn;
String editedBy;
Null editedByN;
String editedOn;
String clinicName;
String doctorImageURL;
String doctorName;
String projectName;
String? setupID;
int? projectID;
int? patientID;
int? patientType;
int? orderNo;
String? orderDate;
int? invoiceTransactionType;
int? invoiceNo;
int? clinicId;
int? doctorId;
int? status;
String? createdBy;
dynamic createdByN;
DateTime? createdOn;
String? editedBy;
dynamic editedByN;
String? editedOn;
String? clinicName;
String? doctorImageURL;
String? doctorName;
String? projectName;
LabOrdersResModel(
{this.setupID,

@ -1,64 +1,64 @@
class LabResult {
String setupID;
int projectID;
int orderNo;
int lineItemNo;
int packageID;
int testID;
String description;
String resultValue;
String referenceRange;
Null convertedResultValue;
Null convertedReferenceRange;
Null resultValueFlag;
int status;
String createdBy;
Null createdByN;
String createdOn;
String editedBy;
Null editedByN;
String editedOn;
String verifiedBy;
Null verifiedByN;
String verifiedOn;
String? setupID;
int? projectID;
int? orderNo;
int? lineItemNo;
int? packageID;
int? testID;
String? description;
String? resultValue;
String? referenceRange;
dynamic convertedResultValue;
dynamic convertedReferenceRange;
dynamic resultValueFlag;
int? status;
String? createdBy;
dynamic createdByN;
String? createdOn;
String? editedBy;
dynamic editedByN;
String? editedOn;
String? verifiedBy;
dynamic verifiedByN;
String? verifiedOn;
Null patientID;
int gender;
Null maleInterpretativeData;
Null femaleInterpretativeData;
String testCode;
String statusDescription;
int? gender;
dynamic maleinterpretativeData;
dynamic femaleinterpretativeData;
String? testCode;
String? statusDescription;
LabResult(
{this.setupID,
this.projectID,
this.orderNo,
this.lineItemNo,
this.packageID,
this.testID,
this.description,
this.resultValue,
this.referenceRange,
this.convertedResultValue,
this.convertedReferenceRange,
this.resultValueFlag,
this.status,
this.createdBy,
this.createdByN,
this.createdOn,
this.editedBy,
this.editedByN,
this.editedOn,
this.verifiedBy,
this.verifiedByN,
this.verifiedOn,
this.patientID,
this.gender,
this.maleInterpretativeData,
this.femaleInterpretativeData,
this.testCode,
this.statusDescription});
this.projectID,
this.orderNo,
this.lineItemNo,
this.packageID,
this.testID,
this.description,
this.resultValue,
this.referenceRange,
this.convertedResultValue,
this.convertedReferenceRange,
this.resultValueFlag,
this.status,
this.createdBy,
this.createdByN,
this.createdOn,
this.editedBy,
this.editedByN,
this.editedOn,
this.verifiedBy,
this.verifiedByN,
this.verifiedOn,
this.patientID,
this.gender,
this.maleinterpretativeData,
this.femaleinterpretativeData,
this.testCode,
this.statusDescription});
LabResult.fromJson(Map<String, dynamic> json) {
LabResult.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
orderNo = json['OrderNo'];
@ -83,14 +83,14 @@ class LabResult {
verifiedOn = json['VerifiedOn'];
patientID = json['PatientID'];
gender = json['Gender'];
maleInterpretativeData = json['MaleInterpretativeData'];
femaleInterpretativeData = json['FemaleInterpretativeData'];
maleinterpretativeData = json['Maleint?erpretativeData'];
femaleinterpretativeData = json['Femaleint?erpretativeData'];
testCode = json['TestCode'];
statusDescription = json['StatusDescription'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['OrderNo'] = this.orderNo;
@ -115,8 +115,8 @@ class LabResult {
data['VerifiedOn'] = this.verifiedOn;
data['PatientID'] = this.patientID;
data['Gender'] = this.gender;
data['MaleInterpretativeData'] = this.maleInterpretativeData;
data['FemaleInterpretativeData'] = this.femaleInterpretativeData;
data['Maleint?erpretativeData'] = this.maleinterpretativeData;
data['Femaleint?erpretativeData'] = this.femaleinterpretativeData;
data['TestCode'] = this.testCode;
data['StatusDescription'] = this.statusDescription;
return data;

@ -1,36 +1,36 @@
class RequestLabResult {
int projectID;
String setupID;
int orderNo;
int invoiceNo;
int patientTypeID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? projectID;
String? setupID;
int? orderNo;
int? invoiceNo;
int? patientTypeID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
RequestLabResult(
{this.projectID,
this.setupID,
this.orderNo,
this.invoiceNo,
this.patientTypeID,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA});
this.setupID,
this.orderNo,
this.invoiceNo,
this.patientTypeID,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA});
RequestLabResult.fromJson(Map<String, dynamic> json) {
RequestLabResult.fromJson(Map<String?, dynamic> json) {
projectID = json['ProjectID'];
setupID = json['SetupID'];
orderNo = json['OrderNo'];

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save