reverting manully step 2

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

@ -1,116 +1,218 @@
class RequestSendRadReportEmail { import 'package:doctor_app_flutter/util/date-utils.dart';
int? channel;
String? clinicName; class DischargeReferralPatient {
String? dateofBirth; dynamic rowID;
int? deviceTypeID; int? projectID;
String? doctorName; int? lineItemNo;
String? generalid; int? doctorID;
int? invoiceNo;
String? iPAdress;
bool ?isDentalAllowedBackend;
int? languageID;
String? orderDate;
int? patientID; int? patientID;
String? patientIditificationNum; String? doctorName;
String? patientMobileNumber; dynamic doctorNameN;
String? patientName; String? firstName;
int? patientOutSA; String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType; int? patientType;
int? patientTypeID; String? admissionNo;
int? projectID; String? admissionDate;
String? projectName; String? roomID;
String? radResult; String? bedID;
String? sessionID; dynamic nursingStationID;
String? setupID; dynamic description;
String? to; String? nationalityName;
String? tokenID; dynamic nationalityNameN;
double? versionID; 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( DischargeReferralPatient(
{this.channel, {this.rowID,
this.clinicName, this.projectID,
this.dateofBirth, this.lineItemNo,
this.deviceTypeID, this.doctorID,
this.doctorName,
this.generalid,
this.invoiceNo,
this.iPAdress,
this.isDentalAllowedBackend,
this.languageID,
this.orderDate,
this.patientID, this.patientID,
this.patientIditificationNum, this.doctorName,
this.patientMobileNumber, this.doctorNameN,
this.patientName, this.firstName,
this.patientOutSA, this.middleName,
this.lastName,
this.firstNameN,
this.middleNameN,
this.lastNameN,
this.gender,
this.dateofBirth,
this.mobileNumber,
this.emailAddress,
this.patientIdentificationNo,
this.patientType, this.patientType,
this.patientTypeID, this.admissionNo,
this.projectID, this.admissionDate,
this.projectName, this.roomID,
this.radResult, this.bedID,
this.sessionID, this.nursingStationID,
this.setupID, this.description,
this.to, this.nationalityName,
this.tokenID, this.nationalityNameN,
this.versionID}); 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) { DischargeReferralPatient.fromJson(Map<String?, dynamic> json) {
channel = json['Channel']; rowID = json['RowID'];
clinicName = json['ClinicName']; projectID = json['ProjectID'];
dateofBirth = json['DateofBirth']; lineItemNo = json['LineItemNo'];
deviceTypeID = json['DeviceTypeID']; doctorID = json['DoctorID'];
doctorName = json['DoctorName'];
generalid = json['generalid'];
invoiceNo = json['InvoiceNo'];
iPAdress = json['IPAdress'];
isDentalAllowedBackend = json['isDentalAllowedBackend'];
languageID = json['LanguageID'];
orderDate = json['OrderDate'];
patientID = json['PatientID']; patientID = json['PatientID'];
patientIditificationNum = json['PatientIditificationNum']; doctorName = json['DoctorName'];
patientMobileNumber = json['PatientMobileNumber']; doctorNameN = json['DoctorNameN'];
patientName = json['PatientName']; firstName = json['FirstName'];
patientOutSA = json['PatientOutSA']; 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']; patientType = json['PatientType'];
patientTypeID = json['PatientTypeID']; admissionNo = json['AdmissionNo'];
projectID = json['ProjectID']; admissionDate = json['AdmissionDate'];
projectName = json['ProjectName']; roomID = json['RoomID'];
radResult = json['RadResult']; bedID = json['BedID'];
sessionID = json['SessionID']; nursingStationID = json['NursingStationID'];
setupID = json['SetupID']; description = json['Description'];
to = json['To']; nationalityName = json['NationalityName'];
tokenID = json['TokenID']; nationalityNameN = json['NationalityNameN'];
versionID = json['VersionID']; 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() { Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>(); final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Channel'] = this.channel; data['RowID'] = this.rowID;
data['ClinicName'] = this.clinicName; data['ProjectID'] = this.projectID;
data['DateofBirth'] = this.dateofBirth; data['LineItemNo'] = this.lineItemNo;
data['DeviceTypeID'] = this.deviceTypeID; data['DoctorID'] = this.doctorID;
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['PatientID'] = this.patientID; data['PatientID'] = this.patientID;
data['PatientIditificationNum'] = this.patientIditificationNum; data['DoctorName'] = this.doctorName;
data['PatientMobileNumber'] = this.patientMobileNumber; data['DoctorNameN'] = this.doctorNameN;
data['PatientName'] = this.patientName; data['FirstName'] = this.firstName;
data['PatientOutSA'] = this.patientOutSA; 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['PatientType'] = this.patientType;
data['PatientTypeID'] = this.patientTypeID; data['AdmissionNo'] = this.admissionNo;
data['ProjectID'] = this.projectID; data['AdmissionDate'] = this.admissionDate;
data['ProjectName'] = this.projectName; data['RoomID'] = this.roomID;
data['RadResult'] = this.radResult; data['BedID'] = this.bedID;
data['SessionID'] = this.sessionID; data['NursingStationID'] = this.nursingStationID;
data['SetupID'] = this.setupID; data['Description'] = this.description;
data['To'] = this.to; data['NationalityName'] = this.nationalityName;
data['TokenID'] = this.tokenID; data['NationalityNameN'] = this.nationalityNameN;
data['VersionID'] = this.versionID; 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; return data;
} }
} }

@ -6,7 +6,7 @@ class AnalyticsService {
FirebaseAnalyticsObserver getAnalyticsObserver() => FirebaseAnalyticsObserver(analytics: _analytics); 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: { await _analytics.logEvent(name: 'event', parameters: {
"eventCategory": eventCategory, "eventCategory": eventCategory,
"eventAction": eventAction, "eventAction": eventAction,

@ -3,24 +3,24 @@ import 'package:flutter/material.dart';
class NavigationService { class NavigationService {
final GlobalKey<NavigatorState> navigatorKey = final GlobalKey<NavigatorState> navigatorKey =
new GlobalKey<NavigatorState>(); new GlobalKey<NavigatorState>();
Future<dynamic> navigateTo(String routeName,{Object arguments}) { Future<dynamic> navigateTo(String routeName,{required Object arguments}) {
return navigatorKey.currentState.pushNamed(routeName,arguments: arguments); return navigatorKey.currentState!.pushNamed(routeName,arguments: arguments);
} }
Future<dynamic> pushReplacementNamed(String routeName,{Object arguments}) { Future<dynamic> pushReplacementNamed(String routeName,{required Object arguments}) {
return navigatorKey.currentState.pushReplacementNamed(routeName,arguments: arguments); return navigatorKey.currentState!.pushReplacementNamed(routeName,arguments: arguments);
} }
Future<dynamic> pushNamedAndRemoveUntil(String routeName) { Future<dynamic> pushNamedAndRemoveUntil(String routeName) {
return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false); return navigatorKey.currentState!.pushNamedAndRemoveUntil(routeName,(asd)=>false);
} }
Future<dynamic> pushAndRemoveUntil(Route newRoute) { Future<dynamic> pushAndRemoveUntil(Route newRoute) {
return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false); return navigatorKey.currentState!.pushAndRemoveUntil(newRoute,(asd)=>false);
} }
pop() { 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'; import 'package:doctor_app_flutter/core/viewModel/PatientRegistrationViewModel.dart';
class PatientRegistrationService extends BaseService { class PatientRegistrationService extends BaseService {
GetPatientInfoResponseModel getPatientInfoResponseModel; late GetPatientInfoResponseModel getPatientInfoResponseModel;
String logInTokenID; late String logInTokenID;
checkPatientForRegistration( checkPatientForRegistration(
CheckPatientForRegistrationModel registrationModel) async { CheckPatientForRegistrationModel registrationModel) async {
@ -39,13 +39,12 @@ class PatientRegistrationService extends BaseService {
} }
sendActivationCodeByOTPNotificationType( sendActivationCodeByOTPNotificationType(
{SendActivationCodeByOTPNotificationTypeForRegistrationModel {
registrationModel, required int otpType,
int otpType, required PatientRegistrationViewModel model,
PatientRegistrationViewModel model, required CheckPatientForRegistrationModel
CheckPatientForRegistrationModel
checkPatientForRegistrationModel}) async { checkPatientForRegistrationModel}) async {
registrationModel = SendActivationCodeByOTPNotificationTypeForRegistrationModel registrationModel =
SendActivationCodeByOTPNotificationTypeForRegistrationModel( SendActivationCodeByOTPNotificationTypeForRegistrationModel(
oTPSendType: otpType, oTPSendType: otpType,
patientIdentificationID: checkPatientForRegistrationModel patientIdentificationID: checkPatientForRegistrationModel

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

@ -49,7 +49,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"}); }, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -66,9 +66,8 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson()); }, body: userInfo.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async { Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async {
@ -84,7 +83,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson()); }, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -102,7 +101,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson()); }, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -119,7 +118,7 @@ class AuthenticationService extends BaseService {
}, body: checkActivationCodeRequestModel.toJson()); }, body: checkActivationCodeRequestModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -139,7 +138,7 @@ class AuthenticationService extends BaseService {
}, body: insertIMEIDetailsModel.toJson()); }, body: insertIMEIDetailsModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -158,7 +157,7 @@ class AuthenticationService extends BaseService {
}, body: profileReqModel.toJson()); }, body: profileReqModel.toJson());
} catch (error) { } catch (error) {
hasError = true; 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'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService { class BaseService {
String error=''; String ?error;
bool hasError = false; bool hasError = false;
BaseAppClient baseAppClient = BaseAppClient(); BaseAppClient baseAppClient = BaseAppClient();
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -9,14 +9,14 @@ class RadiologyService extends BaseService {
List<FinalRadiology> finalRadiologyList = []; List<FinalRadiology> finalRadiologyList = [];
String url = ''; 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; hasError = false;
final Map<String, dynamic> body = new Map<String, dynamic>(); final Map<String, dynamic> body = new Map<String, dynamic>();
body['InvoiceNo'] = invoiceNo; body['InvoiceNo'] = invoiceNo;
body['LineItemNo'] = lineItem; body['LineItemNo'] = lineItem;
body['ProjectID'] = projectId; 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']; url = response['Data'];
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

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

@ -34,7 +34,7 @@ class SOAPService extends LookupService {
List<GetPatientProgressNoteResModel> patientProgressNoteList = []; List<GetPatientProgressNoteResModel> patientProgressNoteList = [];
List<GetAssessmentResModel> patientAssessmentList = []; List<GetAssessmentResModel> patientAssessmentList = [];
int episodeID; int? episodeID;
Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
await baseAppClient.post( await baseAppClient.post(
GET_ALLERGIES, GET_ALLERGIES,
@ -80,12 +80,11 @@ class SOAPService extends LookupService {
Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async { Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async {
hasError = false; hasError = false;
await baseAppClient.post(POST_ALLERGY, await baseAppClient.post(POST_ALLERGY, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = super.error+ "\n"+error; super.error = super.error!+ "\n"+error;
}, body: postAllergyRequestModel.toJson()); }, body: postAllergyRequestModel.toJson());
} }
@ -97,12 +96,11 @@ class SOAPService extends LookupService {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error =super.error + "\n"+error; super.error =super.error! + "\n"+error;
}, body: postHistoriesRequestModel.toJson()); }, body: postHistoriesRequestModel.toJson());
} }
Future postChiefComplaint( Future postChiefComplaint(PostChiefComplaintRequestModel postChiefComplaintRequestModel) async {
PostChiefComplaintRequestModel postChiefComplaintRequestModel) async {
hasError = false; hasError = false;
super.error =""; super.error ="";
await baseAppClient.post(POST_CHIEF_COMPLAINT, await baseAppClient.post(POST_CHIEF_COMPLAINT,
@ -114,8 +112,7 @@ class SOAPService extends LookupService {
}, body: postChiefComplaintRequestModel.toJson()); }, body: postChiefComplaintRequestModel.toJson());
} }
Future postPhysicalExam( Future postPhysicalExam(PostPhysicalExamRequestModel postPhysicalExamRequestModel) async {
PostPhysicalExamRequestModel postPhysicalExamRequestModel) async {
hasError = false; hasError = false;
await baseAppClient.post(POST_PHYSICAL_EXAM, await baseAppClient.post(POST_PHYSICAL_EXAM,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
@ -170,7 +167,7 @@ class SOAPService extends LookupService {
print("Success"); print("Success");
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = super.error +"\n"+error; super.error = super.error!+"\n"+error;
}, body: patchHistoriesRequestModel.toJson()); }, 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'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
class UcafService extends LookupService { class UcafService extends LookupService {
List<GetChiefComplaintResModel> patientChiefComplaintList; late List<GetChiefComplaintResModel> patientChiefComplaintList;
List<VitalSignHistory> patientVitalSignsHistory; late List<VitalSignHistory> patientVitalSignsHistory;
List<GetAssessmentResModel> patientAssessmentList = []; List<GetAssessmentResModel> patientAssessmentList = [];
List<OrderProcedure> orderProcedureList = []; List<OrderProcedure> orderProcedureList = [];
PrescriptionModel prescriptionList; PrescriptionModel? prescriptionList;
Future getPatientChiefComplaint(PatiantInformtion patient) async { Future getPatientChiefComplaint(PatiantInformtion patient) async {
hasError = false; hasError = false;
@ -22,14 +22,13 @@ class UcafService extends LookupService {
body['EpisodeID'] = patient.episodeNo; body['EpisodeID'] = patient.episodeNo;
body['DoctorID'] = ""; body['DoctorID'] = "";
patientChiefComplaintList = null; patientChiefComplaintList = [];
await baseAppClient.post(GET_CHIEF_COMPLAINT, await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
print("Success"); print("Success");
if (patientChiefComplaintList != null) { if (patientChiefComplaintList != null) {
patientChiefComplaintList.clear(); patientChiefComplaintList.clear();
} else { } else {
patientChiefComplaintList = new []; patientChiefComplaintList = [];
} }
response['List_ChiefComplaint']['entityList'].forEach((v) { response['List_ChiefComplaint']['entityList'].forEach((v) {
patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v));
@ -52,14 +51,14 @@ class UcafService extends LookupService {
body['InOutPatientType'] = 2; body['InOutPatientType'] = 2;
} }
patientVitalSignsHistory = null; patientVitalSignsHistory = [];
await baseAppClient.post( await baseAppClient.post(
GET_PATIENT_VITAL_SIGN, GET_PATIENT_VITAL_SIGN,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) { if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear(); patientVitalSignsHistory.clear();
} else { } else {
patientVitalSignsHistory = new []; patientVitalSignsHistory = [];
} }
if (response['List_DoctorPatientVitalSign'] != null) { if (response['List_DoctorPatientVitalSign'] != null) {
response['List_DoctorPatientVitalSign'].forEach((v) { response['List_DoctorPatientVitalSign'].forEach((v) {
@ -89,14 +88,14 @@ class UcafService extends LookupService {
body['From'] = fromDate; body['From'] = fromDate;
body['To'] = toDate; body['To'] = toDate;
patientVitalSignsHistory = null; patientVitalSignsHistory = [];
await baseAppClient.post( await baseAppClient.post(
GET_PATIENT_VITAL_SIGN_DATA, GET_PATIENT_VITAL_SIGN_DATA,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
if (patientVitalSignsHistory != null) { if (patientVitalSignsHistory != null) {
patientVitalSignsHistory.clear(); patientVitalSignsHistory.clear();
} else { } else {
patientVitalSignsHistory = new []; patientVitalSignsHistory = [];
} }
if (response['VitalSignsHistory'] != null) { if (response['VitalSignsHistory'] != null) {
response['VitalSignsHistory'].forEach((v) { 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'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart';
class VitalSignsService extends BaseService { class VitalSignsService extends BaseService {
VitalSignData patientVitalSigns; VitalSignData? patientVitalSigns;
List<VitalSignHistory> patientVitalSignsHistory = []; List<VitalSignHistory> patientVitalSignsHistory = [];
Future getPatientVitalSign(PatiantInformtion patient) async { Future getPatientVitalSign(PatiantInformtion patient) async {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save