Merge branch 'flutter_vervion_2_elham' into 'flutter_2_developemt'

Flutter vervion 2 elham

See merge request Cloud_Solution/doctor_app_flutter!748
merge-requests/752/merge
Mohammad Aljammal 5 years ago
commit eb2b614f74

@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.2'
}

@ -1,6 +1,6 @@
#Fri Jun 23 08:50:38 CEST 2017
#Sun Jun 13 08:51:58 EEST 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

@ -0,0 +1 @@
include ':app'

@ -260,9 +260,78 @@
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
"${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
"${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
"${BUILT_PRODUCTS_DIR}/Try/Try.framework",
"${BUILT_PRODUCTS_DIR}/barcode_scan_fix/barcode_scan_fix.framework",
"${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
"${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
"${BUILT_PRODUCTS_DIR}/flutter_flexible_toast/flutter_flexible_toast.framework",
"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
"${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
"${BUILT_PRODUCTS_DIR}/hexcolor/hexcolor.framework",
"${BUILT_PRODUCTS_DIR}/imei_plugin/imei_plugin.framework",
"${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
"${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
"${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Try.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan_fix.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_flexible_toast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hexcolor.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/imei_plugin.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;

@ -2,6 +2,6 @@
<Workspace
version = "1.0">
<FileRef
location = "group:Runner.xcodeproj">
location = "self:">
</FileRef>
</Workspace>

@ -10,12 +10,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget {
final String message;
final String androidLink;
final String iosLink;
final String? message;
final String? androidLink;
final String? iosLink;
const UpdatePage({Key key, this.message, this.androidLink, this.iosLink})
: super(key: key);
const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -30,18 +29,27 @@ class UpdatePage extends StatelessWidget {
children: [
Image.asset(
'assets/images/update_rocket_image.png',
width: double.maxFinite,fit: BoxFit.fill,
width: double.maxFinite,
fit: BoxFit.fill,
),
Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,),
SizedBox(
height: 8,
),
AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17,
TranslationBase.of(context).updateTheApp!.toUpperCase(),
fontSize: 17,
fontWeight: FontWeight.w600,
),
SizedBox(height: 12,),
SizedBox(
height: 12,
),
Padding(
padding: const EdgeInsets.all(8.0),
child: AppText(message??"Update the app",fontSize: 12,),
child: AppText(
message ?? "Update the app",
fontSize: 12,
),
)
],
),
@ -52,14 +60,14 @@ class UpdatePage extends StatelessWidget {
// padding: const EdgeInsets.all(8.0),
margin: EdgeInsets.all(15),
child: SecondaryButton(
color: Colors.red[800],
color: Colors.red[800]!,
onTap: () {
if (Platform.isIOS)
launch(iosLink);
launch(iosLink!);
else
launch(androidLink);
launch(androidLink!);
},
label: TranslationBase.of(context).updateNow.toUpperCase(),
label: TranslationBase.of(context).updateNow!.toUpperCase(),
),
),
),

@ -22,41 +22,40 @@ Helpers helpers = new Helpers();
class BaseAppClient {
//TODO change the post fun to nun static when you change all service
post(String endPoint,
{Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
bool isAllowAny = false,bool isLiveCare = false}) async {
{required Map<String, dynamic> body,
required Function(dynamic response, int statusCode) onSuccess,
required Function(String error, int statusCode) onFailure,
bool isAllowAny = false,
bool isLiveCare = false}) async {
String url;
if(isLiveCare)
if (isLiveCare)
url = BASE_URL_LIVE_CARE + endPoint;
else
url = BASE_URL + endPoint;
bool callLog = true;
try {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
Map<String, dynamic>? profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN);
DoctorProfileModel? doctorProfile;
if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null)
body['DoctorID'] = doctorProfile?.doctorID;
doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null;
if (body['EditedBy'] == null)
body['EditedBy'] = doctorProfile?.doctorID;
if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID;
if (body['ProjectID'] == null) {
body['ProjectID'] = doctorProfile?.projectID;
}
if (body['ClinicID'] == null)
body['ClinicID'] = doctorProfile?.clinicID;
}
if (body['DoctorID'] == '') {
body['DoctorID'] = null;
}
if (body['EditedBy'] == '') {
body.remove("EditedBy");
if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile?.clinicID;
if (body['DoctorID'] == '') {
body['DoctorID'] = null;
}
if (body['EditedBy'] == '') {
body.remove("EditedBy");
}
}
if(body['TokenID'] == null){
if (body['TokenID'] == null) {
body['TokenID'] = token ?? '';
}
// body['TokenID'] = "@dm!n" ?? '';
@ -75,18 +74,16 @@ class BaseAppClient {
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
if (body['VidaAuthTokenID'] == null) {
body['VidaAuthTokenID'] =
await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
}
if (body['VidaRefreshTokenID'] == null) {
body['VidaRefreshTokenID'] =
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
}
int projectID = await sharedPref.getInt(PROJECT_ID);
if (projectID == 2 || projectID == 3)
body['PatientOutSA'] = true;
else if(body.containsKey('facilityId') && body['facilityId']==2 || body['facilityId']==3)
body['PatientOutSA'] = true;
else if (body.containsKey('facilityId') && body['facilityId'] == 2 || body['facilityId'] == 3)
body['PatientOutSA'] = true;
else
body['PatientOutSA'] = false;
@ -97,30 +94,22 @@ class BaseAppClient {
var asd = json.encode(body);
var asd2;
if (await Helpers.checkConnection()) {
final response = await http.post(url,
body: json.encode(body),
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
});
final response = await http.post(Uri.parse(url),
body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'});
final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else {
var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
parsed['AndroidLink'], parsed['IOSLink']);
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
}
if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX,
listen: false)
.logout();
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout();
Helpers.showErrorToast('Your session expired Please login again');
locator<NavigationService>().pushNamedAndRemoveUntil(ROOT);
}
@ -146,22 +135,18 @@ class BaseAppClient {
}
postPatient(String endPoint,
{Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure,
@required PatiantInformtion patient,
{required Map<String, dynamic> body,
required Function(dynamic response, int statusCode) onSuccess,
required Function(String error, int statusCode) onFailure,
PatiantInformtion? patient,
bool isExternal = false}) async {
String url = BASE_URL + endPoint;
try {
Map<String, String> headers = {
'Content-Type': 'application/json',
'Accept': 'application/json'
};
Map<String, String> headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
String token = await sharedPref.getString(TOKEN);
var languageID =
await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID')
? body['SetupID'] != null
? body['SetupID']
@ -181,12 +166,11 @@ class BaseAppClient {
: PATIENT_OUT_SA_PATIENT_REQ;
if (body.containsKey('isDentalAllowedBackend')) {
body['isDentalAllowedBackend'] =
body.containsKey('isDentalAllowedBackend')
? body['isDentalAllowedBackend'] != null
? body['isDentalAllowedBackend']
: IS_DENTAL_ALLOWED_BACKEND
: IS_DENTAL_ALLOWED_BACKEND;
body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
? body['isDentalAllowedBackend'] != null
? body['isDentalAllowedBackend']
: IS_DENTAL_ALLOWED_BACKEND
: IS_DENTAL_ALLOWED_BACKEND;
}
body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@ -194,7 +178,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null
? body['PatientType']
: patient.patientType != null
: patient!.patientType != null
? patient.patientType
: PATIENT_TYPE
: PATIENT_TYPE;
@ -202,15 +186,13 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null
? body['PatientTypeID']
: patient.patientType != null
: patient!.patientType != null
? patient.patientType
: PATIENT_TYPE_ID
: PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
body['PatientID'] = body['PatientID'] != null
? body['PatientID']
: patient.patientId ?? patient.patientMRN;
body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe
@ -225,8 +207,7 @@ class BaseAppClient {
print("Body : ${json.encode(body)}");
if (await Helpers.checkConnection()) {
final response = await http.post(url.trim(),
body: json.encode(body), headers: headers);
final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers);
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) {
@ -238,8 +219,7 @@ class BaseAppClient {
onSuccess(parsed, statusCode);
} else {
if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
parsed['AndroidLink'], parsed['IOSLink']);
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
}
if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) {
@ -255,28 +235,20 @@ class BaseAppClient {
onFailure(getError(parsed), statusCode);
}
}
} else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) {
} else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 &&
parsed['IsAuthenticated']) {
} else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode);
} else {
if (parsed['message'] == null &&
parsed['ErrorEndUserMessage'] == null) {
if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message",
statusCode);
onFailure("Server Error found with no available message", statusCode);
} else {
onFailure(parsed['ErrorSearchMsg'], statusCode);
}
} else {
onFailure(
parsed['message'] ??
parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'],
statusCode);
onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
}
}
} else {
@ -286,9 +258,7 @@ class BaseAppClient {
if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode);
} else {
onFailure(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
}
}
}
@ -311,12 +281,8 @@ class BaseAppClient {
if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
for (var i = 0;
i < parsed["ValidationErrors"]["ValidationErrors"].length;
i++) {
error = error +
parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
"\n";
for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) {
error = error + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n";
}
}
}

@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

@ -5,14 +5,14 @@ class SizeConfig {
static double _blockWidth = 0;
static double _blockHeight = 0;
static double realScreenWidth;
static double realScreenHeight;
static double screenWidth;
static double screenHeight;
static double textMultiplier;
static double imageSizeMultiplier;
static double heightMultiplier;
static double widthMultiplier;
static late double realScreenWidth;
static late double realScreenHeight;
static late double screenWidth;
static late double screenHeight;
static late double textMultiplier;
static late double imageSizeMultiplier;
static late double heightMultiplier;
static late double widthMultiplier;
static bool isPortrait = true;
static bool isMobilePortrait = false;
@ -46,7 +46,7 @@ class SizeConfig {
if (orientation == Orientation.portrait) {
isPortrait = true;
if (realScreenWidth < 450) {
if (realScreenWidth! < 450) {
isMobilePortrait = true;
}
screenHeight = realScreenHeight;
@ -57,9 +57,9 @@ class SizeConfig {
screenHeight = realScreenWidth;
screenWidth = realScreenHeight;
}
_blockWidth = screenWidth / 100;
_blockHeight = screenHeight / 100;
_blockWidth = (screenWidth! / 100);
_blockHeight = (screenHeight! / 100)!;
textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth;
heightMultiplier = _blockHeight;
@ -75,7 +75,7 @@ class SizeConfig {
print('isMobilePortrait $isMobilePortrait');
}
static getTextMultiplierBasedOnWidth({double width}){
static getTextMultiplierBasedOnWidth({double? width}){
// TODO handel LandScape case
if(width != null) {
return width / 100;
@ -84,7 +84,7 @@ class SizeConfig {
}
static getWidthMultiplier({double width}){
static getWidthMultiplier({double? width}){
// TODO handel LandScape case
if(width != null) {
return width / 100;
@ -92,7 +92,7 @@ class SizeConfig {
return widthMultiplier;
}
static getHeightMultiplier({double height}){
static getHeightMultiplier({double? height}){
// TODO handel LandScape case
if(height != null) {
return height / 100;

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

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions {
String setupID;
int projectID;
int patientID;
int appointmentNo;
String appointmentDate;
String doctorName;
String clinicDescription;
String name;
int episodeID;
int actualDoctorRate;
int admission;
int clinicID;
String companyName;
String despensedStatus;
DateTime dischargeDate;
int dischargeNo;
int doctorID;
String doctorImageURL;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
bool isLiveCareAppointment;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isInsurancePatient;
String nationalityFlagURL;
int noOfPatientsRate;
String qR;
List<String> speciality;
String? setupID;
int? projectID;
int? patientID;
int? appointmentNo;
String? appointmentDate;
String? doctorName;
String? clinicDescription;
String? name;
int? episodeID;
int? actualDoctorRate;
int? admission;
int? clinicID;
String? companyName;
String? despensedStatus;
DateTime? dischargeDate;
int? dischargeNo;
int? doctorID;
String? doctorImageURL;
int? doctorRate;
String? doctorTitle;
int? gender;
String? genderDescription;
bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor;
bool? isInOutPatient;
bool? isLiveCareAppointment;
String? isInOutPatientDescription;
String? isInOutPatientDescriptionN;
bool? isInsurancePatient;
String? nationalityFlagURL;
int? noOfPatientsRate;
String? qR;
List<String?>? speciality;
Prescriptions(
{this.setupID,
@ -69,9 +69,10 @@ class Prescriptions {
this.nationalityFlagURL,
this.noOfPatientsRate,
this.qR,
this.speciality,this.isLiveCareAppointment});
this.speciality,
this.isLiveCareAppointment});
Prescriptions.fromJson(Map<String, dynamic> json) {
Prescriptions.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
patientID = json['PatientID'];
@ -105,11 +106,11 @@ class Prescriptions {
noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR'];
isLiveCareAppointment = json['IsLiveCareAppointment'];
// speciality = json['Speciality'].cast<String>();
// speciality = json['Speciality'].cast<String ?>();
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID;
@ -149,10 +150,10 @@ class Prescriptions {
}
class PrescriptionsList {
String filterName = "";
List<Prescriptions> prescriptionsList = List();
String? filterName = "";
List<Prescriptions> prescriptionsList =[];
PrescriptionsList({this.filterName, Prescriptions prescriptions}) {
PrescriptionsList({this.filterName, required Prescriptions prescriptions}) {
prescriptionsList.add(prescriptions);
}
}

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

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

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

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

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

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

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

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

@ -1,32 +1,32 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionsOrder {
int iD;
int? iD;
dynamic patientID;
bool patientOutSA;
bool isOutPatient;
int projectID;
int nearestProjectID;
double longitude;
double latitude;
bool? patientOutSA;
bool? isOutPatient;
int? projectID;
int? nearestProjectID;
double? longitude;
double? latitude;
dynamic appointmentNo;
dynamic dischargeID;
int lineItemNo;
int status;
int? lineItemNo;
int? status;
dynamic description;
dynamic descriptionN;
DateTime createdOn;
int serviceID;
int createdBy;
DateTime editedOn;
int editedBy;
int channel;
DateTime? createdOn;
int? serviceID;
int? createdBy;
DateTime? editedOn;
int? editedBy;
int? channel;
dynamic clientRequestID;
bool returnedToQueue;
bool? returnedToQueue;
dynamic pickupDateTime;
dynamic pickupLocationName;
dynamic dropoffLocationName;
int realRRTHaveTransactions;
int? realRRTHaveTransactions;
dynamic nearestProjectDescription;
dynamic nearestProjectDescriptionN;
dynamic projectDescription;
@ -34,35 +34,35 @@ class PrescriptionsOrder {
PrescriptionsOrder(
{this.iD,
this.patientID,
this.patientOutSA,
this.isOutPatient,
this.projectID,
this.nearestProjectID,
this.longitude,
this.latitude,
this.appointmentNo,
this.dischargeID,
this.lineItemNo,
this.status,
this.description,
this.descriptionN,
this.createdOn,
this.serviceID,
this.createdBy,
this.editedOn,
this.editedBy,
this.channel,
this.clientRequestID,
this.returnedToQueue,
this.pickupDateTime,
this.pickupLocationName,
this.dropoffLocationName,
this.realRRTHaveTransactions,
this.nearestProjectDescription,
this.nearestProjectDescriptionN,
this.projectDescription,
this.projectDescriptionN});
this.patientID,
this.patientOutSA,
this.isOutPatient,
this.projectID,
this.nearestProjectID,
this.longitude,
this.latitude,
this.appointmentNo,
this.dischargeID,
this.lineItemNo,
this.status,
this.description,
this.descriptionN,
this.createdOn,
this.serviceID,
this.createdBy,
this.editedOn,
this.editedBy,
this.channel,
this.clientRequestID,
this.returnedToQueue,
this.pickupDateTime,
this.pickupLocationName,
this.dropoffLocationName,
this.realRRTHaveTransactions,
this.nearestProjectDescription,
this.nearestProjectDescriptionN,
this.projectDescription,
this.projectDescriptionN});
PrescriptionsOrder.fromJson(Map<String, dynamic> json) {
iD = json['ID'];

@ -1,32 +1,32 @@
class RequestGetListPharmacyForPrescriptions {
int latitude;
int longitude;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int itemID;
int? latitude;
int? longitude;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? itemID;
RequestGetListPharmacyForPrescriptions(
{this.latitude,
this.longitude,
this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.itemID});
this.longitude,
this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.itemID});
RequestGetListPharmacyForPrescriptions.fromJson(Map<String, dynamic> json) {
RequestGetListPharmacyForPrescriptions.fromJson(Map<String?, dynamic> json) {
latitude = json['Latitude'];
longitude = json['Longitude'];
versionID = json['VersionID'];

@ -1,46 +1,46 @@
class RequestPrescriptionReport {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int appointmentNo;
String setupID;
int episodeID;
int clinicID;
int projectID;
int dischargeNo;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
int? appointmentNo;
String? setupID;
int? episodeID;
int? clinicID;
int? projectID;
int? dischargeNo;
RequestPrescriptionReport(
{this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.appointmentNo,
this.setupID,
this.episodeID,
this.clinicID,
this.projectID,
this.dischargeNo});
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.appointmentNo,
this.setupID,
this.episodeID,
this.clinicID,
this.projectID,
this.dischargeNo});
RequestPrescriptionReport.fromJson(Map<String, dynamic> json) {
RequestPrescriptionReport.fromJson(Map<String?, dynamic> json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];

@ -1,45 +1,46 @@
class RequestPrescriptionReportEnh {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int appointmentNo;
String setupID;
int dischargeNo;
int episodeID;
int clinicID;
int projectID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
int? appointmentNo;
String? setupID;
int? dischargeNo;
int? episodeID;
int? clinicID;
int? projectID;
RequestPrescriptionReportEnh(
{this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.appointmentNo,
this.setupID,
this.episodeID,
this.clinicID,
this.projectID,this.dischargeNo});
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.appointmentNo,
this.setupID,
this.episodeID,
this.clinicID,
this.projectID,
this.dischargeNo});
RequestPrescriptionReportEnh.fromJson(Map<String, dynamic> json) {
RequestPrescriptionReportEnh.fromJson(Map<String?, dynamic> json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];

@ -1,45 +1,45 @@
class AdmissionRequest {
int patientMRN;
int admitToClinic;
bool isPregnant;
int pregnancyWeeks;
int pregnancyType;
int noOfBabies;
int mrpDoctorID;
String admissionDate;
int expectedDays;
int admissionType;
int admissionLocationID;
int roomCategoryID;
int wardID;
bool isSickLeaveRequired;
String sickLeaveComments;
bool isTransport;
String transportComments;
bool isPhysioAppointmentNeeded;
String physioAppointmentComments;
bool isOPDFollowupAppointmentNeeded;
String opdFollowUpComments;
bool isDietType;
int dietType;
String dietRemarks;
bool isPhysicalActivityModification;
String physicalActivityModificationComments;
int orStatus;
String mainLineOfTreatment;
int estimatedCost;
String elementsForImprovement;
bool isPackagePatient;
String complications;
String otherDepartmentInterventions;
String otherProcedures;
String pastMedicalHistory;
String pastSurgicalHistory;
List<dynamic> admissionRequestDiagnoses;
List<dynamic> admissionRequestProcedures;
int appointmentNo;
int episodeID;
int admissionRequestNo;
late int? patientMRN;
late int? admitToClinic;
late bool? isPregnant;
late int pregnancyWeeks;
late int pregnancyType;
late int noOfBabies;
late int? mrpDoctorID;
late String? admissionDate;
late int? expectedDays;
late int? admissionType;
late int admissionLocationID;
late int roomCategoryID;
late int? wardID;
late bool? isSickLeaveRequired;
late String sickLeaveComments;
late bool isTransport;
late String transportComments;
late bool isPhysioAppointmentNeeded;
late String physioAppointmentComments;
late bool isOPDFollowupAppointmentNeeded;
late String opdFollowUpComments;
late bool? isDietType;
late int? dietType;
late String? dietRemarks;
late bool isPhysicalActivityModification;
late String physicalActivityModificationComments;
late int orStatus;
late String? mainLineOfTreatment;
late int? estimatedCost;
late String? elementsForImprovement;
late bool isPackagePatient;
late String complications;
late String otherDepartmentInterventions;
late String otherProcedures;
late String pastMedicalHistory;
late String pastSurgicalHistory;
late List<dynamic>? admissionRequestDiagnoses;
late List<dynamic>? admissionRequestProcedures;
late int? appointmentNo;
late int? episodeID;
late int? admissionRequestNo;
AdmissionRequest(
{this.patientMRN,
@ -110,8 +110,7 @@ class AdmissionRequest {
dietType = json['dietType'];
dietRemarks = json['dietRemarks'];
isPhysicalActivityModification = json['isPhysicalActivityModification'];
physicalActivityModificationComments =
json['physicalActivityModificationComments'];
physicalActivityModificationComments = json['physicalActivityModificationComments'];
orStatus = json['orStatus'];
mainLineOfTreatment = json['mainLineOfTreatment'];
estimatedCost = json['estimatedCost'];
@ -123,17 +122,17 @@ class AdmissionRequest {
pastMedicalHistory = json['pastMedicalHistory'];
pastSurgicalHistory = json['pastSurgicalHistory'];
if (json['admissionRequestDiagnoses'] != null) {
admissionRequestDiagnoses = new List<dynamic>();
admissionRequestDiagnoses = [];
json['admissionRequestDiagnoses'].forEach((v) {
admissionRequestDiagnoses.add(v);
admissionRequestDiagnoses!.add(v);
// admissionRequestDiagnoses
// .add(new AdmissionRequestDiagnoses.fromJson(v));
});
}
if (json['admissionRequestProcedures'] != null) {
admissionRequestProcedures = new List<dynamic>();
admissionRequestProcedures = [];
json['admissionRequestProcedures'].forEach((v) {
admissionRequestProcedures.add(v);
admissionRequestProcedures!.add(v);
// admissionRequestProcedures
// .add(new AdmissionRequestProcedures.fromJson(v));
});
@ -164,16 +163,13 @@ class AdmissionRequest {
data['transportComments'] = this.transportComments;
data['isPhysioAppointmentNeeded'] = this.isPhysioAppointmentNeeded;
data['physioAppointmentComments'] = this.physioAppointmentComments;
data['isOPDFollowupAppointmentNeeded'] =
this.isOPDFollowupAppointmentNeeded;
data['isOPDFollowupAppointmentNeeded'] = this.isOPDFollowupAppointmentNeeded;
data['opdFollowUpComments'] = this.opdFollowUpComments;
data['isDietType'] = this.isDietType;
data['dietType'] = this.dietType;
data['dietRemarks'] = this.dietRemarks;
data['isPhysicalActivityModification'] =
this.isPhysicalActivityModification;
data['physicalActivityModificationComments'] =
this.physicalActivityModificationComments;
data['isPhysicalActivityModification'] = this.isPhysicalActivityModification;
data['physicalActivityModificationComments'] = this.physicalActivityModificationComments;
data['orStatus'] = this.orStatus;
data['mainLineOfTreatment'] = this.mainLineOfTreatment;
data['estimatedCost'] = this.estimatedCost;
@ -189,8 +185,7 @@ class AdmissionRequest {
// this.admissionRequestDiagnoses.map((v) => v.toJson()).toList();
}
if (this.admissionRequestProcedures != null) {
data['admissionRequestProcedures'] =
this.admissionRequestProcedures.map((v) => v.toJson()).toList();
data['admissionRequestProcedures'] = this.admissionRequestProcedures!.map((v) => v.toJson()).toList();
}
data['appointmentNo'] = this.appointmentNo;
data['episodeID'] = this.episodeID;

@ -1,16 +1,16 @@
class Clinic {
int clinicGroupID;
String clinicGroupName;
int clinicID;
String clinicNameArabic;
String clinicNameEnglish;
late int? clinicGroupID;
late String? clinicGroupName;
late int? clinicID;
late String? clinicNameArabic;
late String? clinicNameEnglish;
Clinic(
{this.clinicGroupID,
this.clinicGroupName,
this.clinicID,
this.clinicNameArabic,
this.clinicNameEnglish});
this.clinicGroupName,
this.clinicID,
this.clinicNameArabic,
this.clinicNameEnglish});
Clinic.fromJson(Map<String, dynamic> json) {
clinicGroupID = json['clinicGroupID'];
@ -29,5 +29,4 @@ class Clinic {
data['clinicNameEnglish'] = this.clinicNameEnglish;
return data;
}
}
}

@ -1,9 +1,9 @@
class WardModel{
String description;
String descriptionN;
int floorID;
bool isActive;
late String ? description;
late String ? descriptionN;
late int ? floorID;
late bool ? isActive;
WardModel(
{this.description, this.descriptionN, this.floorID, this.isActive});

@ -1,14 +1,15 @@
class ActivationCodeModel {
String mobileNumber;
String zipCode;
int channel;
int languageID;
double versionID;
int memberID;
String password;
int facilityId;
String generalid;
String otpSendType;
late String? mobileNumber;
late String? zipCode;
late int? channel;
late int? languageID;
late double? versionID;
late int? memberID;
late String? password;
late int? facilityId;
late String? generalid;
late String? otpSendType;
ActivationCodeModel(
{this.mobileNumber,
this.zipCode,

@ -1,17 +1,18 @@
class ActivationCodeForVerificationScreenModel {
int oTPSendType;
String mobileNumber;
String zipCode;
int channel;
int languageID;
double versionID;
int memberID;
int facilityId;
String generalid;
int isMobileFingerPrint;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String iMEI;
late int? oTPSendType;
late String? mobileNumber;
late String? zipCode;
late int? channel;
late int? languageID;
late double? versionID;
late int? memberID;
late int? facilityId;
late String? generalid;
late int? isMobileFingerPrint;
late String? vidaAuthTokenID;
late String? vidaRefreshTokenID;
late String? iMEI;
ActivationCodeForVerificationScreenModel(
{this.oTPSendType,
this.mobileNumber,

@ -1,71 +1,60 @@
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel {
String authenticationTokenID;
List<ListDoctorsClinic> listDoctorsClinic;
List<DoctorProfileModel> listDoctorProfile;
MemberInformation memberInformation;
late String? authenticationTokenID;
late List<ListDoctorsClinic>? listDoctorsClinic;
List<DoctorProfileModel>? listDoctorProfile;
late MemberInformation? memberInformation;
CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID,
this.listDoctorsClinic,
this.memberInformation});
{this.authenticationTokenID, this.listDoctorsClinic, this.memberInformation});
CheckActivationCodeForDoctorAppResponseModel.fromJson(
Map<String, dynamic> json) {
CheckActivationCodeForDoctorAppResponseModel.fromJson(Map<String, dynamic> json) {
authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) {
listDoctorsClinic = new List<ListDoctorsClinic>();
listDoctorsClinic = [];
json['List_DoctorsClinic'].forEach((v) {
listDoctorsClinic.add(new ListDoctorsClinic.fromJson(v));
listDoctorsClinic!.add(new ListDoctorsClinic.fromJson(v));
});
}
if (json['List_DoctorProfile'] != null) {
listDoctorProfile = new List<DoctorProfileModel>();
listDoctorProfile = [];
json['List_DoctorProfile'].forEach((v) {
listDoctorProfile.add(new DoctorProfileModel.fromJson(v));
listDoctorProfile!.add(new DoctorProfileModel.fromJson(v));
});
}
memberInformation = json['memberInformation'] != null
? new MemberInformation.fromJson(json['memberInformation'])
: null;
memberInformation =
json['memberInformation'] != null ? new MemberInformation.fromJson(json['memberInformation']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['AuthenticationTokenID'] = this.authenticationTokenID;
if (this.listDoctorsClinic != null) {
data['List_DoctorsClinic'] =
this.listDoctorsClinic.map((v) => v.toJson()).toList();
data['List_DoctorsClinic'] = this.listDoctorsClinic!.map((v) => v.toJson()).toList();
}
if (this.listDoctorProfile != null) {
data['List_DoctorProfile'] =
this.listDoctorProfile.map((v) => v.toJson()).toList();
data['List_DoctorProfile'] = this.listDoctorProfile!.map((v) => v.toJson()).toList();
}
if (this.memberInformation != null) {
data['memberInformation'] = this.memberInformation.toJson();
data['memberInformation'] = this.memberInformation!.toJson();
}
return data;
}
}
class ListDoctorsClinic {
Null setupID;
int projectID;
int doctorID;
int clinicID;
bool isActive;
String clinicName;
ListDoctorsClinic({this.setupID,
this.projectID,
this.doctorID,
this.clinicID,
this.isActive,
this.clinicName});
late dynamic setupID;
late int? projectID;
late int? doctorID;
late int? clinicID;
late bool? isActive;
late String? clinicName;
ListDoctorsClinic({this.setupID, this.projectID, this.doctorID, this.clinicID, this.isActive, this.clinicName});
ListDoctorsClinic.fromJson(Map<String, dynamic> json) {
setupID = json['SetupID'];
@ -89,31 +78,32 @@ class ListDoctorsClinic {
}
class MemberInformation {
List<Clinics> clinics;
int doctorId;
String email;
int employeeId;
int memberId;
Null memberName;
Null memberNameArabic;
String preferredLanguage;
List<Roles> roles;
MemberInformation({this.clinics,
this.doctorId,
this.email,
this.employeeId,
this.memberId,
this.memberName,
this.memberNameArabic,
this.preferredLanguage,
this.roles});
late List<Clinics>? clinics;
late int? doctorId;
late String? email;
late int? employeeId;
late int? memberId;
late dynamic memberName;
late dynamic memberNameArabic;
late String? preferredLanguage;
late List<Roles>? roles;
MemberInformation(
{this.clinics,
this.doctorId,
this.email,
this.employeeId,
this.memberId,
this.memberName,
this.memberNameArabic,
this.preferredLanguage,
this.roles});
MemberInformation.fromJson(Map<String, dynamic> json) {
if (json['clinics'] != null) {
clinics = new List<Clinics>();
clinics = [];
json['clinics'].forEach((v) {
clinics.add(new Clinics.fromJson(v));
clinics!.add(new Clinics.fromJson(v));
});
}
doctorId = json['doctorId'];
@ -124,9 +114,9 @@ class MemberInformation {
memberNameArabic = json['memberNameArabic'];
preferredLanguage = json['preferredLanguage'];
if (json['roles'] != null) {
roles = new List<Roles>();
roles = [];
json['roles'].forEach((v) {
roles.add(new Roles.fromJson(v));
roles!.add(new Roles.fromJson(v));
});
}
}
@ -134,7 +124,7 @@ class MemberInformation {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.clinics != null) {
data['clinics'] = this.clinics.map((v) => v.toJson()).toList();
data['clinics'] = this.clinics!.map((v) => v.toJson()).toList();
}
data['doctorId'] = this.doctorId;
data['email'] = this.email;
@ -144,16 +134,16 @@ class MemberInformation {
data['memberNameArabic'] = this.memberNameArabic;
data['preferredLanguage'] = this.preferredLanguage;
if (this.roles != null) {
data['roles'] = this.roles.map((v) => v.toJson()).toList();
data['roles'] = this.roles!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Clinics {
bool defaultClinic;
int id;
String name;
late bool? defaultClinic;
late int? id;
late String? name;
Clinics({this.defaultClinic, this.id, this.name});
@ -173,8 +163,8 @@ class Clinics {
}
class Roles {
String name;
int roleId;
late String? name;
late int? roleId;
Roles({this.name, this.roleId});

@ -1,18 +1,19 @@
class CheckActivationCodeRequestModel {
String mobileNumber;
String zipCode;
int doctorID;
String iPAdress;
int channel;
int languageID;
int projectID;
double versionID;
String generalid;
String logInTokenID;
String activationCode;
String vidaAuthTokenID;
String vidaRefreshTokenID;
int oTPSendType;
late String? mobileNumber;
late String? zipCode;
late int? doctorID;
late String? iPAdress;
late int? channel;
late int? languageID;
late int? projectID;
late double? versionID;
late String? generalid;
late String? logInTokenID;
late String? activationCode;
late String? vidaAuthTokenID;
late String? vidaRefreshTokenID;
late int? oTPSendType;
CheckActivationCodeRequestModel(
{this.mobileNumber,
this.zipCode,

@ -1,33 +1,34 @@
class GetIMEIDetailsModel {
int iD;
String iMEI;
int logInTypeID;
bool outSA;
String mobile;
dynamic identificationNo;
int doctorID;
String doctorName;
String doctorNameN;
int clinicID;
String clinicDescription;
dynamic clinicDescriptionN;
int projectID;
String projectName;
String genderDescription;
dynamic genderDescriptionN;
String titleDescription;
dynamic titleDescriptionN;
dynamic zipCode;
String createdOn;
dynamic createdBy;
String editedOn;
dynamic editedBy;
bool biometricEnabled;
dynamic preferredLanguage;
bool isActive;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String password;
late int? iD;
late String? iMEI;
late int? logInTypeID;
late bool? outSA;
late String? mobile;
late dynamic identificationNo;
late int? doctorID;
late String? doctorName;
late String? doctorNameN;
late int? clinicID;
late String? clinicDescription;
late dynamic clinicDescriptionN;
late int? projectID;
late String? projectName;
late String? genderDescription;
late dynamic genderDescriptionN;
late String? titleDescription;
late dynamic titleDescriptionN;
late dynamic zipCode;
late String? createdOn;
late dynamic createdBy;
late String? editedOn;
late dynamic editedBy;
late bool? biometricEnabled;
late dynamic preferredLanguage;
late bool? isActive;
late String? vidaAuthTokenID;
late String? vidaRefreshTokenID;
late String? password;
GetIMEIDetailsModel(
{this.iD,
this.iMEI,

@ -1,37 +1,37 @@
class InsertIMEIDetailsModel {
String iMEI;
int logInTypeID;
dynamic outSA;
String mobile;
dynamic identificationNo;
int doctorID;
String doctorName;
String doctorNameN;
int clinicID;
String clinicDescription;
Null clinicDescriptionN;
String projectName;
String genderDescription;
Null genderDescriptionN;
String titleDescription;
Null titleDescriptionN;
bool bioMetricEnabled;
Null preferredLanguage;
bool isActive;
int editedBy;
int projectID;
String tokenID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String sessionID;
bool isLoginForDoctorApp;
int patientOutSA;
String vidaAuthTokenID;
String vidaRefreshTokenID;
dynamic password;
late String? iMEI;
late int ?logInTypeID;
late dynamic outSA;
late String? mobile;
late dynamic identificationNo;
late int ?doctorID;
late String? doctorName;
late String ?doctorNameN;
late int ?clinicID;
late String ?clinicDescription;
late dynamic clinicDescriptionN;
late String ?projectName;
late String ?genderDescription;
late dynamic genderDescriptionN;
late String ?titleDescription;
late dynamic titleDescriptionN;
late bool ?bioMetricEnabled;
late dynamic preferredLanguage;
late bool ?isActive;
late int ?editedBy;
late int ?projectID;
late String ?tokenID;
late int ?languageID;
late String ?stamp;
late String ?iPAdress;
late double ?versionID;
late int ?channel;
late String ?sessionID;
late bool ?isLoginForDoctorApp;
late int ?patientOutSA;
late String ?vidaAuthTokenID;
late String ?vidaRefreshTokenID;
late dynamic password;
InsertIMEIDetailsModel(
{this.iMEI,
this.logInTypeID,

@ -1,13 +1,13 @@
class NewLoginInformationModel {
int doctorID;
List<ListMemberInformation> listMemberInformation;
String logInTokenID;
String mobileNumber;
Null sELECTDeviceIMEIbyIMEIList;
int userID;
String zipCode;
bool isActiveCode;
bool isSMSSent;
late int? doctorID;
late List<ListMemberInformation>? listMemberInformation;
late String ?logInTokenID;
late String ?mobileNumber;
late dynamic sELECTDeviceIMEIbyIMEIList;
late int ?userID;
late String ?zipCode;
late bool ?isActiveCode;
late bool ?isSMSSent;
NewLoginInformationModel(
{this.doctorID,
@ -23,9 +23,9 @@ class NewLoginInformationModel {
NewLoginInformationModel.fromJson(Map<String, dynamic> json) {
doctorID = json['DoctorID'];
if (json['List_MemberInformation'] != null) {
listMemberInformation = new List<ListMemberInformation>();
listMemberInformation = [];
json['List_MemberInformation'].forEach((v) {
listMemberInformation.add(new ListMemberInformation.fromJson(v));
listMemberInformation!.add(new ListMemberInformation.fromJson(v));
});
}
logInTokenID = json['LogInTokenID'];
@ -42,7 +42,7 @@ class NewLoginInformationModel {
data['DoctorID'] = this.doctorID;
if (this.listMemberInformation != null) {
data['List_MemberInformation'] =
this.listMemberInformation.map((v) => v.toJson()).toList();
this.listMemberInformation!.map((v) => v.toJson()).toList();
}
data['LogInTokenID'] = this.logInTokenID;
data['MobileNumber'] = this.mobileNumber;
@ -56,17 +56,17 @@ class NewLoginInformationModel {
}
class ListMemberInformation {
Null setupID;
int memberID;
String memberName;
Null memberNameN;
String preferredLang;
String pIN;
String saltHash;
int referenceID;
int employeeID;
int roleID;
int projectid;
late dynamic setupID;
late int ? memberID;
late String ? memberName;
late dynamic memberNameN;
late String ? preferredLang;
late String ? pIN;
late String ? saltHash;
late int ? referenceID;
late int ? employeeID;
late int ? roleID;
late int ? projectid;
ListMemberInformation(
{this.setupID,

@ -1,8 +1,8 @@
class SendActivationCodeForDoctorAppResponseModel {
String logInTokenID;
String verificationCode;
String vidaAuthTokenID;
String vidaRefreshTokenID;
String? logInTokenID;
String? verificationCode;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
SendActivationCodeForDoctorAppResponseModel(
{this.logInTokenID,

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

@ -1,13 +1,13 @@
class GetHospitalsRequestModel {
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
String memberID;
int ?languageID;
String? stamp;
String? iPAdress;
double? versionID;
int ?channel;
String? tokenID;
String? sessionID;
bool ?isLoginForDoctorApp;
String ?memberID;
GetHospitalsRequestModel(
{this.languageID,

@ -1,7 +1,7 @@
class GetHospitalsResponseModel {
String facilityGroupId;
int facilityId;
String facilityName;
String? facilityGroupId;
int ?facilityId;
String ?facilityName;
GetHospitalsResponseModel(
{this.facilityGroupId, this.facilityId, this.facilityName});

@ -1,20 +1,20 @@
class HospitalsModel {
String desciption;
String? desciption;
dynamic desciptionN;
int iD;
String legalName;
String legalNameN;
String name;
int? iD;
String? legalName;
String? legalNameN;
String? name;
dynamic nameN;
String phoneNumber;
String setupID;
int distanceInKilometers;
bool isActive;
String latitude;
String longitude;
int mainProjectID;
String? phoneNumber;
String? setupID;
int? distanceInKilometers;
bool ?isActive;
String? latitude;
String? longitude;
int? mainProjectID;
dynamic projectOutSA;
bool usingInDoctorApp;
bool ?usingInDoctorApp;
HospitalsModel({this.desciption,
this.desciptionN,
@ -33,7 +33,7 @@ class HospitalsModel {
this.projectOutSA,
this.usingInDoctorApp});
HospitalsModel.fromJson(Map<String, dynamic> json) {
HospitalsModel.fromJson(Map<String?, dynamic> json) {
desciption = json['Desciption'];
desciptionN = json['DesciptionN'];
iD = json['ID'];
@ -52,8 +52,8 @@ class HospitalsModel {
usingInDoctorApp = json['UsingInDoctorApp'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Desciption'] = this.desciption;
data['DesciptionN'] = this.desciptionN;
data['ID'] = this.iD;

@ -1,11 +1,11 @@
class ApporvalDetails {
int approvalNo;
int? approvalNo;
String procedureName;
String? procedureName;
//String procedureNameN;
String status;
String ?status;
String isInvoicedDesc;
String ?isInvoicedDesc;
ApporvalDetails(
{this.approvalNo, this.procedureName, this.status, this.isInvoicedDesc});
@ -35,35 +35,35 @@ class ApporvalDetails {
}
class InsuranceApprovalModel {
List<ApporvalDetails> apporvalDetails;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int eXuldAPPNO;
int projectID;
String doctorName;
String clinicName;
String patientDescription;
int approvalNo;
String approvalStatusDescption;
int unUsedCount;
String doctorImage;
String projectName;
List<ApporvalDetails> ?apporvalDetails;
double ?versionID;
int ? channel;
int ? languageID;
String ? iPAdress;
String ? generalid;
int ? patientOutSA;
String ? sessionID;
bool ? isDentalAllowedBackend;
int ? deviceTypeID;
int ? patientID;
String ? tokenID;
int ? patientTypeID;
int ? patientType;
int ? eXuldAPPNO;
int ? projectID;
String ? doctorName;
String ? clinicName;
String ? patientDescription;
int ? approvalNo;
String ?approvalStatusDescption;
int ? unUsedCount;
String ? doctorImage;
String ? projectName;
//String companyName;
String expiryDate;
String rceiptOn;
int appointmentNo;
String ? expiryDate;
String ? rceiptOn;
int ?appointmentNo;
InsuranceApprovalModel(
{this.versionID,
@ -126,9 +126,9 @@ class InsuranceApprovalModel {
doctorImage = json['DoctorImageURL'];
clinicName = json['ClinicName'];
if (json['ApporvalDetails'] != null) {
apporvalDetails = new List<ApporvalDetails>();
apporvalDetails =[];
json['ApporvalDetails'].forEach((v) {
apporvalDetails.add(new ApporvalDetails.fromJson(v));
apporvalDetails!.add(new ApporvalDetails.fromJson(v));
});
}
appointmentNo = json['AppointmentNo'];

@ -1,36 +1,36 @@
class InsuranceApprovalInPatientModel {
String setupID;
int projectID;
int approvalNo;
int status;
String approvalDate;
int patientType;
int patientID;
int companyID;
bool subCategoryID;
int doctorID;
int clinicID;
int approvalType;
int inpatientApprovalSubType;
String? setupID;
int? projectID;
int? approvalNo;
int? status;
String? approvalDate;
int? patientType;
int? patientID;
int? companyID;
bool? subCategoryID;
int? doctorID;
int? clinicID;
int? approvalType;
int? inpatientApprovalSubType;
dynamic isApprovalOnGross;
String companyApprovalNo;
String? companyApprovalNo;
dynamic progNoteOrderNo;
String submitOn;
String receiptOn;
String expiryDate;
int admissionNo;
int admissionRequestNo;
String approvalStatusDescption;
String? submitOn;
String? receiptOn;
String? expiryDate;
int? admissionNo;
int? admissionRequestNo;
String? approvalStatusDescption;
dynamic approvalStatusDescptionN;
dynamic remarks;
List<ApporvalDetails> apporvalDetails;
String clinicName;
List<ApporvalDetails>? apporvalDetails;
String? clinicName;
dynamic companyName;
String doctorName;
String projectName;
int totaUnUsedCount;
int unUsedCount;
String doctorImage;
String? doctorName;
String? projectName;
int? totaUnUsedCount;
int? unUsedCount;
String? doctorImage;
InsuranceApprovalInPatientModel(
{this.setupID,
@ -93,9 +93,9 @@ class InsuranceApprovalInPatientModel {
approvalStatusDescptionN = json['ApprovalStatusDescptionN'];
remarks = json['Remarks'];
if (json['ApporvalDetails'] != null) {
apporvalDetails = new List<ApporvalDetails>();
apporvalDetails = [];
json['ApporvalDetails'].forEach((v) {
apporvalDetails.add(new ApporvalDetails.fromJson(v));
apporvalDetails!.add(new ApporvalDetails.fromJson(v));
});
}
clinicName = json['ClinicName'];
@ -135,7 +135,7 @@ class InsuranceApprovalInPatientModel {
data['Remarks'] = this.remarks;
if (this.apporvalDetails != null) {
data['ApporvalDetails'] =
this.apporvalDetails.map((v) => v.toJson()).toList();
this.apporvalDetails!.map((v) => v.toJson()).toList();
}
data['ClinicName'] = this.clinicName;
data['CompanyName'] = this.companyName;
@ -148,35 +148,35 @@ class InsuranceApprovalInPatientModel {
}
class ApporvalDetails {
Null setupID;
Null projectID;
int approvalNo;
Null lineItemNo;
Null orderType;
Null procedureID;
Null toothNo;
Null price;
Null approvedAmount;
Null unapprovedPatientShare;
Null waivedAmount;
Null discountType;
Null discountValue;
Null shareType;
Null patientShareTypeValue;
Null companyShareTypeValue;
Null patientShare;
Null companyShare;
Null deductableAmount;
String disapprovedRemarks;
Null progNoteOrderNo;
Null progNoteLineItemNo;
Null invoiceTransactionType;
Null invoiceNo;
String procedureName;
String procedureNameN;
String status;
Null isInvoiced;
String isInvoicedDesc;
dynamic setupID;
dynamic projectID;
int? approvalNo;
dynamic lineItemNo;
dynamic orderType;
dynamic procedureID;
dynamic toothNo;
dynamic price;
dynamic approvedAmount;
dynamic unapprovedPatientShare;
dynamic waivedAmount;
dynamic discountType;
dynamic discountValue;
dynamic shareType;
dynamic patientShareTypeValue;
dynamic companyShareTypeValue;
dynamic patientShare;
dynamic companyShare;
dynamic deductableAmount;
String? disapprovedRemarks;
dynamic progNoteOrderNo;
dynamic progNoteLineItemNo;
dynamic invoiceTransactionType;
dynamic invoiceNo;
String? procedureName;
String? procedureNameN;
String? status;
dynamic isInvoiced;
String? isInvoicedDesc;
ApporvalDetails(
{this.setupID,

@ -1,23 +1,23 @@
class LabOrderResult {
String description;
String? description;
dynamic femaleInterpretativeData;
int gender;
int lineItemNo;
int ?gender;
int? lineItemNo;
dynamic maleInterpretativeData;
dynamic notes;
String packageID;
int patientID;
String projectID;
String referanceRange;
String resultValue;
String sampleCollectedOn;
String sampleReceivedOn;
String setupID;
String ?packageID;
int ?patientID;
String ? projectID;
String ? referanceRange;
String ? resultValue;
String ? sampleCollectedOn;
String ? sampleReceivedOn;
String ? setupID;
dynamic superVerifiedOn;
String testCode;
String uOM;
String verifiedOn;
String verifiedOnDateTime;
String? testCode;
String? uOM;
String? verifiedOn;
String? verifiedOnDateTime;
LabOrderResult(
{this.description,

@ -1,44 +1,44 @@
class LabResult {
String description;
String? description;
dynamic femaleInterpretativeData;
int gender;
int lineItemNo;
int? gender;
int? lineItemNo;
dynamic maleInterpretativeData;
String notes;
String packageID;
int patientID;
String projectID;
String referanceRange;
String resultValue;
String sampleCollectedOn;
String sampleReceivedOn;
String setupID;
String? notes;
String? packageID;
int? patientID;
String? projectID;
String? referanceRange;
String? resultValue;
String? sampleCollectedOn;
String? sampleReceivedOn;
String? setupID;
dynamic superVerifiedOn;
String testCode;
String uOM;
String verifiedOn;
String? testCode;
String? uOM;
String? verifiedOn;
dynamic verifiedOnDateTime;
LabResult(
{this.description,
this.femaleInterpretativeData,
this.gender,
this.lineItemNo,
this.maleInterpretativeData,
this.notes,
this.packageID,
this.patientID,
this.projectID,
this.referanceRange,
this.resultValue,
this.sampleCollectedOn,
this.sampleReceivedOn,
this.setupID,
this.superVerifiedOn,
this.testCode,
this.uOM,
this.verifiedOn,
this.verifiedOnDateTime});
this.femaleInterpretativeData,
this.gender,
this.lineItemNo,
this.maleInterpretativeData,
this.notes,
this.packageID,
this.patientID,
this.projectID,
this.referanceRange,
this.resultValue,
this.sampleCollectedOn,
this.sampleReceivedOn,
this.setupID,
this.superVerifiedOn,
this.testCode,
this.uOM,
this.verifiedOn,
this.verifiedOnDateTime});
LabResult.fromJson(Map<String, dynamic> json) {
description = json['Description'];
@ -87,12 +87,11 @@ class LabResult {
}
}
class LabResultList {
String filterName = "";
List<LabResult> patientLabResultList = List();
List<LabResult> patientLabResultList = [];
LabResultList({this.filterName, LabResult lab}) {
LabResultList({required this.filterName, required LabResult lab}) {
patientLabResultList.add(lab);
}
}

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PatientLabOrders {
int actualDoctorRate;
String clinicDescription;
String clinicDescriptionEnglish;
Null clinicDescriptionN;
int clinicID;
int doctorID;
String doctorImageURL;
String doctorName;
String doctorNameEnglish;
Null doctorNameN;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
String invoiceNo;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isRead;
String nationalityFlagURL;
int noOfPatientsRate;
DateTime orderDate;
String orderNo;
String patientID;
String projectID;
String projectName;
Null projectNameN;
String qR;
String setupID;
List<String> speciality;
bool isLiveCareAppointment;
int ?actualDoctorRate;
String ?clinicDescription;
String ?clinicDescriptionEnglish;
dynamic clinicDescriptionN;
int ?clinicID;
int ?doctorID;
String? doctorImageURL;
String ?doctorName;
String ?doctorNameEnglish;
dynamic doctorNameN;
int ?doctorRate;
String ?doctorTitle;
int ?gender;
String ?genderDescription;
String ?invoiceNo;
bool ?isActiveDoctorProfile;
bool ?isDoctorAllowVedioCall;
bool ?isExecludeDoctor;
bool ?isInOutPatient;
String ?isInOutPatientDescription;
String ?isInOutPatientDescriptionN;
bool ?isRead;
String ?nationalityFlagURL;
int ?noOfPatientsRate;
DateTime? orderDate;
String ?orderNo;
String ?patientID;
String ?projectID;
String ?projectName;
dynamic projectNameN;
String ?qR;
String ?setupID;
List<String> ?speciality;
bool ?isLiveCareAppointment;
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@ -149,10 +149,10 @@ class PatientLabOrders {
class PatientLabOrdersList {
String filterName = "";
List<PatientLabOrders> patientLabOrdersList = List();
List<PatientLabOrders> patientLabOrdersList = [];
PatientLabOrdersList(
{this.filterName, PatientLabOrders patientDoctorAppointment}) {
{required this.filterName, required PatientLabOrders patientDoctorAppointment}) {
patientLabOrdersList.add(patientDoctorAppointment);
}
}

@ -1,9 +1,9 @@
class PatientLabSpecialResult {
String invoiceNo;
String moduleID;
String resultData;
String resultDataHTML;
Null resultDataTxt;
String ?invoiceNo;
String ?moduleID;
String ? resultData;
String ? resultDataHTML;
dynamic resultDataTxt;
PatientLabSpecialResult(
{this.invoiceNo,

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

@ -1,22 +1,22 @@
class RequestPatientLabSpecialResult {
String invoiceNo;
String orderNo;
String setupID;
String projectID;
int clinicID;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
String? invoiceNo;
String? orderNo;
String? setupID;
String? projectID;
int ?clinicID;
double? versionID;
int ?channel;
int ?languageID;
String? iPAdress;
String ?generalid;
int ?patientOutSA;
String ?sessionID;
bool ?isDentalAllowedBackend;
int ?deviceTypeID;
int ?patientID;
String? tokenID;
int ?patientTypeID;
int ?patientType;
RequestPatientLabSpecialResult(
{this.invoiceNo,

@ -1,56 +1,56 @@
class RequestSendLabReportEmail {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
String to;
String dateofBirth;
String patientIditificationNum;
String patientMobileNumber;
String patientName;
String setupID;
String projectName;
String clinicName;
String doctorName;
String projectID;
String invoiceNo;
String orderDate;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
String? to;
String? dateofBirth;
String? patientIditificationNum;
String? patientMobileNumber;
String? patientName;
String? setupID;
String? projectName;
String? clinicName;
String? doctorName;
String? projectID;
String? invoiceNo;
String? orderDate;
RequestSendLabReportEmail(
{this.versionID,
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.to,
this.dateofBirth,
this.patientIditificationNum,
this.patientMobileNumber,
this.patientName,
this.setupID,
this.projectName,
this.clinicName,
this.doctorName,
this.projectID,
this.invoiceNo,
this.orderDate});
this.channel,
this.languageID,
this.iPAdress,
this.generalid,
this.patientOutSA,
this.sessionID,
this.isDentalAllowedBackend,
this.deviceTypeID,
this.patientID,
this.tokenID,
this.patientTypeID,
this.patientType,
this.to,
this.dateofBirth,
this.patientIditificationNum,
this.patientMobileNumber,
this.patientName,
this.setupID,
this.projectName,
this.clinicName,
this.doctorName,
this.projectID,
this.invoiceNo,
this.orderDate});
RequestSendLabReportEmail.fromJson(Map<String, dynamic> json) {
versionID = json['VersionID'];

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
class AlternativeService {
int serviceID;
String serviceName;
bool isSelected;
int? serviceID;
String? serviceName;
bool? isSelected;
AlternativeService(
{this.serviceID, this.serviceName, this.isSelected = false});
@ -23,7 +23,7 @@ class AlternativeService {
}
class AlternativeServicesList with ChangeNotifier {
List<AlternativeService> _alternativeServicesList;
late List<AlternativeService> _alternativeServicesList;
getServicesList(){
return _alternativeServicesList;

@ -1,7 +1,7 @@
class PendingPatientERForDoctorAppRequestModel {
bool outSA;
int doctorID;
String sErServiceID;
bool ? outSA;
int ? doctorID;
String ? sErServiceID;
PendingPatientERForDoctorAppRequestModel(
{this.outSA, this.doctorID, this.sErServiceID});

@ -1,9 +1,9 @@
class LiveCareUserLoginRequestModel {
String tokenID;
String generalid;
int doctorId;
int isOutKsa;
int isLogin;
String? tokenID;
String? generalid;
int? doctorId;
int? isOutKsa;
int? isLogin;
LiveCareUserLoginRequestModel({this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.isLogin});

@ -1,14 +1,14 @@
class MedicalFileModel {
List<EntityList> entityList;
List<EntityList>? entityList;
dynamic statusMessage;
MedicalFileModel({this.entityList, this.statusMessage});
MedicalFileModel.fromJson(Map<String, dynamic> json) {
if (json['entityList'] != null) {
entityList = new List<EntityList>();
entityList = [];
json['entityList'].forEach((v) {
entityList.add(new EntityList.fromJson(v));
entityList!.add(new EntityList.fromJson(v));
});
}
statusMessage = json['statusMessage'];
@ -17,7 +17,7 @@ class MedicalFileModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.entityList != null) {
data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
}
data['statusMessage'] = this.statusMessage;
return data;
@ -25,15 +25,15 @@ class MedicalFileModel {
}
class EntityList {
List<Timelines> timelines;
List<Timelines>? timelines;
EntityList({this.timelines});
EntityList.fromJson(Map<String, dynamic> json) {
if (json['Timelines'] != null) {
timelines = new List<Timelines>();
timelines = [];
json['Timelines'].forEach((v) {
timelines.add(new Timelines.fromJson(v));
timelines!.add(new Timelines.fromJson(v));
});
}
}
@ -41,25 +41,25 @@ class EntityList {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.timelines != null) {
data['Timelines'] = this.timelines.map((v) => v.toJson()).toList();
data['Timelines'] = this.timelines!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Timelines {
int clinicId;
String clinicName;
String date;
int doctorId;
String doctorImage;
String doctorName;
int encounterNumber;
String encounterType;
int projectID;
String projectName;
String setupID;
List<TimeLineEvents> timeLineEvents;
int? clinicId;
String? clinicName;
String? date;
int? doctorId;
String? doctorImage;
String? doctorName;
int? encounterNumber;
String? encounterType;
int? projectID;
String? projectName;
String? setupID;
List<TimeLineEvents>? timeLineEvents;
Timelines(
{this.clinicId,
@ -88,9 +88,9 @@ class Timelines {
projectName = json['ProjectName'];
setupID = json['SetupID'];
if (json['TimeLineEvents'] != null) {
timeLineEvents = new List<TimeLineEvents>();
timeLineEvents = [];
json['TimeLineEvents'].forEach((v) {
timeLineEvents.add(new TimeLineEvents.fromJson(v));
timeLineEvents!.add(new TimeLineEvents.fromJson(v));
});
}
}
@ -110,25 +110,25 @@ class Timelines {
data['SetupID'] = this.setupID;
if (this.timeLineEvents != null) {
data['TimeLineEvents'] =
this.timeLineEvents.map((v) => v.toJson()).toList();
this.timeLineEvents!.map((v) => v.toJson()).toList();
}
return data;
}
}
class TimeLineEvents {
List<Null> admissions;
String colorClass;
List<Consulations> consulations;
List<dynamic>? admissions;
String? colorClass;
List<Consulations>? consulations;
TimeLineEvents({this.admissions, this.colorClass, this.consulations});
TimeLineEvents.fromJson(Map<String, dynamic> json) {
colorClass = json['ColorClass'];
if (json['Consulations'] != null) {
consulations = new List<Consulations>();
consulations = [];
json['Consulations'].forEach((v) {
consulations.add(new Consulations.fromJson(v));
consulations!.add(new Consulations.fromJson(v));
});
}
}
@ -138,38 +138,38 @@ class TimeLineEvents {
data['ColorClass'] = this.colorClass;
if (this.consulations != null) {
data['Consulations'] = this.consulations.map((v) => v.toJson()).toList();
data['Consulations'] = this.consulations!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Consulations {
int admissionNo;
String appointmentDate;
int appointmentNo;
String appointmentType;
String clinicID;
String clinicName;
int doctorID;
String doctorName;
String endTime;
String episodeDate;
int episodeID;
int patientID;
int projectID;
String projectName;
String remarks;
String setupID;
String startTime;
String visitFor;
String visitType;
String dispalyName;
List<LstAssessments> lstAssessments;
List<LstPhysicalExam> lstPhysicalExam;
List<LstProcedure> lstProcedure;
List<LstMedicalHistory> lstMedicalHistory;
List<LstCheifComplaint> lstCheifComplaint;
int? admissionNo;
String? appointmentDate;
int? appointmentNo;
String? appointmentType;
String? clinicID;
String? clinicName;
int? doctorID;
String? doctorName;
String? endTime;
String? episodeDate;
int? episodeID;
int? patientID;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? startTime;
String? visitFor;
String? visitType;
String? dispalyName;
List<LstAssessments>? lstAssessments;
List<LstPhysicalExam>? lstPhysicalExam;
List<LstProcedure>? lstProcedure;
List<LstMedicalHistory>? lstMedicalHistory;
List<LstCheifComplaint>? lstCheifComplaint;
Consulations(
{this.admissionNo,
@ -220,33 +220,33 @@ class Consulations {
visitType = json['VisitType'];
dispalyName = json['dispalyName'];
if (json['lstAssessments'] != null) {
lstAssessments = new List<LstAssessments>();
lstAssessments = [];
json['lstAssessments'].forEach((v) {
lstAssessments.add(new LstAssessments.fromJson(v));
lstAssessments!.add(new LstAssessments.fromJson(v));
});
}
if (json['lstCheifComplaint'] != null) {
lstCheifComplaint = new List<LstCheifComplaint>();
lstCheifComplaint = [];
json['lstCheifComplaint'].forEach((v) {
lstCheifComplaint.add(new LstCheifComplaint.fromJson(v));
lstCheifComplaint!.add(new LstCheifComplaint.fromJson(v));
});
}
if (json['lstPhysicalExam'] != null) {
lstPhysicalExam = new List<LstPhysicalExam>();
lstPhysicalExam = [];
json['lstPhysicalExam'].forEach((v) {
lstPhysicalExam.add(new LstPhysicalExam.fromJson(v));
lstPhysicalExam!.add(new LstPhysicalExam.fromJson(v));
});
}
if (json['lstProcedure'] != null) {
lstProcedure = new List<LstProcedure>();
lstProcedure = [];
json['lstProcedure'].forEach((v) {
lstProcedure.add(new LstProcedure.fromJson(v));
lstProcedure!.add(new LstProcedure.fromJson(v));
});
}
if (json['lstMedicalHistory'] != null) {
lstMedicalHistory = new List<LstMedicalHistory>();
lstMedicalHistory = [];
json['lstMedicalHistory'].forEach((v) {
lstMedicalHistory.add(new LstMedicalHistory.fromJson(v));
lstMedicalHistory!.add(new LstMedicalHistory.fromJson(v));
});
}
}
@ -275,40 +275,40 @@ class Consulations {
data['dispalyName'] = this.dispalyName;
if (this.lstAssessments != null) {
data['lstAssessments'] =
this.lstAssessments.map((v) => v.toJson()).toList();
this.lstAssessments!.map((v) => v.toJson()).toList();
}
if (this.lstCheifComplaint != null) {
data['lstCheifComplaint'] =
this.lstCheifComplaint.map((v) => v.toJson()).toList();
this.lstCheifComplaint!.map((v) => v.toJson()).toList();
}
if (this.lstPhysicalExam != null) {
data['lstPhysicalExam'] =
this.lstPhysicalExam.map((v) => v.toJson()).toList();
this.lstPhysicalExam!.map((v) => v.toJson()).toList();
}
if (this.lstProcedure != null) {
data['lstProcedure'] = this.lstProcedure.map((v) => v.toJson()).toList();
data['lstProcedure'] = this.lstProcedure!.map((v) => v.toJson()).toList();
}
if (this.lstMedicalHistory != null) {
data['lstMedicalHistory'] =
this.lstMedicalHistory.map((v) => v.toJson()).toList();
this.lstMedicalHistory!.map((v) => v.toJson()).toList();
}
return data;
}
}
class LstCheifComplaint {
int appointmentNo;
String cCDate;
String chiefComplaint;
String currentMedication;
int episodeID;
String hOPI;
int patientID;
String patientType;
int projectID;
String projectName;
String setupID;
String dispalyName;
int? appointmentNo;
String? cCDate;
String? chiefComplaint;
String? currentMedication;
int? episodeID;
String? hOPI;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? setupID;
String? dispalyName;
LstCheifComplaint(
{this.appointmentNo,
@ -358,19 +358,19 @@ class LstCheifComplaint {
}
class LstAssessments {
int appointmentNo;
String condition;
String description;
int episodeID;
String iCD10;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String type;
String dispalyName;
int? appointmentNo;
String? condition;
String? description;
int? episodeID;
String? iCD10;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? type;
String? dispalyName;
LstAssessments(
{this.appointmentNo,
@ -423,19 +423,19 @@ class LstAssessments {
}
class LstPhysicalExam {
String abnormal;
int appointmentNo;
int episodeID;
String examDesc;
String examID;
String examType;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String dispalyName;
String? abnormal;
int? appointmentNo;
int? episodeID;
String? examDesc;
String? examID;
String? examType;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? dispalyName;
LstPhysicalExam(
{this.abnormal,
@ -488,17 +488,17 @@ class LstPhysicalExam {
}
class LstProcedure {
int appointmentNo;
int episodeID;
String orderDate;
int patientID;
String patientType;
String procName;
String procedureId;
int projectID;
String projectName;
String setupID;
String dispalyName;
int? appointmentNo;
int? episodeID;
String? orderDate;
int? patientID;
String? patientType;
String? procName;
String? procedureId;
int? projectID;
String? projectName;
String? setupID;
String? dispalyName;
LstProcedure(
{this.appointmentNo,
@ -545,17 +545,17 @@ class LstProcedure {
}
class LstMedicalHistory {
int appointmentNo;
String checked;
int episodeID;
String history;
int patientID;
String patientType;
int projectID;
String projectName;
String remarks;
String setupID;
String dispalyName;
int? appointmentNo;
String? checked;
int? episodeID;
String? history;
int? patientID;
String? patientType;
int? projectID;
String? projectName;
String? remarks;
String? setupID;
String? dispalyName;
LstMedicalHistory(
{this.appointmentNo,

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

@ -1,23 +1,23 @@
class CreateNoteModel {
int visitType;
int admissionNo;
int projectID;
int patientTypeID;
int patientID;
int clinicID;
String notes;
int createdBy;
int editedBy;
String nursingRemarks;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int? visitType;
int? admissionNo;
int? projectID;
int? patientTypeID;
int? patientID;
int? clinicID;
String? notes;
int ?createdBy;
int ?editedBy;
String ?nursingRemarks;
int ?languageID;
String? stamp;
String ?iPAdress;
double ?versionID;
int ?channel;
String ?tokenID;
String? sessionID;
bool ?isLoginForDoctorApp;
bool ?patientOutSA;
CreateNoteModel(
{this.visitType,

@ -1,24 +1,24 @@
class NoteModel {
String setupID;
int projectID;
int patientID;
int patientType;
String admissionNo;
int lineItemNo;
int visitType;
String notes;
String assessmentDate;
String visitTime;
int status;
String nursingRemarks;
String createdOn;
String editedOn;
int createdBy;
int admissionClinicID;
String admissionClinicName;
Null doctorClinicName;
String doctorName;
String visitTypeDesc;
String? setupID;
int ?projectID;
int ?patientID;
int ?patientType;
String ?admissionNo;
int ?lineItemNo;
int ?visitType;
String ?notes;
String ?assessmentDate;
String ?visitTime;
int ?status;
String ?nursingRemarks;
String ?createdOn;
String ?editedOn;
int ?createdBy;
int ?admissionClinicID;
String ?admissionClinicName;
dynamic doctorClinicName;
String ?doctorName;
String ?visitTypeDesc;
NoteModel(
{this.setupID,

@ -1,40 +1,40 @@
class UpdateNoteReqModel {
int projectID;
int createdBy;
int admissionNo;
int lineItemNo;
String notes;
bool verifiedNote;
bool cancelledNote;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
int patientTypeID;
int? projectID;
int? createdBy;
int? admissionNo;
int? lineItemNo;
String? notes;
bool? verifiedNote;
bool? cancelledNote;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
int? patientTypeID;
UpdateNoteReqModel(
{this.projectID,
this.createdBy,
this.admissionNo,
this.lineItemNo,
this.notes,
this.verifiedNote,
this.cancelledNote,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA,
this.patientTypeID});
this.createdBy,
this.admissionNo,
this.lineItemNo,
this.notes,
this.verifiedNote,
this.cancelledNote,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA,
this.patientTypeID});
UpdateNoteReqModel.fromJson(Map<String, dynamic> json) {
projectID = json['ProjectID'];

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

@ -1,18 +1,18 @@
class PatientSearchRequestModel {
int doctorID;
String firstName;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
int patientID;
String from;
String to;
int searchType;
String mobileNo;
String identificationNo;
int nursingStationID;
int clinicID=0;
int ?doctorID;
String?firstName;
String?middleName;
String?lastName;
String?patientMobileNumber;
String?patientIdentificationID;
int ?patientID;
String? from;
String ?to;
int ?searchType;
String? mobileNo;
String? identificationNo;
int? nursingStationID;
int? clinicID=0;
PatientSearchRequestModel(
{this.doctorID = 0,

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

@ -1,31 +1,31 @@
class ProcedureTempleteRequestModel {
int doctorID;
String firstName;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
int patientID;
String from;
String to;
int searchType;
String mobileNo;
String identificationNo;
int editedBy;
int projectID;
int clinicID;
String tokenID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
String vidaAuthTokenID;
String vidaRefreshTokenID;
int deviceTypeID;
int? doctorID;
String? firstName;
String? middleName;
String? lastName;
String? patientMobileNumber;
String? patientIdentificationID;
int? patientID;
String? from;
String? to;
int? searchType;
String? mobileNo;
String? identificationNo;
int? editedBy;
int? projectID;
int? clinicID;
String? tokenID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
int? deviceTypeID;
ProcedureTempleteRequestModel(
{this.doctorID,
@ -56,7 +56,7 @@ class ProcedureTempleteRequestModel {
this.vidaRefreshTokenID,
this.deviceTypeID});
ProcedureTempleteRequestModel.fromJson(Map<String, dynamic> json) {
ProcedureTempleteRequestModel.fromJson(Map<String?, dynamic> json) {
doctorID = json['DoctorID'];
firstName = json['FirstName'];
middleName = json['MiddleName'];

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

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

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

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

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

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

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

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

@ -1,29 +1,29 @@
class ProcedureTempleteDetailsModel {
String setupID;
int projectID;
int clinicID;
int doctorID;
int templateID;
String templateName;
String procedureID;
bool isActive;
int createdBy;
String createdOn;
String? setupID;
int? projectID;
int? clinicID;
int? doctorID;
int? templateID;
String? templateName;
String? procedureID;
bool ?isActive;
int? createdBy;
String? createdOn;
dynamic editedBy;
dynamic editedOn;
String procedureName;
String procedureNameN;
String alias;
String aliasN;
String categoryID;
String subGroupID;
String categoryDescription;
String categoryDescriptionN;
String categoryAlias;
String? procedureName;
String? procedureNameN;
String? alias;
String? aliasN;
String? categoryID;
String? subGroupID;
String? categoryDescription;
String? categoryDescriptionN;
String? categoryAlias;
dynamic riskCategoryID;
String type = "1";
String remarks;
int selectedType = 0;
String? type = "1";
String? remarks;
int? selectedType = 0;
ProcedureTempleteDetailsModel(
{this.setupID,
@ -52,7 +52,7 @@ class ProcedureTempleteDetailsModel {
this.type = "1",
this.selectedType = 0});
ProcedureTempleteDetailsModel.fromJson(Map<String, dynamic> json) {
ProcedureTempleteDetailsModel.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
clinicID = json['ClinicID'];
@ -77,8 +77,8 @@ class ProcedureTempleteDetailsModel {
categoryAlias = json['CategoryAlias'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['ClinicID'] = this.clinicID;
@ -105,12 +105,12 @@ class ProcedureTempleteDetailsModel {
}
}
class ProcedureTempleteDetailsModelList {
List<ProcedureTempleteDetailsModel> procedureTemplate = List();
String templateName;
int templateId;
List<ProcedureTempleteDetailsModel> procedureTemplate =[];
String? templateName;
int? templateId;
ProcedureTempleteDetailsModelList(
{this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) {
{this.templateName, this.templateId, required ProcedureTempleteDetailsModel template}) {
procedureTemplate.add(template);
}
}

@ -1,32 +1,32 @@
class ProcedureTempleteDetailsRequestModel {
int doctorID;
String firstName;
int templateID;
String middleName;
String lastName;
String patientMobileNumber;
String patientIdentificationID;
int patientID;
String from;
String to;
int searchType;
String mobileNo;
String identificationNo;
int editedBy;
int projectID;
int clinicID;
String tokenID;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
String vidaAuthTokenID;
String vidaRefreshTokenID;
int deviceTypeID;
int? doctorID;
String? firstName;
int? templateID;
String? middleName;
String? lastName;
String? patientMobileNumber;
String? patientIdentificationID;
int? patientID;
String? from;
String? to;
int? searchType;
String? mobileNo;
String? identificationNo;
int? editedBy;
int? projectID;
int? clinicID;
String? tokenID;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
String? vidaAuthTokenID;
String? vidaRefreshTokenID;
int? deviceTypeID;
ProcedureTempleteDetailsRequestModel(
{this.doctorID,
@ -58,7 +58,7 @@ class ProcedureTempleteDetailsRequestModel {
this.vidaRefreshTokenID,
this.deviceTypeID});
ProcedureTempleteDetailsRequestModel.fromJson(Map<String, dynamic> json) {
ProcedureTempleteDetailsRequestModel.fromJson(Map<String?, dynamic> json) {
doctorID = json['DoctorID'];
firstName = json['FirstName'];
templateID = json['TemplateID'];

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

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

@ -1,13 +1,13 @@
import 'ControlsModel.dart';
class UpdateProcedureRequestModel {
int orderNo;
int patientMRN;
int appointmentNo;
int episodeID;
int lineItemNo;
ProcedureDetail procedureDetail;
String vidaAuthTokenID;
int? orderNo;
int? patientMRN;
int? appointmentNo;
int? episodeID;
int? lineItemNo;
ProcedureDetail? procedureDetail;
String? vidaAuthTokenID;
UpdateProcedureRequestModel(
{this.orderNo,
@ -38,7 +38,7 @@ class UpdateProcedureRequestModel {
data['EpisodeID'] = this.episodeID;
data['LineItemNo'] = this.lineItemNo;
if (this.procedureDetail != null) {
data['procedureDetail'] = this.procedureDetail.toJson();
data['procedureDetail'] = this.procedureDetail!.toJson();
}
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data;
@ -46,9 +46,9 @@ class UpdateProcedureRequestModel {
}
class ProcedureDetail {
String procedure;
String category;
List<Controls> controls;
String? procedure;
String? category;
List<Controls>? controls;
ProcedureDetail({this.procedure, this.category, this.controls});
@ -56,9 +56,9 @@ class ProcedureDetail {
procedure = json['Procedure'];
category = json['Category'];
if (json['Controls'] != null) {
controls = new List<Controls>();
controls = [];
json['Controls'].forEach((v) {
controls.add(new Controls.fromJson(v));
controls!.add(new Controls.fromJson(v));
});
}
}
@ -68,7 +68,7 @@ class ProcedureDetail {
data['Procedure'] = this.procedure;
data['Category'] = this.category;
if (this.controls != null) {
data['Controls'] = this.controls.map((v) => v.toJson()).toList();
data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
}
return data;
}

@ -8,17 +8,17 @@ class FinalRadiology {
dynamic invoiceNo;
dynamic doctorID;
dynamic clinicID;
DateTime orderDate;
DateTime reportDate;
DateTime? orderDate;
DateTime ?reportDate;
dynamic reportData;
dynamic imageURL;
dynamic procedureID;
dynamic appodynamicmentNo;
dynamic dIAPacsURL;
bool isRead;
bool? isRead;
dynamic readOn;
var admissionNo;
bool isInOutPatient;
bool ?isInOutPatient;
dynamic actualDoctorRate;
dynamic clinicDescription;
dynamic dIAPACSURL;
@ -28,8 +28,8 @@ class FinalRadiology {
dynamic doctorTitle;
dynamic gender;
dynamic genderDescription;
bool isActiveDoctorProfile;
bool isExecludeDoctor;
bool? isActiveDoctorProfile;
bool ?isExecludeDoctor;
dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN;
dynamic nationalityFlagURL;
@ -39,10 +39,10 @@ class FinalRadiology {
dynamic qR;
dynamic reportDataHTML;
dynamic reportDataTextdynamic;
List<dynamic> speciality;
bool isCVI;
bool isRadMedicalReport;
bool isLiveCareAppodynamicment;
List<dynamic>? speciality;
bool ?isCVI;
bool ?isRadMedicalReport;
bool ?isLiveCareAppodynamicment;
FinalRadiology(
{this.setupID,
@ -186,9 +186,9 @@ class FinalRadiology {
class FinalRadiologyList {
dynamic filterName = "";
List<FinalRadiology> finalRadiologyList = List();
List<FinalRadiology> finalRadiologyList = [];
FinalRadiologyList({this.filterName, FinalRadiology finalRadiology}) {
FinalRadiologyList({this.filterName, required FinalRadiology finalRadiology}) {
finalRadiologyList.add(finalRadiology);
}
}

@ -1,24 +1,24 @@
class RequestPatientRadOrdersDetails {
int projectID;
int orderNo;
int invoiceNo;
String setupID;
String procedureID;
bool isMedicalReport;
bool isCVI;
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
String sessionID;
bool isDentalAllowedBackend;
int deviceTypeID;
int patientID;
String tokenID;
int patientTypeID;
int patientType;
int? projectID;
int? orderNo;
int? invoiceNo;
String? setupID;
String? procedureID;
bool? isMedicalReport;
bool? isCVI;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
String? sessionID;
bool? isDentalAllowedBackend;
int? deviceTypeID;
int? patientID;
String? tokenID;
int? patientTypeID;
int? patientType;
RequestPatientRadOrdersDetails(
{this.projectID,
@ -42,7 +42,7 @@ class RequestPatientRadOrdersDetails {
this.patientTypeID,
this.patientType});
RequestPatientRadOrdersDetails.fromJson(Map<String, dynamic> json) {
RequestPatientRadOrdersDetails.fromJson(Map<String?, dynamic> json) {
projectID = json['ProjectID'];
orderNo = json['OrderNo'];
invoiceNo = json['InvoiceNo'];
@ -65,8 +65,8 @@ class RequestPatientRadOrdersDetails {
patientType = json['PatientType'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['ProjectID'] = this.projectID;
data['OrderNo'] = this.orderNo;
data['InvoiceNo'] = this.invoiceNo;

@ -1,30 +1,30 @@
class RequestSendRadReportEmail {
int channel;
String clinicName;
String dateofBirth;
int deviceTypeID;
String doctorName;
String generalid;
int invoiceNo;
String iPAdress;
bool isDentalAllowedBackend;
int languageID;
String orderDate;
int patientID;
String patientIditificationNum;
String patientMobileNumber;
String patientName;
int patientOutSA;
int patientType;
int patientTypeID;
int projectID;
String projectName;
String radResult;
String sessionID;
String setupID;
String to;
String tokenID;
double versionID;
int? channel;
String? clinicName;
String? dateofBirth;
int? deviceTypeID;
String? doctorName;
String? generalid;
int? invoiceNo;
String? iPAdress;
bool ?isDentalAllowedBackend;
int? languageID;
String? orderDate;
int? patientID;
String? patientIditificationNum;
String? patientMobileNumber;
String? patientName;
int? patientOutSA;
int? patientType;
int? patientTypeID;
int? projectID;
String? projectName;
String? radResult;
String? sessionID;
String? setupID;
String? to;
String? tokenID;
double? versionID;
RequestSendRadReportEmail(
{this.channel,
@ -54,7 +54,7 @@ class RequestSendRadReportEmail {
this.tokenID,
this.versionID});
RequestSendRadReportEmail.fromJson(Map<String, dynamic> json) {
RequestSendRadReportEmail.fromJson(Map<String?, dynamic> json) {
channel = json['Channel'];
clinicName = json['ClinicName'];
dateofBirth = json['DateofBirth'];
@ -83,8 +83,8 @@ class RequestSendRadReportEmail {
versionID = json['VersionID'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Channel'] = this.channel;
data['ClinicName'] = this.clinicName;
data['DateofBirth'] = this.dateofBirth;

@ -2,56 +2,56 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class DischargeReferralPatient {
dynamic rowID;
int projectID;
int lineItemNo;
int doctorID;
int patientID;
String doctorName;
int? projectID;
int? lineItemNo;
int? doctorID;
int? patientID;
String? doctorName;
dynamic doctorNameN;
String firstName;
String middleName;
String lastName;
String? firstName;
String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
String patientIdentificationNo;
int patientType;
String admissionNo;
String admissionDate;
String roomID;
String bedID;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType;
String? admissionNo;
String? admissionDate;
String? roomID;
String? bedID;
dynamic nursingStationID;
dynamic description;
String nationalityName;
String? nationalityName;
dynamic nationalityNameN;
int referralDoctor;
int referringDoctor;
int referralClinic;
int referringClinic;
int referralStatus;
DateTime referralDate;
String referringDoctorRemarks;
String referredDoctorRemarks;
String referralResponseOn;
int priority;
int frequency;
String mAXResponseTime;
String dischargeDate;
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;
String? age;
String? clinicDescription;
String? frequencyDescription;
String? genderDescription;
bool?isDoctorLate;
bool? isDoctorResponse;
String? nursingStationName;
String? priorityDescription;
String? referringClinicDescription;
String? referringDoctorName;
DischargeReferralPatient(
{this.rowID,
@ -106,7 +106,7 @@ class DischargeReferralPatient {
this.referringClinicDescription,
this.referringDoctorName});
DischargeReferralPatient.fromJson(Map<String, dynamic> json) {
DischargeReferralPatient.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID'];
projectID = json['ProjectID'];
lineItemNo = json['LineItemNo'];
@ -160,8 +160,8 @@ class DischargeReferralPatient {
referringDoctorName = json['ReferringDoctorName'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['RowID'] = this.rowID;
data['ProjectID'] = this.projectID;
data['LineItemNo'] = this.lineItemNo;

@ -2,66 +2,66 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class MyReferralPatientModel {
dynamic rowID;
int projectID;
int lineItemNo;
int doctorID;
int patientID;
String doctorName;
int? projectID;
int? lineItemNo;
int? doctorID;
int? patientID;
String? doctorName;
dynamic doctorNameN;
String firstName;
String middleName;
String lastName;
String? firstName;
String? middleName;
String? lastName;
dynamic firstNameN;
dynamic middleNameN;
dynamic lastNameN;
int gender;
String dateofBirth;
String mobileNumber;
String emailAddress;
String patientIdentificationNo;
int patientType;
String admissionNo;
String admissionDate;
String roomID;
String bedID;
int? gender;
String? dateofBirth;
String? mobileNumber;
String? emailAddress;
String? patientIdentificationNo;
int? patientType;
String? admissionNo;
String? admissionDate;
String? roomID;
String? bedID;
dynamic nursingStationID;
dynamic description;
String nationalityName;
String? nationalityName;
dynamic nationalityNameN;
String clinicDescription;
String clinicDescriptionN;
int referralDoctor;
int referringDoctor;
int referralClinic;
int referringClinic;
int referralStatus;
DateTime referralDate;
String referringDoctorRemarks;
String referredDoctorRemarks;
String referralResponseOn;
int priority;
int frequency;
String mAXResponseTime;
int episodeID;
int appointmentNo;
String appointmentDate;
int appointmentType;
int patientMRN;
String createdOn;
int clinicID;
String nationalityID;
String age;
String doctorImageURL;
String frequencyDescription;
String genderDescription;
bool isDoctorLate;
bool isDoctorResponse;
String nationalityFlagURL;
String nursingStationName;
String priorityDescription;
String referringClinicDescription;
String referringDoctorName;
int referalStatus;
String? clinicDescription;
String? clinicDescriptionN;
int? referralDoctor;
int? referringDoctor;
int? referralClinic;
int? referringClinic;
int? referralStatus;
DateTime ?referralDate;
String? referringDoctorRemarks;
String? referredDoctorRemarks;
String? referralResponseOn;
int? priority;
int? frequency;
String? mAXResponseTime;
int? episodeID;
int? appointmentNo;
String? appointmentDate;
int? appointmentType;
int? patientMRN;
String? createdOn;
int? clinicID;
String? nationalityID;
String? age;
String? doctorImageURL;
String? frequencyDescription;
String? genderDescription;
bool? isDoctorLate;
bool? isDoctorResponse;
String? nationalityFlagURL;
String? nursingStationName;
String? priorityDescription;
String? referringClinicDescription;
String? referringDoctorName;
int? referalStatus;
MyReferralPatientModel(
{this.rowID,
@ -126,7 +126,7 @@ class MyReferralPatientModel {
this.referringDoctorName,
this.referalStatus});
MyReferralPatientModel.fromJson(Map<String, dynamic> json) {
MyReferralPatientModel.fromJson(Map<String?, dynamic> json) {
rowID = json['RowID'];
referalStatus = json['ReferalStatus'];
projectID = json['ProjectID'];
@ -203,8 +203,8 @@ class MyReferralPatientModel {
referringDoctorName = json['ReferringDoctorName'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['RowID'] = this.rowID;
data['ReferalStatus'] = this.referalStatus;
data['ProjectID'] = this.projectID;
@ -270,6 +270,6 @@ class MyReferralPatientModel {
}
get patientName {
return this.firstName + " " + this.lastName;
return this.firstName !+ " " + this.lastName!;
}
}

@ -1,27 +1,27 @@
class MyReferralPatientRequestModel {
int channel;
int clinicID;
int doctorID;
int editedBy;
String firstName;
String from;
String iPAdress;
bool isLoginForDoctorApp;
int languageID;
String lastName;
String middleName;
int patientID;
String patientIdentificationID;
String patientMobileNumber;
bool patientOutSA;
int patientTypeID;
int projectID;
String sessionID;
String stamp;
String to;
String tokenID;
double versionID;
String vidaAuthTokenID;
int? channel;
int? clinicID;
int? doctorID;
int? editedBy;
String? firstName;
String? from;
String? iPAdress;
bool? isLoginForDoctorApp;
int? languageID;
String? lastName;
String? middleName;
int? patientID;
String? patientIdentificationID;
String? patientMobileNumber;
bool? patientOutSA;
int? patientTypeID;
int? projectID;
String? sessionID;
String? stamp;
String? to;
String? tokenID;
double? versionID;
String? vidaAuthTokenID;
MyReferralPatientRequestModel(
{this.channel,

@ -1,56 +1,56 @@
class ReferralRequest {
String roomID;
String referralClinic;
String referralDoctor;
int createdBy;
int editedBy;
int patientID;
int patientTypeID;
int referringClinic;
int referringDoctor;
int projectID;
int admissionNo;
String referringDoctorRemarks;
String priority;
String frequency;
String extension;
int languageID;
String stamp;
String iPAdress;
double versionID;
int channel;
String tokenID;
String sessionID;
bool isLoginForDoctorApp;
bool patientOutSA;
String? roomID;
String? referralClinic;
String? referralDoctor;
int? createdBy;
int? editedBy;
int? patientID;
int? patientTypeID;
int? referringClinic;
int? referringDoctor;
int? projectID;
int? admissionNo;
String? referringDoctorRemarks;
String? priority;
String? frequency;
String? extension;
int? languageID;
String? stamp;
String? iPAdress;
double? versionID;
int? channel;
String? tokenID;
String? sessionID;
bool? isLoginForDoctorApp;
bool? patientOutSA;
ReferralRequest(
{this.roomID,
this.referralClinic,
this.referralDoctor,
this.createdBy,
this.editedBy,
this.patientID,
this.patientTypeID,
this.referringClinic,
this.referringDoctor,
this.projectID,
this.admissionNo,
this.referringDoctorRemarks,
this.priority,
this.frequency,
this.extension,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA});
this.referralClinic,
this.referralDoctor,
this.createdBy,
this.editedBy,
this.patientID,
this.patientTypeID,
this.referringClinic,
this.referringDoctor,
this.projectID,
this.admissionNo,
this.referringDoctorRemarks,
this.priority,
this.frequency,
this.extension,
this.languageID,
this.stamp,
this.iPAdress,
this.versionID,
this.channel,
this.tokenID,
this.sessionID,
this.isLoginForDoctorApp,
this.patientOutSA});
ReferralRequest.fromJson(Map<String, dynamic> json) {
ReferralRequest.fromJson(Map<String?, dynamic> json) {
roomID = json['RoomID'];
referralClinic = json['ReferralClinic'];
referralDoctor = json['ReferralDoctor'];

@ -1,19 +1,19 @@
class AddReferredRemarksRequestModel {
int projectID;
int admissionNo;
int lineItemNo;
String referredDoctorRemarks;
int editedBy;
int referalStatus;
bool isLoginForDoctorApp;
String iPAdress;
bool patientOutSA;
String tokenID;
int languageID;
double versionID;
int channel;
String sessionID;
int deviceTypeID;
int? projectID;
int? admissionNo;
int? lineItemNo;
String? referredDoctorRemarks;
int? editedBy;
int? referalStatus;
bool? isLoginForDoctorApp;
String? iPAdress;
bool? patientOutSA;
String? tokenID;
int? languageID;
double? versionID;
int? channel;
String? sessionID;
int? deviceTypeID;
AddReferredRemarksRequestModel(
{this.projectID,

@ -1,13 +1,13 @@
class GetMedicationResponseModel {
String description;
String genericName;
int itemId;
String keywords;
String? description;
String? genericName;
int ?itemId;
String? keywords;
dynamic price;
dynamic quantity;
dynamic mediSpanGPICode;
bool isNarcotic;
String uom;
bool ?isNarcotic;
String? uom;
GetMedicationResponseModel(
{this.description,
this.genericName,
@ -19,7 +19,7 @@ class GetMedicationResponseModel {
this.uom,
this.mediSpanGPICode});
GetMedicationResponseModel.fromJson(Map<String, dynamic> json) {
GetMedicationResponseModel.fromJson(Map<String?, dynamic> json) {
description = json['Description'];
genericName = json['GenericName'];
itemId = json['ItemId'];
@ -31,8 +31,8 @@ class GetMedicationResponseModel {
uom = json['uom'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['Description'] = this.description;
data['GenericName'] = this.genericName;
data['ItemId'] = this.itemId;

@ -1,27 +1,27 @@
class ItemByMedicineModel {
List<Frequencies> frequencies;
List<Routes> routes;
List<Strengths> strengths;
List<Frequencies>? frequencies;
List<Routes> ?routes;
List<Strengths>? strengths;
ItemByMedicineModel({this.frequencies, this.routes, this.strengths});
ItemByMedicineModel.fromJson(Map<String, dynamic> json) {
if (json['frequencies'] != null) {
frequencies = new List<Frequencies>();
frequencies = [];
json['frequencies'].forEach((v) {
frequencies.add(new Frequencies.fromJson(v));
frequencies!.add(new Frequencies.fromJson(v));
});
}
if (json['routes'] != null) {
routes = new List<Routes>();
routes = [];
json['routes'].forEach((v) {
routes.add(new Routes.fromJson(v));
routes!.add(new Routes.fromJson(v));
});
}
if (json['strengths'] != null) {
strengths = new List<Strengths>();
strengths = [];
json['strengths'].forEach((v) {
strengths.add(new Strengths.fromJson(v));
strengths!.add(new Strengths.fromJson(v));
});
}
}
@ -29,22 +29,22 @@ class ItemByMedicineModel {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.frequencies != null) {
data['frequencies'] = this.frequencies.map((v) => v.toJson()).toList();
data['frequencies'] = this.frequencies!.map((v) => v.toJson()).toList();
}
if (this.routes != null) {
data['routes'] = this.routes.map((v) => v.toJson()).toList();
data['routes'] = this.routes!.map((v) => v.toJson()).toList();
}
if (this.strengths != null) {
data['strengths'] = this.strengths.map((v) => v.toJson()).toList();
data['strengths'] = this.strengths!.map((v) => v.toJson()).toList();
}
return data;
}
}
class Frequencies {
String description;
bool isDefault;
int parameterCode;
String? description;
bool? isDefault;
int ?parameterCode;
Frequencies({this.description, this.isDefault, this.parameterCode});
@ -64,9 +64,9 @@ class Frequencies {
}
class Strengths {
String description;
bool isDefault;
int parameterCode;
String? description;
bool ?isDefault;
int ?parameterCode;
Strengths({this.description, this.isDefault, this.parameterCode});
@ -86,9 +86,9 @@ class Strengths {
}
class Routes {
String description;
bool isDefault;
int parameterCode;
String ?description;
bool ?isDefault;
int ?parameterCode;
Routes({this.description, this.isDefault, this.parameterCode});

@ -1,6 +1,6 @@
class ItemByMedicineRequestModel {
String vidaAuthTokenID;
int medicineCode;
String ?vidaAuthTokenID;
int ?medicineCode;
ItemByMedicineRequestModel({this.vidaAuthTokenID, this.medicineCode});

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

@ -1,5 +1,5 @@
class SearchDrugRequestModel {
List<String> search;
List<String> ?search;
// String vidaAuthTokenID;
SearchDrugRequestModel({this.search});

@ -1,41 +1,41 @@
import 'package:doctor_app_flutter/widgets/shared/StarRating.dart';
class SickLeavePatientModel {
String setupID;
int projectID;
int patientID;
int patientType;
int clinicID;
int doctorID;
int requestNo;
String requestDate;
int sickLeaveDays;
int appointmentNo;
int admissionNo;
int actualDoctorRate;
String appointmentDate;
String clinicName;
String doctorImageURL;
String doctorName;
int doctorRate;
String doctorTitle;
int gender;
String genderDescription;
bool isActiveDoctorProfile;
bool isDoctorAllowVedioCall;
bool isExecludeDoctor;
bool isInOutPatient;
String isInOutPatientDescription;
String isInOutPatientDescriptionN;
bool isLiveCareAppointment;
int noOfPatientsRate;
String? setupID;
int? projectID;
int? patientID;
int? patientType;
int? clinicID;
int? doctorID;
int? requestNo;
String? requestDate;
int? sickLeaveDays;
int? appointmentNo;
int? admissionNo;
int? actualDoctorRate;
String? appointmentDate;
String? clinicName;
String? doctorImageURL;
String? doctorName;
int? doctorRate;
String? doctorTitle;
int? gender;
String? genderDescription;
bool? isActiveDoctorProfile;
bool? isDoctorAllowVedioCall;
bool? isExecludeDoctor;
bool? isInOutPatient;
String? isInOutPatientDescription;
String? isInOutPatientDescriptionN;
bool? isLiveCareAppointment;
int? noOfPatientsRate;
dynamic patientName;
String projectName;
String qR;
// List<String> speciality;
String strRequestDate;
String startDate;
String endDate;
String? projectName;
String? qR;
// List<String?> speciality;
String? strRequestDate;
String? startDate;
String? endDate;
SickLeavePatientModel(
{this.setupID,
@ -74,7 +74,7 @@ class SickLeavePatientModel {
this.startDate,
this.endDate});
SickLeavePatientModel.fromJson(Map<String, dynamic> json) {
SickLeavePatientModel.fromJson(Map<String?, dynamic> json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
@ -107,14 +107,14 @@ class SickLeavePatientModel {
patientName = json['PatientName'];
projectName = json['ProjectName'];
qR = json['QR'];
// speciality = json['Speciality'].cast<String>();
// speciality = json['Speciality'].cast<String?>();
strRequestDate = json['StrRequestDate'];
startDate = json['StartDate'];
endDate = json['EndDate'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
Map<String?, dynamic> toJson() {
final Map<String?, dynamic> data = new Map<String?, dynamic>();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;

@ -1,16 +1,16 @@
class SickLeavePatientRequestModel {
double versionID;
int channel;
int languageID;
String iPAdress;
String generalid;
int patientOutSA;
int deviceTypeID;
int patientType;
int patientTypeID;
String tokenID;
int patientID;
String sessionID;
double? versionID;
int? channel;
int? languageID;
String? iPAdress;
String? generalid;
int? patientOutSA;
int? deviceTypeID;
int? patientType;
int? patientTypeID;
String? tokenID;
int? patientID;
String? sessionID;
SickLeavePatientRequestModel(
{this.versionID,
@ -26,7 +26,7 @@ class SickLeavePatientRequestModel {
this.patientID,
this.sessionID});
SickLeavePatientRequestModel.fromJson(Map<String, dynamic> json) {
SickLeavePatientRequestModel.fromJson(Map<String?, dynamic> json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];

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

@ -18,14 +18,14 @@ import 'NavigationService.dart';
class VideoCallService extends BaseService{
StartCallRes startCallRes;
PatiantInformtion patient;
late StartCallRes startCallRes;
late PatiantInformtion patient;
LiveCarePatientServices _liveCarePatientServices = locator<LiveCarePatientServices>();
openVideo(StartCallRes startModel,PatiantInformtion patientModel,VoidCallback onCallConnected, VoidCallback onCallDisconnected)async{
this.startCallRes = startModel;
this.patient = patientModel;
DoctorProfileModel doctorProfile = await getDoctorProfile(isGetProfile: true);
DoctorProfileModel? doctorProfile = await getDoctorProfile(isGetProfile: true);
await VideoChannel.openVideoCallScreen(
kToken: startCallRes.openTokenID,//"T1==cGFydG5lcl9pZD00NzI0Nzk1NCZzaWc9NGIyZDljOTY3YjFiNWU1YzUzNzFmMjIyNjJmNmEzY2Y5NzZjOTdlYzpzZXNzaW9uX2lkPTFfTVg0ME56STBOemsxTkg1LU1UWXlNekEyTlRRMU9EVXhObjVrVFRoMFlVdFJXaXRYTWpadFZGZHFhSGxZVGpOdE1UVi1mZyZjcmVhdGVfdGltZT0xNjIzMDY1NDk1Jm5vbmNlPTAuMjM2Mjk0NTIwMTkyOTA4OTcmcm9sZT1wdWJsaXNoZXImZXhwaXJlX3RpbWU9MTYyNTY1NzQ5NCZpbml0aWFsX2xheW91dF9jbGFzc19saXN0PQ==",
kSessionId:startCallRes.openSessionID,//1_MX40NzI0Nzk1NH5-MTYyMzA2NTQ1ODUxNn5kTTh0YUtRWitXMjZtVFdqaHlYTjNtMTV-fg
@ -34,15 +34,15 @@ class VideoCallService extends BaseService{
patientName: patient.fullName ?? (patient.firstName != null ? "${patient.firstName} ${patient.lastName}" : "-"),
tokenID: await sharedPref.getString(TOKEN),
generalId: GENERAL_ID,
doctorId: doctorProfile.doctorID,
doctorId: doctorProfile!.doctorID,
onFailure: (String error) {
DrAppToastMsg.showErrorToast(error);
},onCallConnected: onCallConnected,
onCallEnd: () {
WidgetsBinding.instance.addPostFrameCallback((_) async {
GifLoaderDialogUtils.showMyDialog(locator<NavigationService>().navigatorKey.currentContext);
endCall(patient.vcId, false,).then((value) {
GifLoaderDialogUtils.hideDialog(locator<NavigationService>().navigatorKey.currentContext);
WidgetsBinding.instance!.addPostFrameCallback((_) async {
GifLoaderDialogUtils.showMyDialog(locator<NavigationService>().navigatorKey.currentContext!);
endCall(patient.vcId!, false,).then((value) {
GifLoaderDialogUtils.hideDialog(locator<NavigationService>().navigatorKey.currentContext!);
if (hasError) {
DrAppToastMsg.showErrorToast(error);
}else
@ -54,10 +54,10 @@ class VideoCallService extends BaseService{
});
},
onCallNotRespond: (SessionStatusModel sessionStatusModel) {
WidgetsBinding.instance.addPostFrameCallback((_) {
GifLoaderDialogUtils.showMyDialog(locator<NavigationService>().navigatorKey.currentContext);
endCall(patient.vcId, sessionStatusModel.sessionStatus == 3,).then((value) {
GifLoaderDialogUtils.hideDialog(locator<NavigationService>().navigatorKey.currentContext);
WidgetsBinding.instance!.addPostFrameCallback((_) {
GifLoaderDialogUtils.showMyDialog(locator<NavigationService>().navigatorKey.currentContext!);
endCall(patient.vcId!, sessionStatusModel.sessionStatus == 3,).then((value) {
GifLoaderDialogUtils.hideDialog(locator<NavigationService>().navigatorKey.currentContext!);
if (hasError) {
DrAppToastMsg.showErrorToast(error);
} else {
@ -76,13 +76,13 @@ class VideoCallService extends BaseService{
hasError = false;
await getDoctorProfile(isGetProfile: true);
EndCallReq endCallReq = new EndCallReq();
endCallReq.doctorId = doctorProfile.doctorID;
endCallReq.doctorId = doctorProfile!.doctorID;
endCallReq.generalid = 'Cs2020@2016\$2958';
endCallReq.vCID = vCID;
endCallReq.isDestroy = isPatient;
await _liveCarePatientServices.endCall(endCallReq);
if (_liveCarePatientServices.hasError) {
error = _liveCarePatientServices.error;
error = _liveCarePatientServices.error!;
}
}

@ -17,28 +17,29 @@ class AuthenticationService extends BaseService {
List<GetIMEIDetailsModel> get dashboardItemsList => _imeiDetails;
NewLoginInformationModel _loginInfo = NewLoginInformationModel();
NewLoginInformationModel get loginInfo => _loginInfo;
SendActivationCodeForDoctorAppResponseModel _activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel();
SendActivationCodeForDoctorAppResponseModel _activationCodeVerificationScreenRes =
SendActivationCodeForDoctorAppResponseModel();
SendActivationCodeForDoctorAppResponseModel get activationCodeVerificationScreenRes => _activationCodeVerificationScreenRes;
SendActivationCodeForDoctorAppResponseModel get activationCodeVerificationScreenRes =>
_activationCodeVerificationScreenRes;
SendActivationCodeForDoctorAppResponseModel _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel();
SendActivationCodeForDoctorAppResponseModel _activationCodeForDoctorAppRes =
SendActivationCodeForDoctorAppResponseModel();
SendActivationCodeForDoctorAppResponseModel get activationCodeForDoctorAppRes => _activationCodeForDoctorAppRes;
CheckActivationCodeForDoctorAppResponseModel _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel();
CheckActivationCodeForDoctorAppResponseModel _checkActivationCodeForDoctorAppRes =
CheckActivationCodeForDoctorAppResponseModel();
CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes => _checkActivationCodeForDoctorAppRes;
CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes =>
_checkActivationCodeForDoctorAppRes;
Map<String, dynamic> _insertDeviceImeiRes = {};
List<DoctorProfileModel> _doctorProfilesList = [];
List<DoctorProfileModel> get doctorProfilesList => _doctorProfilesList;
Future selectDeviceImei(imei) async {
try {
await baseAppClient.post(SELECT_DEVICE_IMEI,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(SELECT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) {
_imeiDetails = [];
response['List_DoctorDeviceDetails'].forEach((v) {
_imeiDetails.add(GetIMEIDetailsModel.fromJson(v));
@ -49,7 +50,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
@ -57,8 +58,7 @@ class AuthenticationService extends BaseService {
hasError = false;
_loginInfo = NewLoginInformationModel();
try {
await baseAppClient.post(LOGIN_URL,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(LOGIN_URL, onSuccess: (dynamic response, int statusCode) {
_loginInfo = NewLoginInformationModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
@ -66,9 +66,8 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async {
@ -77,88 +76,81 @@ class AuthenticationService extends BaseService {
try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN,
onSuccess: (dynamic response, int statusCode) {
_activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: activationCodeModel.toJson());
_activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel)async {
Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel) async {
hasError = false;
_activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel();
try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP,
onSuccess: (dynamic response, int statusCode) {
_activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: activationCodeModel.toJson());
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP, onSuccess: (dynamic response, int statusCode) {
_activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: activationCodeModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel)async {
Future checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel) async {
hasError = false;
_checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel();
try {
await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP,
onSuccess: (dynamic response, int statusCode) {
_checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: checkActivationCodeRequestModel.toJson());
await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP, onSuccess: (dynamic response, int statusCode) {
_checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: checkActivationCodeRequestModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel)async {
Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel) async {
hasError = false;
// insertIMEIDetailsModel.tokenID = "@dm!n";
// insertIMEIDetailsModel.tokenID = "@dm!n";
_insertDeviceImeiRes = {};
try {
await baseAppClient.post(INSERT_DEVICE_IMEI,
onSuccess: (dynamic response, int statusCode) {
_insertDeviceImeiRes = response;
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: insertIMEIDetailsModel.toJson());
await baseAppClient.post(INSERT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) {
_insertDeviceImeiRes = response;
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: insertIMEIDetailsModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel)async {
Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel) async {
hasError = false;
try {
await baseAppClient.post(GET_DOC_PROFILES,
onSuccess: (dynamic response, int statusCode) {
_doctorProfilesList.clear();
response['DoctorProfileList'].forEach((v) {
_doctorProfilesList.add(DoctorProfileModel.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: profileReqModel.toJson());
await baseAppClient.post(GET_DOC_PROFILES, onSuccess: (dynamic response, int statusCode) {
_doctorProfilesList.clear();
response['DoctorProfileList'].forEach((v) {
_doctorProfilesList.add(DoctorProfileModel.fromJson(v));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: profileReqModel.toJson());
} catch (error) {
hasError = true;
super.error = error;
super.error = error as String?;
}
}
}

@ -6,33 +6,29 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService {
String error;
String ?error;
bool hasError = false;
BaseAppClient baseAppClient = BaseAppClient();
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
DoctorProfileModel doctorProfile;
DoctorProfileModel ?doctorProfile;
List<PatiantInformtion> patientArrivalList = [];
//TODO add the user login model when we need it
Future<DoctorProfileModel> getDoctorProfile({bool isGetProfile = false}) async {
Future<DoctorProfileModel?> ? getDoctorProfile({bool isGetProfile = false}) async {
if(isGetProfile)
{
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
doctorProfile = DoctorProfileModel.fromJson(profile);
if (doctorProfile != null) {
return doctorProfile;
}
Map<String, dynamic> profile = await sharedPref.getObj(DOCTOR_PROFILE);
doctorProfile = DoctorProfileModel.fromJson(profile);
if (doctorProfile != null) {
return doctorProfile!;
}
}
if (doctorProfile == null) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) {
doctorProfile = DoctorProfileModel.fromJson(profile);
if (doctorProfile != null) {
return doctorProfile;
}
Map<String, dynamic> profile = await sharedPref.getObj(DOCTOR_PROFILE);
doctorProfile = DoctorProfileModel.fromJson(profile);
if (doctorProfile != null) {
return doctorProfile!;
}
return null;
} else {
@ -40,7 +36,7 @@ class BaseService {
}
}
Future getPatientArrivalList(String date,{String fromDate, int patientMrn = -1, int appointmentNo = -1}) async{
Future getPatientArrivalList(String date,{String? fromDate, int patientMrn = -1, int appointmentNo = -1}) async{
hasError = false;
Map<String, dynamic> body = Map();
body['From'] = fromDate == null ? date : fromDate;

@ -9,7 +9,7 @@ class DashboardService extends BaseService {
bool hasVirtualClinic = false;
String sServiceID;
String ?sServiceID;
Future getDashboard() async {
hasError = false;

@ -4,15 +4,15 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class ScanQrService extends BaseService {
List<PatiantInformtion> myInPatientList = List();
List<PatiantInformtion> inPatientList = List();
List<PatiantInformtion> myInPatientList = [];
List<PatiantInformtion> inPatientList = [];
Future getInPatient(PatientSearchRequestModel requestModel, bool isMyInpatient) async {
hasError = false;
await getDoctorProfile();
if (isMyInpatient) {
requestModel.doctorID = doctorProfile.doctorID;
requestModel.doctorID = doctorProfile!.doctorID!;
} else {
requestModel.doctorID = 0;
}
@ -26,7 +26,7 @@ class ScanQrService extends BaseService {
response['List_MyInPatient'].forEach((v) {
PatiantInformtion patient = PatiantInformtion.fromJson(v);
inPatientList.add(patient);
if (patient.doctorId == doctorProfile.doctorID) {
if (patient.doctorId == doctorProfile!.doctorID!) {
myInPatientList.add(patient);
}
});

@ -4,8 +4,7 @@ import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_m
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class HospitalsService extends BaseService {
List<GetHospitalsResponseModel> hospitals =List();
List<GetHospitalsResponseModel> hospitals = [];
Future getHospitals(GetHospitalsRequestModel getHospitalsRequestModel) async {
hasError = false;

@ -4,15 +4,15 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class DischargedPatientService extends BaseService {
List<PatiantInformtion> myDischargedPatients = List();
List<PatiantInformtion> myDischargedPatients = [];
List<DischargeReferralPatient> myDischargeReferralPatients = List();
List<DischargeReferralPatient> myDischargeReferralPatients = [];
Future getDischargedPatient() async {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0";
body['MiddleName'] = "0";
body['LastName'] = "0";
@ -28,8 +28,7 @@ class DischargedPatientService extends BaseService {
body['PatientTypeID'] = 1;
hasError = false;
myDischargedPatients.clear();
await baseAppClient.post(GET_DISCHARGE_PATIENT,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(GET_DISCHARGE_PATIENT, onSuccess: (dynamic response, int statusCode) {
if (response['List_MyDischargePatient'] != null) {
response['List_MyDischargePatient'].forEach((v) {
myDischargedPatients.add(PatiantInformtion.fromJson(v));
@ -45,7 +44,7 @@ class DischargedPatientService extends BaseService {
hasError = false;
Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0";
body['MiddleName'] = "0";
body['LastName'] = "0";
@ -61,8 +60,7 @@ class DischargedPatientService extends BaseService {
body['PatientTypeID'] = 1;
hasError = false;
myDischargeReferralPatients.clear();
await baseAppClient.post(GET_MY_DISCHARGE_PATIENT,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(GET_MY_DISCHARGE_PATIENT, onSuccess: (dynamic response, int statusCode) {
if (response['List_MyDischargeReferralPatient'] != null) {
response['List_MyDischargeReferralPatient'].forEach((v) {
myDischargeReferralPatients.add(DischargeReferralPatient.fromJson(v));

@ -30,8 +30,7 @@ class LiveCarePatientServices extends BaseService {
var transferToAdminResponse = {};
var isLoginResponse = {};
StartCallRes _startCallRes;
late StartCallRes _startCallRes;
StartCallRes get startCallRes => _startCallRes;
Future getPendingPatientERForDoctorApp(
@ -83,8 +82,7 @@ class LiveCarePatientServices extends BaseService {
super.error = error;
}, body: {
"VC_ID": vcID,
"AltServiceList": altServiceList,
"generalid":GENERAL_ID
"AltServiceList": altServiceList,"generalid": GENERAL_ID
}, isLiveCare: _isLive);
}
@ -108,17 +106,17 @@ class LiveCarePatientServices extends BaseService {
onSuccess: (dynamic response, int statusCode) {
transferToAdminResponse = response;
}, onFailure: (String error, int statusCode) {
hasError = true;
hasError =true;
super.error = error;
}, body: {
"VC_ID": vcID, "generalid": GENERAL_ID
}, isLiveCare: _isLive);
}
Future isLogin({LiveCareUserLoginRequestModel isLoginRequestModel, int loginStatus}) async {
Future isLogin({LiveCareUserLoginRequestModel? isLoginRequestModel, int? loginStatus}) async {
hasError = false;
await getDoctorProfile( );
isLoginRequestModel.doctorId = super.doctorProfile.doctorID;
isLoginRequestModel!.doctorId = super.doctorProfile!.doctorID!;
await baseAppClient.post(LIVE_CARE_IS_LOGIN, onSuccess: (response, statusCode) async {
isLoginResponse = response;
}, onFailure: (String error, int statusCode) {

@ -6,14 +6,14 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart';
class MyReferralInPatientService extends BaseService {
List<MyReferralPatientModel> myReferralPatients = List();
List<MyReferralPatientModel> myReferralPatients = [];
Future getMyReferralPatientService() async {
hasError = false;
await getDoctorProfile();
MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel(
doctorID: doctorProfile.doctorID,
doctorID: doctorProfile!.doctorID!,
firstName: "0",
middleName: "0",
lastName: "0",
@ -48,7 +48,7 @@ class MyReferralInPatientService extends BaseService {
await getDoctorProfile();
MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel(
doctorID: doctorProfile.doctorID,
doctorID: doctorProfile!.doctorID!,
firstName: "0",
middleName: "0",
lastName: "0",
@ -82,13 +82,13 @@ class MyReferralInPatientService extends BaseService {
hasError = false;
await getDoctorProfile();
RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks();
_requestAddReferredDoctorRemarks.projectID = referral.projectID;
_requestAddReferredDoctorRemarks.projectID = referral.projectID!;
_requestAddReferredDoctorRemarks.admissionNo = referral.admissionNo.toString();
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID;
_requestAddReferredDoctorRemarks.patientID = referral.patientID;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.patientID = referral.patientID!;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor!;
await baseAppClient.post(
ADD_REFERRED_DOCTOR_REMARKS,
body: _requestAddReferredDoctorRemarks.toJson(),
@ -104,15 +104,15 @@ class MyReferralInPatientService extends BaseService {
hasError = false;
await getDoctorProfile();
AddReferredRemarksRequestModel _requestAddReferredDoctorRemarks = AddReferredRemarksRequestModel(
editedBy: doctorProfile.doctorID,
projectID: doctorProfile.projectID,
editedBy: doctorProfile!.doctorID!,
projectID: doctorProfile!.projectID!,
referredDoctorRemarks: referredDoctorRemarks,
referalStatus: referalStatus);
_requestAddReferredDoctorRemarks.projectID = referral.projectID;
_requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo);
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.projectID = referral.projectID!;
_requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo!);
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.referalStatus = referalStatus;
// _requestAddReferredDoctorRemarks.patientID = referral.patientID;

@ -3,16 +3,15 @@ import 'package:doctor_app_flutter/core/model/patient_muse/PatientMuseResultsMod
import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class PatientMuseService extends BaseService {
List<PatientMuseResultsModel> patientMuseResultsModelList = List();
List<PatientMuseResultsModel> patientMuseResultsModelList = [];
getECGPatient({int patientType, int patientOutSA, int patientID}) async {
getECGPatient({int? patientType, int? patientOutSA, int? patientID}) async {
Map<String, dynamic> body = Map();
body['PatientType'] = patientType == 7 ? 1 : patientType;
body['PatientOutSA'] = patientOutSA;
body['PatientID'] = patientID;
hasError = false;
await baseAppClient.post(GET_ECG,
onSuccess: (dynamic response, int statusCode) {
await baseAppClient.post(GET_ECG, onSuccess: (dynamic response, int statusCode) {
patientMuseResultsModelList.clear();
response['HIS_GetPatientMuseResultsList'].forEach((v) {
patientMuseResultsModelList.add(PatientMuseResultsModel.fromJson(v));

@ -4,16 +4,16 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class ReferralService extends BaseService {
Future referralPatient(
{int admissionNo,
String roomID,
int referralClinic,
int referralDoctor,
int patientID,
int patientTypeID,
int priority,
int frequency,
String referringDoctorRemarks,
String extension}) async {
{int? admissionNo,
String? roomID,
int? referralClinic,
int? referralDoctor,
int? patientID,
int? patientTypeID,
int? priority,
int? frequency,
String? referringDoctorRemarks,
String? extension}) async {
await getDoctorProfile();
ReferralRequest referralRequest = ReferralRequest();
referralRequest.admissionNo = admissionNo;
@ -25,11 +25,11 @@ class ReferralService extends BaseService {
referralRequest.priority = priority.toString();
referralRequest.frequency = frequency.toString();
referralRequest.referringDoctorRemarks = referringDoctorRemarks;
referralRequest.referringClinic = doctorProfile.clinicID;
referralRequest.referringDoctor = doctorProfile.doctorID;
referralRequest.referringClinic = doctorProfile!.clinicID;
referralRequest.referringDoctor = doctorProfile!.doctorID;
referralRequest.extension = extension;
referralRequest.editedBy = doctorProfile.doctorID;
referralRequest.createdBy = doctorProfile.doctorID;
referralRequest.editedBy = doctorProfile!.doctorID;
referralRequest.createdBy = doctorProfile!.doctorID;
referralRequest.patientOutSA = false;
await baseAppClient.post(

@ -14,7 +14,7 @@ import '../base/lookup-service.dart';
class PatientReferralService extends LookupService {
List<dynamic> projectsList = [];
List<dynamic> clinicsList = [];
List<ClinicDoctor> doctorsList = List();
List<ClinicDoctor> doctorsList = [];
List<MyReferredPatientModel> listMyReferredPatientModel = [];
List<PendingReferral> pendingReferralList = [];
List<PendingReferral> patientReferralList = [];
@ -56,8 +56,7 @@ class PatientReferralService extends LookupService {
Map<String, dynamic> body = Map();
body['isSameBranch'] = false;
await baseAppClient.post(GET_REFERRAL_FACILITIES,
onSuccess: (response, statusCode) async {
await baseAppClient.post(GET_REFERRAL_FACILITIES, onSuccess: (response, statusCode) async {
projectsList = response['ProjectInfo'];
}, onFailure: (String error, int statusCode) {
hasError = true;
@ -84,8 +83,7 @@ class PatientReferralService extends LookupService {
Future getClinicsList(int projectId) async {
hasError = false;
ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest();
ClinicByProjectIdRequest _clinicByProjectIdRequest = ClinicByProjectIdRequest();
_clinicByProjectIdRequest.projectID = projectId;
await baseAppClient.post(
@ -103,11 +101,9 @@ class PatientReferralService extends LookupService {
);
}
Future getDoctorsList(
PatiantInformtion patient, int clinicId, int branchId) async {
Future getDoctorsList(PatiantInformtion patient, int clinicId, int branchId) async {
hasError = false;
DoctorsByClinicIdRequest _doctorsByClinicIdRequest =
DoctorsByClinicIdRequest();
DoctorsByClinicIdRequest _doctorsByClinicIdRequest = DoctorsByClinicIdRequest();
_doctorsByClinicIdRequest.projectID = branchId;
_doctorsByClinicIdRequest.clinicID = clinicId;
@ -128,9 +124,8 @@ class PatientReferralService extends LookupService {
Future getMyReferredPatient() async {
hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile();
RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post(
GET_MY_REFERRED_PATIENT,
@ -140,8 +135,7 @@ class PatientReferralService extends LookupService {
response['List_MyReferredPatient'].forEach((v) {
MyReferredPatientModel item = MyReferredPatientModel.fromJson(v);
if (doctorProfile != null) {
item.isReferralDoctorSameBranch =
doctorProfile.projectID == item.projectID;
item.isReferralDoctorSameBranch = doctorProfile.projectID == item.projectID;
} else {
item.isReferralDoctorSameBranch = false;
}
@ -161,7 +155,7 @@ class PatientReferralService extends LookupService {
hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post(
GET_MY_REFERRED_OUT_PATIENT,
@ -189,10 +183,10 @@ class PatientReferralService extends LookupService {
Future getPendingReferralList() async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
Map<String, dynamic> body = Map();
// body['ClinicID'] = 0;
body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile!.doctorID;
await baseAppClient.post(
GET_PENDING_REFERRAL_PATIENT,
@ -201,8 +195,7 @@ class PatientReferralService extends LookupService {
response['PendingReferralList'].forEach((v) {
PendingReferral item = PendingReferral.fromJson(v);
item.isReferralDoctorSameBranch =
item.targetProjectId == item.sourceProjectId;
item.isReferralDoctorSameBranch = item.targetProjectId == item.sourceProjectId;
pendingReferralList.add(item);
});
},
@ -227,8 +220,7 @@ class PatientReferralService extends LookupService {
response['ReferralList']['entityList'].forEach((v) {
PendingReferral item = PendingReferral.fromJson(v);
item.isReferralDoctorSameBranch =
item.targetProjectId == item.sourceProjectId;
item.isReferralDoctorSameBranch = item.targetProjectId == item.sourceProjectId;
patientReferralList.add(item);
});
},
@ -241,10 +233,9 @@ class PatientReferralService extends LookupService {
);
}
Future responseReferral(
PendingReferral pendingReferral, bool isAccepted) async {
Future responseReferral(PendingReferral pendingReferral, bool isAccepted) async {
hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile();
DoctorProfileModel? doctorProfile = await getDoctorProfile();
Map<String, dynamic> body = Map();
body['PatientMRN'] = pendingReferral.patientID;
@ -254,7 +245,7 @@ class PatientReferralService extends LookupService {
body['IsAccepted'] = isAccepted;
body['PatientName'] = pendingReferral.patientName;
body['ReferralResponse'] = pendingReferral.remarksFromSource;
body['DoctorName'] = doctorProfile.doctorName;
body['DoctorName'] = doctorProfile!.doctorName;
await baseAppClient.post(
RESPONSE_PENDING_REFERRAL_PATIENT,
@ -269,15 +260,14 @@ class PatientReferralService extends LookupService {
);
}
Future makeReferral(PatiantInformtion patient, String isoStringDate,
int projectID, int clinicID, int doctorID, String remarks) async {
Future makeReferral(PatiantInformtion patient, String isoStringDate, int projectID, int clinicID, int doctorID,
String remarks) async {
hasError = false;
Map<String, dynamic> body = Map();
List<dynamic> physiotheraphyGoalsList = [];
listOfPhysiotherapyGoals.forEach((element) {
physiotheraphyGoalsList
.add({"goalId": element.id, "remarks": element.remarks});
physiotheraphyGoalsList.add({"goalId": element.id, "remarks": element.remarks});
});
body['PatientMRN'] = patient.patientMRN ?? patient.patientId;
@ -326,8 +316,7 @@ class PatientReferralService extends LookupService {
);
}
Future verifyReferralDoctorRemarks(
MyReferredPatientModel referredPatient) async {
Future verifyReferralDoctorRemarks(MyReferredPatientModel referredPatient) async {
hasError = false;
Map<String, dynamic> body = Map();

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

Loading…
Cancel
Save