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 { 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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.2' 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 distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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 = ( files = (
); );
inputPaths = ( 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"; name = "[CP] Embed Pods Frameworks";
outputPaths = ( 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; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;

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

@ -10,12 +10,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart'; import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget { class UpdatePage extends StatelessWidget {
final String message; final String? message;
final String androidLink; final String? androidLink;
final String iosLink; final String? iosLink;
const UpdatePage({Key key, this.message, this.androidLink, this.iosLink}) const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink}) : super(key: key);
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -30,18 +29,27 @@ class UpdatePage extends StatelessWidget {
children: [ children: [
Image.asset( Image.asset(
'assets/images/update_rocket_image.png', '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'), Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,), SizedBox(
height: 8,
),
AppText( AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17, TranslationBase.of(context).updateTheApp!.toUpperCase(),
fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox(height: 12,), SizedBox(
height: 12,
),
Padding( Padding(
padding: const EdgeInsets.all(8.0), 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), // padding: const EdgeInsets.all(8.0),
margin: EdgeInsets.all(15), margin: EdgeInsets.all(15),
child: SecondaryButton( child: SecondaryButton(
color: Colors.red[800], color: Colors.red[800]!,
onTap: () { onTap: () {
if (Platform.isIOS) if (Platform.isIOS)
launch(iosLink); launch(iosLink!);
else 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 { class BaseAppClient {
//TODO change the post fun to nun static when you change all service //TODO change the post fun to nun static when you change all service
post(String endPoint, post(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
bool isAllowAny = false,bool isLiveCare = false}) async { bool isAllowAny = false,
bool isLiveCare = false}) async {
String url; String url;
if(isLiveCare) if (isLiveCare)
url = BASE_URL_LIVE_CARE + endPoint; url = BASE_URL_LIVE_CARE + endPoint;
else else
url = BASE_URL + endPoint; url = BASE_URL + endPoint;
bool callLog = true; bool callLog = true;
try { try {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map<String, dynamic>? profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
DoctorProfileModel? doctorProfile;
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); doctorProfile = DoctorProfileModel.fromJson(profile);
if (body['DoctorID'] == null) if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile.doctorID;
body['DoctorID'] = doctorProfile?.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['DoctorID'] == "") body['DoctorID'] = null;
if (body['EditedBy'] == null) if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID;
body['EditedBy'] = doctorProfile?.doctorID;
if (body['ProjectID'] == null) { if (body['ProjectID'] == null) {
body['ProjectID'] = doctorProfile?.projectID; body['ProjectID'] = doctorProfile?.projectID;
} }
if (body['ClinicID'] == null) if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile?.clinicID;
body['ClinicID'] = doctorProfile?.clinicID; if (body['DoctorID'] == '') {
} body['DoctorID'] = null;
if (body['DoctorID'] == '') { }
body['DoctorID'] = null; if (body['EditedBy'] == '') {
} body.remove("EditedBy");
if (body['EditedBy'] == '') { }
body.remove("EditedBy");
} }
if(body['TokenID'] == null){ if (body['TokenID'] == null) {
body['TokenID'] = token ?? ''; body['TokenID'] = token ?? '';
} }
// body['TokenID'] = "@dm!n" ?? ''; // body['TokenID'] = "@dm!n" ?? '';
@ -75,18 +74,16 @@ class BaseAppClient {
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP; body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA; body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
if (body['VidaAuthTokenID'] == null) { if (body['VidaAuthTokenID'] == null) {
body['VidaAuthTokenID'] = body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
} }
if (body['VidaRefreshTokenID'] == null) { if (body['VidaRefreshTokenID'] == null) {
body['VidaRefreshTokenID'] = body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
} }
int projectID = await sharedPref.getInt(PROJECT_ID); int projectID = await sharedPref.getInt(PROJECT_ID);
if (projectID == 2 || projectID == 3) if (projectID == 2 || projectID == 3)
body['PatientOutSA'] = true; body['PatientOutSA'] = true;
else if(body.containsKey('facilityId') && body['facilityId']==2 || body['facilityId']==3) else if (body.containsKey('facilityId') && body['facilityId'] == 2 || body['facilityId'] == 3)
body['PatientOutSA'] = true; body['PatientOutSA'] = true;
else else
body['PatientOutSA'] = false; body['PatientOutSA'] = false;
@ -97,30 +94,22 @@ class BaseAppClient {
var asd = json.encode(body); var asd = json.encode(body);
var asd2; var asd2;
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url, final response = await http.post(Uri.parse(url),
body: json.encode(body), body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'});
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json'
});
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode); onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) { if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) { if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) { } else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout();
listen: false)
.logout();
Helpers.showErrorToast('Your session expired Please login again'); Helpers.showErrorToast('Your session expired Please login again');
locator<NavigationService>().pushNamedAndRemoveUntil(ROOT); locator<NavigationService>().pushNamedAndRemoveUntil(ROOT);
} }
@ -146,22 +135,18 @@ class BaseAppClient {
} }
postPatient(String endPoint, postPatient(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, required Function(dynamic response, int statusCode) onSuccess,
Function(String error, int statusCode) onFailure, required Function(String error, int statusCode) onFailure,
@required PatiantInformtion patient, PatiantInformtion? patient,
bool isExternal = false}) async { bool isExternal = false}) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
try { try {
Map<String, String> headers = { Map<String, String> headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
'Content-Type': 'application/json',
'Accept': 'application/json'
};
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
var languageID = var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID') body['SetupID'] = body.containsKey('SetupID')
? body['SetupID'] != null ? body['SetupID'] != null
? body['SetupID'] ? body['SetupID']
@ -181,12 +166,11 @@ class BaseAppClient {
: PATIENT_OUT_SA_PATIENT_REQ; : PATIENT_OUT_SA_PATIENT_REQ;
if (body.containsKey('isDentalAllowedBackend')) { if (body.containsKey('isDentalAllowedBackend')) {
body['isDentalAllowedBackend'] = body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
body.containsKey('isDentalAllowedBackend') ? body['isDentalAllowedBackend'] != null
? body['isDentalAllowedBackend'] != null ? body['isDentalAllowedBackend']
? body['isDentalAllowedBackend'] : IS_DENTAL_ALLOWED_BACKEND
: IS_DENTAL_ALLOWED_BACKEND : IS_DENTAL_ALLOWED_BACKEND;
: IS_DENTAL_ALLOWED_BACKEND;
} }
body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2; body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@ -194,7 +178,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] != null
? body['PatientType'] ? body['PatientType']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE : PATIENT_TYPE
: PATIENT_TYPE; : PATIENT_TYPE;
@ -202,15 +186,13 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token; body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
body['PatientID'] = body['PatientID'] != null body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
? body['PatientID']
: patient.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe body['SessionID'] = SESSION_ID; //getSe
@ -225,8 +207,7 @@ class BaseAppClient {
print("Body : ${json.encode(body)}"); print("Body : ${json.encode(body)}");
if (await Helpers.checkConnection()) { if (await Helpers.checkConnection()) {
final response = await http.post(url.trim(), final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers);
body: json.encode(body), headers: headers);
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
@ -238,8 +219,7 @@ class BaseAppClient {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
parsed['AndroidLink'], parsed['IOSLink']);
} }
if (parsed['IsAuthenticated'] == null) { if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) { if (parsed['isSMSSent'] == true) {
@ -255,28 +235,20 @@ class BaseAppClient {
onFailure(getError(parsed), statusCode); onFailure(getError(parsed), statusCode);
} }
} }
} else if (parsed['MessageStatus'] == 1 || } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 && } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess(parsed, statusCode);
} else { } else {
if (parsed['message'] == null && if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) { if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message", onFailure("Server Error found with no available message", statusCode);
statusCode);
} else { } else {
onFailure(parsed['ErrorSearchMsg'], statusCode); onFailure(parsed['ErrorSearchMsg'], statusCode);
} }
} else { } else {
onFailure( onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['message'] ??
parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'],
statusCode);
} }
} }
} else { } else {
@ -286,9 +258,7 @@ class BaseAppClient {
if (parsed['message'] != null) { if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode); onFailure(parsed['message'] ?? parsed['message'], statusCode);
} else { } else {
onFailure( onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode);
} }
} }
} }
@ -311,12 +281,8 @@ class BaseAppClient {
if (parsed["ValidationErrors"]["ValidationErrors"] != null && if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
parsed["ValidationErrors"]["ValidationErrors"].length != 0) { parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
for (var i = 0; for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) {
i < parsed["ValidationErrors"]["ValidationErrors"].length; error = error + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n";
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_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://uat.hmgwebservices.com/'; const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh"; const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient"; const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -17,28 +17,29 @@ class AuthenticationService extends BaseService {
List<GetIMEIDetailsModel> get dashboardItemsList => _imeiDetails; List<GetIMEIDetailsModel> get dashboardItemsList => _imeiDetails;
NewLoginInformationModel _loginInfo = NewLoginInformationModel(); NewLoginInformationModel _loginInfo = NewLoginInformationModel();
NewLoginInformationModel get loginInfo => _loginInfo; 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; SendActivationCodeForDoctorAppResponseModel get activationCodeForDoctorAppRes => _activationCodeForDoctorAppRes;
CheckActivationCodeForDoctorAppResponseModel _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel(); CheckActivationCodeForDoctorAppResponseModel _checkActivationCodeForDoctorAppRes =
CheckActivationCodeForDoctorAppResponseModel();
CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes => _checkActivationCodeForDoctorAppRes; CheckActivationCodeForDoctorAppResponseModel get checkActivationCodeForDoctorAppRes =>
_checkActivationCodeForDoctorAppRes;
Map<String, dynamic> _insertDeviceImeiRes = {}; Map<String, dynamic> _insertDeviceImeiRes = {};
List<DoctorProfileModel> _doctorProfilesList = []; List<DoctorProfileModel> _doctorProfilesList = [];
List<DoctorProfileModel> get doctorProfilesList => _doctorProfilesList; List<DoctorProfileModel> get doctorProfilesList => _doctorProfilesList;
Future selectDeviceImei(imei) async { Future selectDeviceImei(imei) async {
try { try {
await baseAppClient.post(SELECT_DEVICE_IMEI, await baseAppClient.post(SELECT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
_imeiDetails = []; _imeiDetails = [];
response['List_DoctorDeviceDetails'].forEach((v) { response['List_DoctorDeviceDetails'].forEach((v) {
_imeiDetails.add(GetIMEIDetailsModel.fromJson(v)); _imeiDetails.add(GetIMEIDetailsModel.fromJson(v));
@ -49,7 +50,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"}); }, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
@ -57,8 +58,7 @@ class AuthenticationService extends BaseService {
hasError = false; hasError = false;
_loginInfo = NewLoginInformationModel(); _loginInfo = NewLoginInformationModel();
try { try {
await baseAppClient.post(LOGIN_URL, await baseAppClient.post(LOGIN_URL, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
_loginInfo = NewLoginInformationModel.fromJson(response); _loginInfo = NewLoginInformationModel.fromJson(response);
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
@ -66,9 +66,8 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson()); }, body: userInfo.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async { Future sendActivationCodeVerificationScreen(ActivationCodeForVerificationScreenModel activationCodeModel) async {
@ -77,88 +76,81 @@ class AuthenticationService extends BaseService {
try { try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN, await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response); _activationCodeVerificationScreenRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: activationCodeModel.toJson()); }, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel)async { Future sendActivationCodeForDoctorApp(ActivationCodeModel activationCodeModel) async {
hasError = false; hasError = false;
_activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel(); _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel();
try { try {
await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP, await baseAppClient.post(SEND_ACTIVATION_CODE_FOR_DOCTOR_APP, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) { _activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response);
_activationCodeForDoctorAppRes = SendActivationCodeForDoctorAppResponseModel.fromJson(response); }, onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) { hasError = true;
hasError = true; super.error = error;
super.error = error; }, body: activationCodeModel.toJson());
}, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel)async { Future checkActivationCodeForDoctorApp(CheckActivationCodeRequestModel checkActivationCodeRequestModel) async {
hasError = false; hasError = false;
_checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel(); _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel();
try { try {
await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP, await baseAppClient.post(CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) { _checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel.fromJson(response);
_checkActivationCodeForDoctorAppRes = CheckActivationCodeForDoctorAppResponseModel.fromJson(response); }, onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) { hasError = true;
hasError = true; super.error = error;
super.error = error; }, body: checkActivationCodeRequestModel.toJson());
}, body: checkActivationCodeRequestModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel) async {
Future insertDeviceImei(InsertIMEIDetailsModel insertIMEIDetailsModel)async {
hasError = false; hasError = false;
// insertIMEIDetailsModel.tokenID = "@dm!n"; // insertIMEIDetailsModel.tokenID = "@dm!n";
_insertDeviceImeiRes = {}; _insertDeviceImeiRes = {};
try { try {
await baseAppClient.post(INSERT_DEVICE_IMEI, await baseAppClient.post(INSERT_DEVICE_IMEI, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) { _insertDeviceImeiRes = response;
_insertDeviceImeiRes = response; }, onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) { hasError = true;
hasError = true; super.error = error;
super.error = error; }, body: insertIMEIDetailsModel.toJson());
}, body: insertIMEIDetailsModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error as String?;
} }
} }
Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel)async { Future getDoctorProfileBasedOnClinic(ProfileReqModel profileReqModel) async {
hasError = false; hasError = false;
try { try {
await baseAppClient.post(GET_DOC_PROFILES, await baseAppClient.post(GET_DOC_PROFILES, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) { _doctorProfilesList.clear();
_doctorProfilesList.clear(); response['DoctorProfileList'].forEach((v) {
response['DoctorProfileList'].forEach((v) { _doctorProfilesList.add(DoctorProfileModel.fromJson(v));
_doctorProfilesList.add(DoctorProfileModel.fromJson(v)); });
}); }, onFailure: (String error, int statusCode) {
}, onFailure: (String error, int statusCode) { hasError = true;
hasError = true; super.error = error;
super.error = error; }, body: profileReqModel.toJson());
}, body: profileReqModel.toJson());
} catch (error) { } catch (error) {
hasError = true; 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'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
class BaseService { class BaseService {
String error; String ?error;
bool hasError = false; bool hasError = false;
BaseAppClient baseAppClient = BaseAppClient(); BaseAppClient baseAppClient = BaseAppClient();
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
DoctorProfileModel doctorProfile; DoctorProfileModel ?doctorProfile;
List<PatiantInformtion> patientArrivalList = []; List<PatiantInformtion> patientArrivalList = [];
//TODO add the user login model when we need it //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) if(isGetProfile)
{ {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map<String, dynamic> profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) { doctorProfile = DoctorProfileModel.fromJson(profile);
doctorProfile = DoctorProfileModel.fromJson(profile); if (doctorProfile != null) {
if (doctorProfile != null) { return doctorProfile!;
return doctorProfile;
}
} }
} }
if (doctorProfile == null) { if (doctorProfile == null) {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map<String, dynamic> profile = await sharedPref.getObj(DOCTOR_PROFILE);
if (profile != null) { doctorProfile = DoctorProfileModel.fromJson(profile);
doctorProfile = DoctorProfileModel.fromJson(profile); if (doctorProfile != null) {
if (doctorProfile != null) { return doctorProfile!;
return doctorProfile;
}
} }
return null; return null;
} else { } 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; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['From'] = fromDate == null ? date : fromDate; body['From'] = fromDate == null ? date : fromDate;

@ -9,7 +9,7 @@ class DashboardService extends BaseService {
bool hasVirtualClinic = false; bool hasVirtualClinic = false;
String sServiceID; String ?sServiceID;
Future getDashboard() async { Future getDashboard() async {
hasError = false; 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'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class ScanQrService extends BaseService { class ScanQrService extends BaseService {
List<PatiantInformtion> myInPatientList = List(); List<PatiantInformtion> myInPatientList = [];
List<PatiantInformtion> inPatientList = List(); List<PatiantInformtion> inPatientList = [];
Future getInPatient(PatientSearchRequestModel requestModel, bool isMyInpatient) async { Future getInPatient(PatientSearchRequestModel requestModel, bool isMyInpatient) async {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile();
if (isMyInpatient) { if (isMyInpatient) {
requestModel.doctorID = doctorProfile.doctorID; requestModel.doctorID = doctorProfile!.doctorID!;
} else { } else {
requestModel.doctorID = 0; requestModel.doctorID = 0;
} }
@ -26,7 +26,7 @@ class ScanQrService extends BaseService {
response['List_MyInPatient'].forEach((v) { response['List_MyInPatient'].forEach((v) {
PatiantInformtion patient = PatiantInformtion.fromJson(v); PatiantInformtion patient = PatiantInformtion.fromJson(v);
inPatientList.add(patient); inPatientList.add(patient);
if (patient.doctorId == doctorProfile.doctorID) { if (patient.doctorId == doctorProfile!.doctorID!) {
myInPatientList.add(patient); myInPatientList.add(patient);
} }
}); });

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

@ -30,8 +30,7 @@ class LiveCarePatientServices extends BaseService {
var transferToAdminResponse = {}; var transferToAdminResponse = {};
var isLoginResponse = {}; var isLoginResponse = {};
StartCallRes _startCallRes; late StartCallRes _startCallRes;
StartCallRes get startCallRes => _startCallRes; StartCallRes get startCallRes => _startCallRes;
Future getPendingPatientERForDoctorApp( Future getPendingPatientERForDoctorApp(
@ -83,8 +82,7 @@ class LiveCarePatientServices extends BaseService {
super.error = error; super.error = error;
}, body: { }, body: {
"VC_ID": vcID, "VC_ID": vcID,
"AltServiceList": altServiceList, "AltServiceList": altServiceList,"generalid": GENERAL_ID
"generalid":GENERAL_ID
}, isLiveCare: _isLive); }, isLiveCare: _isLive);
} }
@ -108,17 +106,17 @@ class LiveCarePatientServices extends BaseService {
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
transferToAdminResponse = response; transferToAdminResponse = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError =true;
super.error = error; super.error = error;
}, body: { }, body: {
"VC_ID": vcID, "generalid": GENERAL_ID "VC_ID": vcID, "generalid": GENERAL_ID
}, isLiveCare: _isLive); }, isLiveCare: _isLive);
} }
Future isLogin({LiveCareUserLoginRequestModel isLoginRequestModel, int loginStatus}) async { Future isLogin({LiveCareUserLoginRequestModel? isLoginRequestModel, int? loginStatus}) async {
hasError = false; hasError = false;
await getDoctorProfile( ); await getDoctorProfile( );
isLoginRequestModel.doctorId = super.doctorProfile.doctorID; isLoginRequestModel!.doctorId = super.doctorProfile!.doctorID!;
await baseAppClient.post(LIVE_CARE_IS_LOGIN, onSuccess: (response, statusCode) async { await baseAppClient.post(LIVE_CARE_IS_LOGIN, onSuccess: (response, statusCode) async {
isLoginResponse = response; isLoginResponse = response;
}, onFailure: (String error, int statusCode) { }, 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'; import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart';
class MyReferralInPatientService extends BaseService { class MyReferralInPatientService extends BaseService {
List<MyReferralPatientModel> myReferralPatients = List(); List<MyReferralPatientModel> myReferralPatients = [];
Future getMyReferralPatientService() async { Future getMyReferralPatientService() async {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile();
MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel( MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel(
doctorID: doctorProfile.doctorID, doctorID: doctorProfile!.doctorID!,
firstName: "0", firstName: "0",
middleName: "0", middleName: "0",
lastName: "0", lastName: "0",
@ -48,7 +48,7 @@ class MyReferralInPatientService extends BaseService {
await getDoctorProfile(); await getDoctorProfile();
MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel( MyReferralPatientRequestModel myReferralPatientRequestModel = MyReferralPatientRequestModel(
doctorID: doctorProfile.doctorID, doctorID: doctorProfile!.doctorID!,
firstName: "0", firstName: "0",
middleName: "0", middleName: "0",
lastName: "0", lastName: "0",
@ -82,13 +82,13 @@ class MyReferralInPatientService extends BaseService {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile();
RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks();
_requestAddReferredDoctorRemarks.projectID = referral.projectID; _requestAddReferredDoctorRemarks.projectID = referral.projectID!;
_requestAddReferredDoctorRemarks.admissionNo = referral.admissionNo.toString(); _requestAddReferredDoctorRemarks.admissionNo = referral.admissionNo.toString();
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo; _requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks; _requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID; _requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.patientID = referral.patientID; _requestAddReferredDoctorRemarks.patientID = referral.patientID!;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor; _requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor!;
await baseAppClient.post( await baseAppClient.post(
ADD_REFERRED_DOCTOR_REMARKS, ADD_REFERRED_DOCTOR_REMARKS,
body: _requestAddReferredDoctorRemarks.toJson(), body: _requestAddReferredDoctorRemarks.toJson(),
@ -104,15 +104,15 @@ class MyReferralInPatientService extends BaseService {
hasError = false; hasError = false;
await getDoctorProfile(); await getDoctorProfile();
AddReferredRemarksRequestModel _requestAddReferredDoctorRemarks = AddReferredRemarksRequestModel( AddReferredRemarksRequestModel _requestAddReferredDoctorRemarks = AddReferredRemarksRequestModel(
editedBy: doctorProfile.doctorID, editedBy: doctorProfile!.doctorID!,
projectID: doctorProfile.projectID, projectID: doctorProfile!.projectID!,
referredDoctorRemarks: referredDoctorRemarks, referredDoctorRemarks: referredDoctorRemarks,
referalStatus: referalStatus); referalStatus: referalStatus);
_requestAddReferredDoctorRemarks.projectID = referral.projectID; _requestAddReferredDoctorRemarks.projectID = referral.projectID!;
_requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo); _requestAddReferredDoctorRemarks.admissionNo = int.parse(referral.admissionNo!);
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo; _requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo!;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks; _requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID; _requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID!;
_requestAddReferredDoctorRemarks.referalStatus = referalStatus; _requestAddReferredDoctorRemarks.referalStatus = referalStatus;
// _requestAddReferredDoctorRemarks.patientID = referral.patientID; // _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'; import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class PatientMuseService extends BaseService { 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(); Map<String, dynamic> body = Map();
body['PatientType'] = patientType == 7 ? 1 : patientType; body['PatientType'] = patientType == 7 ? 1 : patientType;
body['PatientOutSA'] = patientOutSA; body['PatientOutSA'] = patientOutSA;
body['PatientID'] = patientID; body['PatientID'] = patientID;
hasError = false; hasError = false;
await baseAppClient.post(GET_ECG, await baseAppClient.post(GET_ECG, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
patientMuseResultsModelList.clear(); patientMuseResultsModelList.clear();
response['HIS_GetPatientMuseResultsList'].forEach((v) { response['HIS_GetPatientMuseResultsList'].forEach((v) {
patientMuseResultsModelList.add(PatientMuseResultsModel.fromJson(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 { class ReferralService extends BaseService {
Future referralPatient( Future referralPatient(
{int admissionNo, {int? admissionNo,
String roomID, String? roomID,
int referralClinic, int? referralClinic,
int referralDoctor, int? referralDoctor,
int patientID, int? patientID,
int patientTypeID, int? patientTypeID,
int priority, int? priority,
int frequency, int? frequency,
String referringDoctorRemarks, String? referringDoctorRemarks,
String extension}) async { String? extension}) async {
await getDoctorProfile(); await getDoctorProfile();
ReferralRequest referralRequest = ReferralRequest(); ReferralRequest referralRequest = ReferralRequest();
referralRequest.admissionNo = admissionNo; referralRequest.admissionNo = admissionNo;
@ -25,11 +25,11 @@ class ReferralService extends BaseService {
referralRequest.priority = priority.toString(); referralRequest.priority = priority.toString();
referralRequest.frequency = frequency.toString(); referralRequest.frequency = frequency.toString();
referralRequest.referringDoctorRemarks = referringDoctorRemarks; referralRequest.referringDoctorRemarks = referringDoctorRemarks;
referralRequest.referringClinic = doctorProfile.clinicID; referralRequest.referringClinic = doctorProfile!.clinicID;
referralRequest.referringDoctor = doctorProfile.doctorID; referralRequest.referringDoctor = doctorProfile!.doctorID;
referralRequest.extension = extension; referralRequest.extension = extension;
referralRequest.editedBy = doctorProfile.doctorID; referralRequest.editedBy = doctorProfile!.doctorID;
referralRequest.createdBy = doctorProfile.doctorID; referralRequest.createdBy = doctorProfile!.doctorID;
referralRequest.patientOutSA = false; referralRequest.patientOutSA = false;
await baseAppClient.post( await baseAppClient.post(

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

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

Loading…
Cancel
Save