diff --git a/android/build.gradle b/android/build.gradle
index 51c49a99..bf0f679d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.0'
+ classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3'
}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bfae97b2..296b146b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jun 13 08:51:58 EEST 2021
+#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index c31cbe8e..66be39bf 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -260,78 +260,9 @@
files = (
);
inputPaths = (
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
- "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
- "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
- "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
- "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
- "${BUILT_PRODUCTS_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework",
- "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework",
- "${BUILT_PRODUCTS_DIR}/FirebaseMessaging/FirebaseMessaging.framework",
- "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
- "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
- "${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
- "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
- "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
- "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
- "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
- "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
- "${BUILT_PRODUCTS_DIR}/Try/Try.framework",
- "${BUILT_PRODUCTS_DIR}/barcode_scan_fix/barcode_scan_fix.framework",
- "${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework",
- "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
- "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework",
- "${BUILT_PRODUCTS_DIR}/flutter_flexible_toast/flutter_flexible_toast.framework",
- "${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
- "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
- "${BUILT_PRODUCTS_DIR}/hexcolor/hexcolor.framework",
- "${BUILT_PRODUCTS_DIR}/imei_plugin/imei_plugin.framework",
- "${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
- "${BUILT_PRODUCTS_DIR}/maps_launcher/maps_launcher.framework",
- "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
- "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
- "${BUILT_PRODUCTS_DIR}/speech_to_text/speech_to_text.framework",
- "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
- "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
- "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
- "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreDiagnostics.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseMessaging.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Try.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan_fix.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_flexible_toast.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hexcolor.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/imei_plugin.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/maps_launcher.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/speech_to_text.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 919434a6..1d526a16 100644
--- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
+ location = "group:Runner.xcodeproj">
diff --git a/lib/UpdatePage.dart b/lib/UpdatePage.dart
index b3202c52..16284ed1 100644
--- a/lib/UpdatePage.dart
+++ b/lib/UpdatePage.dart
@@ -10,11 +10,12 @@ import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget {
- final String? message;
- final String? androidLink;
- final String? iosLink;
+ final String message;
+ final String androidLink;
+ final String iosLink;
- const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink}) : super(key: key);
+ const UpdatePage({Key key, this.message, this.androidLink, this.iosLink})
+ : super(key: key);
@override
Widget build(BuildContext context) {
@@ -29,27 +30,18 @@ class UpdatePage extends StatelessWidget {
children: [
Image.asset(
'assets/images/update_rocket_image.png',
- width: double.maxFinite,
- fit: BoxFit.fill,
+ width: double.maxFinite,fit: BoxFit.fill,
),
Image.asset('assets/images/HMG_logo.png'),
- SizedBox(
- height: 8,
- ),
+ SizedBox(height: 8,),
AppText(
- TranslationBase.of(context).updateTheApp!.toUpperCase(),
- fontSize: 17,
+ TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17,
fontWeight: FontWeight.w600,
),
- SizedBox(
- height: 12,
- ),
+ SizedBox(height: 12,),
Padding(
padding: const EdgeInsets.all(8.0),
- child: AppText(
- message ?? "Update the app",
- fontSize: 12,
- ),
+ child: AppText(message??"Update the app",fontSize: 12,),
)
],
),
@@ -60,14 +52,14 @@ class UpdatePage extends StatelessWidget {
// padding: const EdgeInsets.all(8.0),
margin: EdgeInsets.all(15),
child: SecondaryButton(
- color: Colors.red[800]!,
+ color: Colors.red[800],
onTap: () {
if (Platform.isIOS)
- launch(iosLink!);
+ launch(iosLink);
else
- launch(androidLink!);
+ launch(androidLink);
},
- label: TranslationBase.of(context).updateNow!.toUpperCase(),
+ label: TranslationBase.of(context).updateNow.toUpperCase(),
),
),
),
diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index 1414c78f..af4e6e97 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -22,9 +22,9 @@ Helpers helpers = new Helpers();
class BaseAppClient {
//TODO change the post fun to nun static when you change all service
post(String endPoint,
- {required Map body,
- required Function(dynamic response, int statusCode) onSuccess,
- required Function(String error, int statusCode) onFailure,
+ {Map body,
+ Function(dynamic response, int statusCode) onSuccess,
+ Function(String error, int statusCode) onFailure,
bool isAllowAny = false,
bool isLiveCare = false,
bool isFallLanguage = false}) async {
@@ -36,28 +36,30 @@ class BaseAppClient {
bool callLog = true;
try {
- Map? profile = await sharedPref.getObj(DOCTOR_PROFILE);
+ Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN);
- DoctorProfileModel? doctorProfile;
if (profile != null) {
- doctorProfile = DoctorProfileModel.fromJson(profile);
- if (body['DoctorID'] == null) body['DoctorID'] = doctorProfile.doctorID;
+ DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile);
+ if (body['DoctorID'] == null)
+ body['DoctorID'] = doctorProfile?.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null;
- if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID;
+ if (body['EditedBy'] == null)
+ body['EditedBy'] = doctorProfile?.doctorID;
if (body['ProjectID'] == null) {
- body['ProjectID'] = doctorProfile.projectID;
+ body['ProjectID'] = doctorProfile?.projectID;
}
- if (body['ClinicID'] == null) body['ClinicID'] = doctorProfile.clinicID;
- if (body['DoctorID'] == '') {
- body['DoctorID'] = null;
- }
- if (body['EditedBy'] == '') {
- body.remove("EditedBy");
- }
+ if (body['ClinicID'] == null)
+ body['ClinicID'] = doctorProfile?.clinicID;
+ }
+ if (body['DoctorID'] == '') {
+ body['DoctorID'] = null;
+ }
+ if (body['EditedBy'] == '') {
+ body.remove("EditedBy");
}
if (body['TokenID'] == null) {
- body['TokenID'] = token;
+ body['TokenID'] = token ?? '';
}
// body['TokenID'] = "@dm!n" ?? '';
if (!isFallLanguage) {
@@ -80,10 +82,12 @@ class BaseAppClient {
body['IsLoginForDoctorApp'] = IS_LOGIN_FOR_DOCTOR_APP;
body['PatientOutSA'] = body['PatientOutSA'] ?? 0; // PATIENT_OUT_SA;
if (body['VidaAuthTokenID'] == null) {
- body['VidaAuthTokenID'] = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
+ body['VidaAuthTokenID'] =
+ await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
}
if (body['VidaRefreshTokenID'] == null) {
- body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
+ body['VidaRefreshTokenID'] =
+ await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
}
int projectID = await sharedPref.getInt(PROJECT_ID);
@@ -103,22 +107,30 @@ class BaseAppClient {
var asd = json.encode(body);
var asd2;
if (await Helpers.checkConnection()) {
- final response = await http.post(Uri.parse(url),
- body: json.encode(body), headers: {'Content-Type': 'application/json', 'Accept': 'application/json'});
+ final response = await http.post(url,
+ body: json.encode(body),
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json'
+ });
final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode);
} else {
var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) {
- helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
+ helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
+ parsed['AndroidLink'], parsed['IOSLink']);
}
if (parsed['IsAuthenticated'] != null && !parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode);
} else if (!isAllowAny) {
- await Provider.of(AppGlobal.CONTEX, listen: false).logout();
+ await Provider.of(AppGlobal.CONTEX,
+ listen: false)
+ .logout();
+
Helpers.showErrorToast('Your session expired Please login again');
locator().pushNamedAndRemoveUntil(ROOT);
}
@@ -144,18 +156,22 @@ class BaseAppClient {
}
postPatient(String endPoint,
- {required Map body,
- required Function(dynamic response, int statusCode) onSuccess,
- required Function(String error, int statusCode) onFailure,
- PatiantInformtion? patient,
+ {Map body,
+ Function(dynamic response, int statusCode) onSuccess,
+ Function(String error, int statusCode) onFailure,
+ @required PatiantInformtion patient,
bool isExternal = false}) async {
String url = BASE_URL + endPoint;
try {
- Map headers = {'Content-Type': 'application/json', 'Accept': 'application/json'};
+ Map headers = {
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json'
+ };
String token = await sharedPref.getString(TOKEN);
- var languageID = await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
+ var languageID =
+ await sharedPref.getStringWithDefaultValue(APP_Language, 'en');
body['SetupID'] = body.containsKey('SetupID')
? body['SetupID'] != null
? body['SetupID']
@@ -175,11 +191,12 @@ class BaseAppClient {
: PATIENT_OUT_SA_PATIENT_REQ;
if (body.containsKey('isDentalAllowedBackend')) {
- body['isDentalAllowedBackend'] = body.containsKey('isDentalAllowedBackend')
- ? body['isDentalAllowedBackend'] != null
- ? body['isDentalAllowedBackend']
- : IS_DENTAL_ALLOWED_BACKEND
- : IS_DENTAL_ALLOWED_BACKEND;
+ body['isDentalAllowedBackend'] =
+ body.containsKey('isDentalAllowedBackend')
+ ? body['isDentalAllowedBackend'] != null
+ ? body['isDentalAllowedBackend']
+ : IS_DENTAL_ALLOWED_BACKEND
+ : IS_DENTAL_ALLOWED_BACKEND;
}
body['DeviceTypeID'] = Platform.isAndroid ? 1 : 2;
@@ -187,7 +204,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null
? body['PatientType']
- : patient!.patientType != null
+ : patient.patientType != null
? patient.patientType
: PATIENT_TYPE
: PATIENT_TYPE;
@@ -195,13 +212,15 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null
? body['PatientTypeID']
- : patient!.patientType != null
+ : patient.patientType != null
? patient.patientType
: PATIENT_TYPE_ID
: PATIENT_TYPE_ID;
body['TokenID'] = body.containsKey('TokenID') ? body['TokenID'] : token;
- body['PatientID'] = body['PatientID'] != null ? body['PatientID'] : patient!.patientId ?? patient.patientMRN;
+ body['PatientID'] = body['PatientID'] != null
+ ? body['PatientID']
+ : patient.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe
@@ -217,7 +236,8 @@ class BaseAppClient {
var asd = json.encode(body);
var asd2;
if (await Helpers.checkConnection()) {
- final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers);
+ final response = await http.post(url.trim(),
+ body: json.encode(body), headers: headers);
final int statusCode = response.statusCode;
print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) {
@@ -229,7 +249,8 @@ class BaseAppClient {
onSuccess(parsed, statusCode);
} else {
if (parsed['ErrorType'] == 4) {
- helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], parsed['AndroidLink'], parsed['IOSLink']);
+ helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
+ parsed['AndroidLink'], parsed['IOSLink']);
}
if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) {
@@ -245,20 +266,28 @@ class BaseAppClient {
onFailure(getError(parsed), statusCode);
}
}
- } else if (parsed['MessageStatus'] == 1 || parsed['SMSLoginRequired'] == true) {
+ } else if (parsed['MessageStatus'] == 1 ||
+ parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode);
- } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) {
+ } else if (parsed['MessageStatus'] == 2 &&
+ parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode);
} else {
- if (parsed['message'] == null && parsed['ErrorEndUserMessage'] == null) {
+ if (parsed['message'] == null &&
+ parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) {
- onFailure("Server Error found with no available message", statusCode);
+ onFailure("Server Error found with no available message",
+ statusCode);
} else {
onFailure(parsed['ErrorSearchMsg'], statusCode);
}
} else {
- onFailure(parsed['message'] ?? parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
+ onFailure(
+ parsed['message'] ??
+ parsed['ErrorEndUserMessage'] ??
+ parsed['ErrorMessage'],
+ statusCode);
}
}
} else {
@@ -268,7 +297,9 @@ class BaseAppClient {
if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode);
} else {
- onFailure(parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], statusCode);
+ onFailure(
+ parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
+ statusCode);
}
}
}
@@ -291,8 +322,12 @@ class BaseAppClient {
if (parsed["ValidationErrors"]["ValidationErrors"] != null &&
parsed["ValidationErrors"]["ValidationErrors"].length != 0) {
- for (var i = 0; i < parsed["ValidationErrors"]["ValidationErrors"].length; i++) {
- error = error + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + "\n";
+ for (var i = 0;
+ i < parsed["ValidationErrors"]["ValidationErrors"].length;
+ i++) {
+ error = error +
+ parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
+ "\n";
}
}
}
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 55c65680..0511f1cd 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -5,8 +5,8 @@ const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z &'\"]";
const ONLY_DATE = "[0-9/]";
const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL =
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 9c40e638..a4eb5dbc 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -647,7 +647,7 @@ const Map> localizedValues = {
"severe": {"en": "Severe", "ar": "الشدة"},
"graphDetails": {"en": "Graph Details", "ar": "تفاصيل الرسم البياني"},
"addNewOrderSheet": {"en": "Add a New Order Sheet", "ar": "أضف طلب جديد"},
- "addNewProgressNote": {"en": "Add a New Progress Note", "ar": "أضف ملاحظة جديدة"},
+ "addNewProgressNote": {"en": "Add a New Progress Note", "ar": "أضف ملاحظة جديدة"},
"notePending": {"en": "Pending", "ar": "قيد الانتظار"},
"noteCanceled": {"en": "Canceled", "ar": "ألغي"},
"noteVerified": {"en": "Verified", "ar": "تم التحقق"},
diff --git a/lib/config/size_config.dart b/lib/config/size_config.dart
index c6ec4fdd..abb3ddd6 100644
--- a/lib/config/size_config.dart
+++ b/lib/config/size_config.dart
@@ -5,14 +5,14 @@ class SizeConfig {
static double _blockWidth = 0;
static double _blockHeight = 0;
- static late double realScreenWidth;
- static late double realScreenHeight;
- static late double screenWidth;
- static late double screenHeight;
- static late double textMultiplier;
- static late double imageSizeMultiplier;
- static late double heightMultiplier;
- static late double widthMultiplier;
+ static double realScreenWidth;
+ static double realScreenHeight;
+ static double screenWidth;
+ static double screenHeight;
+ static double textMultiplier;
+ static double imageSizeMultiplier;
+ static double heightMultiplier;
+ static double widthMultiplier;
static bool isPortrait = true;
static bool isMobilePortrait = false;
@@ -25,7 +25,6 @@ class SizeConfig {
void init(BoxConstraints constraints, Orientation orientation) {
realScreenHeight = constraints.maxHeight;
realScreenWidth = constraints.maxWidth;
-
if (constraints.maxWidth <= MAX_SMALL_SCREEN) {
isMobile = true;
}
@@ -48,17 +47,21 @@ class SizeConfig {
if (realScreenWidth < 450) {
isMobilePortrait = true;
}
+ // textMultiplier = _blockHeight;
+ // imageSizeMultiplier = _blockWidth;
screenHeight = realScreenHeight;
screenWidth = realScreenWidth;
} else {
isPortrait = false;
isMobilePortrait = false;
+ // textMultiplier = _blockWidth;
+ // imageSizeMultiplier = _blockHeight;
screenHeight = realScreenWidth;
screenWidth = realScreenHeight;
}
- _blockWidth = (screenWidth / 100);
- _blockHeight = (screenHeight / 100);
-
+ _blockWidth = screenWidth / 100;
+ _blockHeight = screenHeight / 100;
+
textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth;
heightMultiplier = _blockHeight;
@@ -76,7 +79,7 @@ class SizeConfig {
}
- static getTextMultiplierBasedOnWidth({double? width}) {
+ static getTextMultiplierBasedOnWidth({double width}) {
// TODO handel LandScape case
if (width != null) {
return width / 100;
@@ -84,7 +87,7 @@ class SizeConfig {
return widthMultiplier;
}
-static getWidthMultiplier({double? width}) {
+ static getWidthMultiplier({double width}) {
// TODO handel LandScape case
if (width != null) {
return width / 100;
@@ -92,11 +95,12 @@ static getWidthMultiplier({double? width}) {
return widthMultiplier;
}
- static getHeightMultiplier({double? height}) {
+ static getHeightMultiplier({double height}) {
// TODO handel LandScape case
if (height != null) {
return height / 100;
}
return heightMultiplier;
}
+
}
diff --git a/lib/core/insurance_approval_request_model.dart b/lib/core/insurance_approval_request_model.dart
index 11f7804e..02f71ecb 100644
--- a/lib/core/insurance_approval_request_model.dart
+++ b/lib/core/insurance_approval_request_model.dart
@@ -1,17 +1,17 @@
class InsuranceApprovalInPatientRequestModel {
- int? patientID;
- int? patientTypeID;
- int? eXuldAPPNO;
- int? projectID;
- int? languageID;
- String? stamp;
- String? iPAdress;
- double? versionID;
- int? channel;
- String? tokenID;
- String? sessionID;
- bool? isLoginForDoctorApp;
- bool? patientOutSA;
+ int patientID;
+ int patientTypeID;
+ int eXuldAPPNO;
+ int projectID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
InsuranceApprovalInPatientRequestModel(
{this.patientID,
diff --git a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
index 16202cac..4b95c1b0 100644
--- a/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
+++ b/lib/core/model/PatientRegistration/CheckActivationCodeModel.dart
@@ -1,56 +1,56 @@
class CheckActivationCodeModel {
- int? patientMobileNumber;
- String? mobileNo;
- int? projectOutSA;
- int? loginType;
- String? zipCode;
- bool? isRegister;
- String? logInTokenID;
- int? searchType;
- int? patientID;
- int? nationalID;
- int? patientIdentificationID;
- bool? forRegisteration;
- String? activationCode;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
+ int patientMobileNumber;
+ String mobileNo;
+ int projectOutSA;
+ int loginType;
+ String zipCode;
+ bool isRegister;
+ String logInTokenID;
+ int searchType;
+ int patientID;
+ int nationalID;
+ int patientIdentificationID;
+ bool forRegisteration;
+ String activationCode;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
Null sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- String? dOB;
- int? isHijri;
- String? healthId;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ String dOB;
+ int isHijri;
+ String healthId;
CheckActivationCodeModel(
{this.patientMobileNumber,
- this.mobileNo,
- this.projectOutSA,
- this.loginType,
- this.zipCode,
- this.isRegister,
- this.logInTokenID,
- this.searchType,
- this.patientID,
- this.nationalID,
- this.patientIdentificationID,
- this.forRegisteration,
- this.activationCode,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.dOB,
- this.isHijri,
- this.healthId});
+ this.mobileNo,
+ this.projectOutSA,
+ this.loginType,
+ this.zipCode,
+ this.isRegister,
+ this.logInTokenID,
+ this.searchType,
+ this.patientID,
+ this.nationalID,
+ this.patientIdentificationID,
+ this.forRegisteration,
+ this.activationCode,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.dOB,
+ this.isHijri,
+ this.healthId});
CheckActivationCodeModel.fromJson(Map json) {
patientMobileNumber = json['PatientMobileNumber'];
diff --git a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
index 89e1bfd6..3465cf8d 100644
--- a/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart
@@ -1,40 +1,40 @@
class CheckPatientForRegistrationModel {
- int? patientIdentificationID;
- int? patientMobileNumber;
- String? zipCode;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
+ int patientIdentificationID;
+ int patientMobileNumber;
+ String zipCode;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
Null sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- String? tokenID;
- int? patientID;
- bool? isRegister;
- String? dOB;
- int? isHijri;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ String tokenID;
+ int patientID;
+ bool isRegister;
+ String dOB;
+ int isHijri;
CheckPatientForRegistrationModel(
{this.patientIdentificationID,
- this.patientMobileNumber,
- this.zipCode,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.tokenID,
- this.patientID,
- this.isRegister,
- this.dOB,
- this.isHijri});
+ this.patientMobileNumber,
+ this.zipCode,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.tokenID,
+ this.patientID,
+ this.isRegister,
+ this.dOB,
+ this.isHijri});
CheckPatientForRegistrationModel.fromJson(Map json) {
patientIdentificationID = json['PatientIdentificationID'];
diff --git a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
index 1f00fba0..f05131ef 100644
--- a/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
+++ b/lib/core/model/PatientRegistration/GetPatientInfoRequestModel.dart
@@ -1,30 +1,30 @@
class GetPatientInfoRequestModel {
- String? patientIdentificationID;
- String? dOB;
- int? isHijri;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
+ String patientIdentificationID;
+ String dOB;
+ int isHijri;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
Null sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
GetPatientInfoRequestModel(
{this.patientIdentificationID,
- this.dOB,
- this.isHijri,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID});
+ this.dOB,
+ this.isHijri,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID});
GetPatientInfoRequestModel.fromJson(Map json) {
patientIdentificationID = json['PatientIdentificationID'];
diff --git a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
index a1a25e17..158bd1e2 100644
--- a/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
+++ b/lib/core/model/PatientRegistration/GetPatientInfoResponseModel.dart
@@ -1,78 +1,78 @@
class GetPatientInfoResponseModel {
dynamic date;
- int? languageID;
- int? serviceName;
+ int languageID;
+ int serviceName;
dynamic time;
dynamic androidLink;
dynamic authenticationTokenID;
dynamic data;
- bool? dataw;
- int? dietType;
+ bool dataw;
+ int dietType;
dynamic errorCode;
dynamic errorEndUserMessage;
dynamic errorEndUserMessageN;
dynamic errorMessage;
- int? errorType;
- int? foodCategory;
+ int errorType;
+ int foodCategory;
dynamic iOSLink;
- bool? isAuthenticated;
- int? mealOrderStatus;
- int? mealType;
- int? messageStatus;
- int? numberOfResultRecords;
+ bool isAuthenticated;
+ int mealOrderStatus;
+ int mealType;
+ int messageStatus;
+ int numberOfResultRecords;
dynamic patientBlodType;
dynamic successMsg;
dynamic successMsgN;
dynamic vidaUpdatedResponse;
dynamic accessTokenObject;
- int? age;
+ int age;
dynamic clientIdentifierId;
- int? createdBy;
- String? dateOfBirth;
- String? firstNameAr;
- String? firstNameEn;
- String? gender;
+ int createdBy;
+ String dateOfBirth;
+ String firstNameAr;
+ String firstNameEn;
+ String gender;
dynamic genderAr;
dynamic genderEn;
- String? healthId;
- String? idNumber;
- String? idType;
- bool? isHijri;
- int? isInstertedOrUpdated;
- int? isNull;
- int? isPatientExistNHIC;
- bool? isRecordLockedByCurrentUser;
- String? lastNameAr;
- String? lastNameEn;
+ String healthId;
+ String idNumber;
+ String idType;
+ bool isHijri;
+ int isInstertedOrUpdated;
+ int isNull;
+ int isPatientExistNHIC;
+ bool isRecordLockedByCurrentUser;
+ String lastNameAr;
+ String lastNameEn;
dynamic listActiveAccessToken;
- String? maritalStatus;
- String? maritalStatusCode;
- String? nationalDateOfBirth;
- String? nationality;
- String? nationalityCode;
- String? occupation;
+ String maritalStatus;
+ String maritalStatusCode;
+ String nationalDateOfBirth;
+ String nationality;
+ String nationalityCode;
+ String occupation;
dynamic pCDTransactionDataResultList;
dynamic pCDGetVidaPatientForManualVerificationList;
dynamic pCDNHICHMGPatientDetailsMatchCalulationList;
- int? pCDReturnValue;
- String? patientStatus;
- String? placeofBirth;
+ int pCDReturnValue;
+ String patientStatus;
+ String placeofBirth;
dynamic practitionerStatusCode;
dynamic practitionerStatusDescAr;
dynamic practitionerStatusDescEn;
- int? rowCount;
- String? secondNameAr;
- String? secondNameEn;
- String? thirdNameAr;
- String? thirdNameEn;
+ int rowCount;
+ String secondNameAr;
+ String secondNameEn;
+ String thirdNameAr;
+ String thirdNameEn;
dynamic yakeenVidaPatientDataStatisticsByPatientIdList;
dynamic yakeenVidaPatientDataStatisticsList;
dynamic yakeenVidaPatientDataStatisticsPrefferedList;
dynamic accessToken;
- int? categoryCode;
+ int categoryCode;
dynamic categoryNameAr;
dynamic categoryNameEn;
- int? constraintCode;
+ int constraintCode;
dynamic constraintNameAr;
dynamic constraintNameEn;
dynamic content;
@@ -84,99 +84,99 @@ class GetPatientInfoResponseModel {
dynamic licenseStatusDescEn;
dynamic organizations;
dynamic registrationNumber;
- int? specialtyCode;
+ int specialtyCode;
dynamic specialtyNameAr;
dynamic specialtyNameEn;
GetPatientInfoResponseModel(
{this.date,
- this.languageID,
- this.serviceName,
- this.time,
- this.androidLink,
- this.authenticationTokenID,
- this.data,
- this.dataw,
- this.dietType,
- this.errorCode,
- this.errorEndUserMessage,
- this.errorEndUserMessageN,
- this.errorMessage,
- this.errorType,
- this.foodCategory,
- this.iOSLink,
- this.isAuthenticated,
- this.mealOrderStatus,
- this.mealType,
- this.messageStatus,
- this.numberOfResultRecords,
- this.patientBlodType,
- this.successMsg,
- this.successMsgN,
- this.vidaUpdatedResponse,
- this.accessTokenObject,
- this.age,
- this.clientIdentifierId,
- this.createdBy,
- this.dateOfBirth,
- this.firstNameAr,
- this.firstNameEn,
- this.gender,
- this.genderAr,
- this.genderEn,
- this.healthId,
- this.idNumber,
- this.idType,
- this.isHijri,
- this.isInstertedOrUpdated,
- this.isNull,
- this.isPatientExistNHIC,
- this.isRecordLockedByCurrentUser,
- this.lastNameAr,
- this.lastNameEn,
- this.listActiveAccessToken,
- this.maritalStatus,
- this.maritalStatusCode,
- this.nationalDateOfBirth,
- this.nationality,
- this.nationalityCode,
- this.occupation,
- this.pCDTransactionDataResultList,
- this.pCDGetVidaPatientForManualVerificationList,
- this.pCDNHICHMGPatientDetailsMatchCalulationList,
- this.pCDReturnValue,
- this.patientStatus,
- this.placeofBirth,
- this.practitionerStatusCode,
- this.practitionerStatusDescAr,
- this.practitionerStatusDescEn,
- this.rowCount,
- this.secondNameAr,
- this.secondNameEn,
- this.thirdNameAr,
- this.thirdNameEn,
- this.yakeenVidaPatientDataStatisticsByPatientIdList,
- this.yakeenVidaPatientDataStatisticsList,
- this.yakeenVidaPatientDataStatisticsPrefferedList,
- this.accessToken,
- this.categoryCode,
- this.categoryNameAr,
- this.categoryNameEn,
- this.constraintCode,
- this.constraintNameAr,
- this.constraintNameEn,
- this.content,
- this.errorList,
- this.licenseExpiryDate,
- this.licenseIssuedDate,
- this.licenseStatusCode,
- this.licenseStatusDescAr,
- this.licenseStatusDescEn,
- this.organizations,
- this.registrationNumber,
- this.specialtyCode,
- this.specialtyNameAr,
- this.specialtyNameEn});
+ this.languageID,
+ this.serviceName,
+ this.time,
+ this.androidLink,
+ this.authenticationTokenID,
+ this.data,
+ this.dataw,
+ this.dietType,
+ this.errorCode,
+ this.errorEndUserMessage,
+ this.errorEndUserMessageN,
+ this.errorMessage,
+ this.errorType,
+ this.foodCategory,
+ this.iOSLink,
+ this.isAuthenticated,
+ this.mealOrderStatus,
+ this.mealType,
+ this.messageStatus,
+ this.numberOfResultRecords,
+ this.patientBlodType,
+ this.successMsg,
+ this.successMsgN,
+ this.vidaUpdatedResponse,
+ this.accessTokenObject,
+ this.age,
+ this.clientIdentifierId,
+ this.createdBy,
+ this.dateOfBirth,
+ this.firstNameAr,
+ this.firstNameEn,
+ this.gender,
+ this.genderAr,
+ this.genderEn,
+ this.healthId,
+ this.idNumber,
+ this.idType,
+ this.isHijri,
+ this.isInstertedOrUpdated,
+ this.isNull,
+ this.isPatientExistNHIC,
+ this.isRecordLockedByCurrentUser,
+ this.lastNameAr,
+ this.lastNameEn,
+ this.listActiveAccessToken,
+ this.maritalStatus,
+ this.maritalStatusCode,
+ this.nationalDateOfBirth,
+ this.nationality,
+ this.nationalityCode,
+ this.occupation,
+ this.pCDTransactionDataResultList,
+ this.pCDGetVidaPatientForManualVerificationList,
+ this.pCDNHICHMGPatientDetailsMatchCalulationList,
+ this.pCDReturnValue,
+ this.patientStatus,
+ this.placeofBirth,
+ this.practitionerStatusCode,
+ this.practitionerStatusDescAr,
+ this.practitionerStatusDescEn,
+ this.rowCount,
+ this.secondNameAr,
+ this.secondNameEn,
+ this.thirdNameAr,
+ this.thirdNameEn,
+ this.yakeenVidaPatientDataStatisticsByPatientIdList,
+ this.yakeenVidaPatientDataStatisticsList,
+ this.yakeenVidaPatientDataStatisticsPrefferedList,
+ this.accessToken,
+ this.categoryCode,
+ this.categoryNameAr,
+ this.categoryNameEn,
+ this.constraintCode,
+ this.constraintNameAr,
+ this.constraintNameEn,
+ this.content,
+ this.errorList,
+ this.licenseExpiryDate,
+ this.licenseIssuedDate,
+ this.licenseStatusCode,
+ this.licenseStatusDescAr,
+ this.licenseStatusDescEn,
+ this.organizations,
+ this.registrationNumber,
+ this.specialtyCode,
+ this.specialtyNameAr,
+ this.specialtyNameEn});
GetPatientInfoResponseModel.fromJson(Map json) {
date = json['Date'];
@@ -233,9 +233,9 @@ class GetPatientInfoResponseModel {
occupation = json['Occupation'];
pCDTransactionDataResultList = json['PCDTransactionDataResultList'];
pCDGetVidaPatientForManualVerificationList =
- json['PCD_GetVidaPatientForManualVerificationList'];
+ json['PCD_GetVidaPatientForManualVerificationList'];
pCDNHICHMGPatientDetailsMatchCalulationList =
- json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList'];
+ json['PCD_NHIC_HMG_PatientDetailsMatchCalulationList'];
pCDReturnValue = json['PCD_ReturnValue'];
patientStatus = json['PatientStatus'];
placeofBirth = json['PlaceofBirth'];
@@ -248,11 +248,11 @@ class GetPatientInfoResponseModel {
thirdNameAr = json['ThirdNameAr'];
thirdNameEn = json['ThirdNameEn'];
yakeenVidaPatientDataStatisticsByPatientIdList =
- json['YakeenVidaPatientDataStatisticsByPatientIdList'];
+ json['YakeenVidaPatientDataStatisticsByPatientIdList'];
yakeenVidaPatientDataStatisticsList =
- json['YakeenVidaPatientDataStatisticsList'];
+ json['YakeenVidaPatientDataStatisticsList'];
yakeenVidaPatientDataStatisticsPrefferedList =
- json['YakeenVidaPatientDataStatisticsPrefferedList'];
+ json['YakeenVidaPatientDataStatisticsPrefferedList'];
accessToken = json['accessToken'];
categoryCode = json['categoryCode'];
categoryNameAr = json['categoryNameAr'];
diff --git a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
index a73ecb0b..83ff53d7 100644
--- a/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/PatientRegistrationModel.dart
@@ -1,42 +1,42 @@
class PatientRegistrationModel {
- Patientobject? patientobject;
- String? patientIdentificationID;
- String? patientMobileNumber;
- String? logInTokenID;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
+ Patientobject patientobject;
+ String patientIdentificationID;
+ String patientMobileNumber;
+ String logInTokenID;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
Null sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- String? tokenID;
- String? dOB;
- int? isHijri;
- String? healthId;
- String? zipCode;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ String tokenID;
+ String dOB;
+ int isHijri;
+ String healthId;
+ String zipCode;
PatientRegistrationModel(
{this.patientobject,
- this.patientIdentificationID,
- this.patientMobileNumber,
- this.logInTokenID,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.tokenID,
- this.dOB,
- this.isHijri,
- this.healthId,
- this.zipCode});
+ this.patientIdentificationID,
+ this.patientMobileNumber,
+ this.logInTokenID,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.tokenID,
+ this.dOB,
+ this.isHijri,
+ this.healthId,
+ this.zipCode});
PatientRegistrationModel.fromJson(Map json) {
patientobject = json['Patientobject'] != null
@@ -64,7 +64,7 @@ class PatientRegistrationModel {
Map toJson() {
final Map data = new Map();
if (this.patientobject != null) {
- data['Patientobject'] = this.patientobject!.toJson();
+ data['Patientobject'] = this.patientobject.toJson();
}
data['PatientIdentificationID'] = this.patientIdentificationID;
data['PatientMobileNumber'] = this.patientMobileNumber;
@@ -88,50 +88,50 @@ class PatientRegistrationModel {
}
class Patientobject {
- bool? tempValue;
- int? patientIdentificationType;
- String? patientIdentificationNo;
- int? mobileNumber;
- int? patientOutSA;
- String? firstNameN;
- String? middleNameN;
- String? lastNameN;
- String? firstName;
- String? middleName;
- String? lastName;
- String? strDateofBirth;
- String? dateofBirth;
- int? gender;
- String? nationalityID;
- String? dateofBirthN;
- String? emailAddress;
- String? sourceType;
- String? preferredLanguage;
- String? marital;
- String? eHealthIDField;
+ bool tempValue;
+ int patientIdentificationType;
+ String patientIdentificationNo;
+ int mobileNumber;
+ int patientOutSA;
+ String firstNameN;
+ String middleNameN;
+ String lastNameN;
+ String firstName;
+ String middleName;
+ String lastName;
+ String strDateofBirth;
+ String dateofBirth;
+ int gender;
+ String nationalityID;
+ String dateofBirthN;
+ String emailAddress;
+ String sourceType;
+ String preferredLanguage;
+ String marital;
+ String eHealthIDField;
Patientobject(
{this.tempValue,
- this.patientIdentificationType,
- this.patientIdentificationNo,
- this.mobileNumber,
- this.patientOutSA,
- this.firstNameN,
- this.middleNameN,
- this.lastNameN,
- this.firstName,
- this.middleName,
- this.lastName,
- this.strDateofBirth,
- this.dateofBirth,
- this.gender,
- this.nationalityID,
- this.dateofBirthN,
- this.emailAddress,
- this.sourceType,
- this.preferredLanguage,
- this.marital,
- this.eHealthIDField});
+ this.patientIdentificationType,
+ this.patientIdentificationNo,
+ this.mobileNumber,
+ this.patientOutSA,
+ this.firstNameN,
+ this.middleNameN,
+ this.lastNameN,
+ this.firstName,
+ this.middleName,
+ this.lastName,
+ this.strDateofBirth,
+ this.dateofBirth,
+ this.gender,
+ this.nationalityID,
+ this.dateofBirthN,
+ this.emailAddress,
+ this.sourceType,
+ this.preferredLanguage,
+ this.marital,
+ this.eHealthIDField});
Patientobject.fromJson(Map json) {
tempValue = json['TempValue'];
diff --git a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
index af08661f..8244a95f 100644
--- a/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
+++ b/lib/core/model/PatientRegistration/SendActivationCodebyOTPNotificationTypeForRegistrationModel.dart
@@ -1,54 +1,54 @@
class SendActivationCodeByOTPNotificationTypeForRegistrationModel {
- int? patientMobileNumber;
- String? mobileNo;
- int? projectOutSA;
- int? loginType;
- String? zipCode;
- bool? isRegister;
- String? logInTokenID;
- int? searchType;
- int? patientID;
- int? nationalID;
- int? patientIdentificationID;
- int? oTPSendType;
- int? languageID;
- double? versionID;
- int? channel;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
+ int patientMobileNumber;
+ String mobileNo;
+ int projectOutSA;
+ int loginType;
+ String zipCode;
+ bool isRegister;
+ String logInTokenID;
+ int searchType;
+ int patientID;
+ int nationalID;
+ int patientIdentificationID;
+ int oTPSendType;
+ int languageID;
+ double versionID;
+ int channel;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
Null sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- String? dOB;
- int? isHijri;
- String? healthId;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ String dOB;
+ int isHijri;
+ String healthId;
SendActivationCodeByOTPNotificationTypeForRegistrationModel(
{this.patientMobileNumber,
- this.mobileNo,
- this.projectOutSA,
- this.loginType,
- this.zipCode,
- this.isRegister,
- this.logInTokenID,
- this.searchType,
- this.patientID,
- this.nationalID,
- this.patientIdentificationID,
- this.oTPSendType,
- this.languageID,
- this.versionID,
- this.channel,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.dOB,
- this.isHijri,
- this.healthId});
+ this.mobileNo,
+ this.projectOutSA,
+ this.loginType,
+ this.zipCode,
+ this.isRegister,
+ this.logInTokenID,
+ this.searchType,
+ this.patientID,
+ this.nationalID,
+ this.patientIdentificationID,
+ this.oTPSendType,
+ this.languageID,
+ this.versionID,
+ this.channel,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.dOB,
+ this.isHijri,
+ this.healthId});
SendActivationCodeByOTPNotificationTypeForRegistrationModel.fromJson(
Map json) {
diff --git a/lib/core/model/Prescriptions/Prescriptions.dart b/lib/core/model/Prescriptions/Prescriptions.dart
index 881f318a..c47a813a 100644
--- a/lib/core/model/Prescriptions/Prescriptions.dart
+++ b/lib/core/model/Prescriptions/Prescriptions.dart
@@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions {
- String? setupID;
- int? projectID;
- int? patientID;
- int? appointmentNo;
- String? appointmentDate;
- String? doctorName;
- String? clinicDescription;
- String? name;
- int? episodeID;
- int? actualDoctorRate;
- int? admission;
- int? clinicID;
- String? companyName;
- String? despensedStatus;
- DateTime? dischargeDate;
- int? dischargeNo;
- int? doctorID;
- String? doctorImageURL;
- int? doctorRate;
- String? doctorTitle;
- int? gender;
- String? genderDescription;
- bool? isActiveDoctorProfile;
- bool? isDoctorAllowVedioCall;
- bool? isExecludeDoctor;
- bool? isInOutPatient;
- bool? isLiveCareAppointment;
- String? isInOutPatientDescription;
- String? isInOutPatientDescriptionN;
- bool? isInsurancePatient;
- String? nationalityFlagURL;
- int? noOfPatientsRate;
- String? qR;
- List? speciality;
+ String setupID;
+ int projectID;
+ int patientID;
+ int appointmentNo;
+ String appointmentDate;
+ String doctorName;
+ String clinicDescription;
+ String name;
+ int episodeID;
+ int actualDoctorRate;
+ int admission;
+ int clinicID;
+ String companyName;
+ String despensedStatus;
+ DateTime dischargeDate;
+ int dischargeNo;
+ int doctorID;
+ String doctorImageURL;
+ int doctorRate;
+ String doctorTitle;
+ int gender;
+ String genderDescription;
+ bool isActiveDoctorProfile;
+ bool isDoctorAllowVedioCall;
+ bool isExecludeDoctor;
+ bool isInOutPatient;
+ bool isLiveCareAppointment;
+ String isInOutPatientDescription;
+ String isInOutPatientDescriptionN;
+ bool isInsurancePatient;
+ String nationalityFlagURL;
+ int noOfPatientsRate;
+ String qR;
+ List speciality;
Prescriptions(
{this.setupID,
@@ -69,10 +69,9 @@ class Prescriptions {
this.nationalityFlagURL,
this.noOfPatientsRate,
this.qR,
- this.speciality,
- this.isLiveCareAppointment});
+ this.speciality,this.isLiveCareAppointment});
- Prescriptions.fromJson(Map json) {
+ Prescriptions.fromJson(Map json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
patientID = json['PatientID'];
@@ -106,11 +105,11 @@ class Prescriptions {
noOfPatientsRate = json['NoOfPatientsRate'];
qR = json['QR'];
isLiveCareAppointment = json['IsLiveCareAppointment'];
- // speciality = json['Speciality'].cast();
+ // speciality = json['Speciality'].cast();
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['PatientID'] = this.patientID;
@@ -150,10 +149,10 @@ class Prescriptions {
}
class PrescriptionsList {
- String? filterName = "";
- List prescriptionsList =[];
+ String filterName = "";
+ List prescriptionsList = List();
- PrescriptionsList({this.filterName, required Prescriptions prescriptions}) {
+ PrescriptionsList({this.filterName, Prescriptions prescriptions}) {
prescriptionsList.add(prescriptions);
}
}
diff --git a/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart b/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart
index 4644131e..8ba07f2a 100644
--- a/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart
+++ b/lib/core/model/Prescriptions/get_medication_for_inpatient_model.dart
@@ -1,40 +1,40 @@
class GetMedicationForInPatientModel {
- String? setupID;
- int? projectID;
- int? admissionNo;
- int? patientID;
- int? orderNo;
- int? prescriptionNo;
- int? lineItemNo;
- String? prescriptionDatetime;
- int? itemID;
- int? directionID;
- int? refillID;
- String? dose;
- int? unitofMeasurement;
- String? startDatetime;
- String? stopDatetime;
- int? noOfDoses;
- int? routeId;
- String? comments;
- int? reviewedPharmacist;
+ String setupID;
+ int projectID;
+ int admissionNo;
+ int patientID;
+ int orderNo;
+ int prescriptionNo;
+ int lineItemNo;
+ String prescriptionDatetime;
+ int itemID;
+ int directionID;
+ int refillID;
+ String dose;
+ int unitofMeasurement;
+ String startDatetime;
+ String stopDatetime;
+ int noOfDoses;
+ int routeId;
+ String comments;
+ int reviewedPharmacist;
dynamic reviewedPharmacistDatetime;
dynamic discountinueDatetime;
dynamic rescheduleDatetime;
- int? status;
- String? statusDescription;
- int? createdBy;
- String? createdOn;
+ int status;
+ String statusDescription;
+ int createdBy;
+ String createdOn;
dynamic editedBy;
dynamic editedOn;
dynamic strength;
- String? pHRItemDescription;
- String? pHRItemDescriptionN;
- String? doctorName;
- String? uomDescription;
- String? routeDescription;
- String? directionDescription;
- String? refillDescription;
+ String pHRItemDescription;
+ String pHRItemDescriptionN;
+ String doctorName;
+ String uomDescription;
+ String routeDescription;
+ String directionDescription;
+ String refillDescription;
GetMedicationForInPatientModel(
{this.setupID,
diff --git a/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart b/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart
index 71c1305a..7c906643 100644
--- a/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart
+++ b/lib/core/model/Prescriptions/get_medication_for_inpatient_request_model.dart
@@ -1,16 +1,16 @@
class GetMedicationForInPatientRequestModel {
- bool? isDentalAllowedBackend;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? deviceTypeID;
- String? tokenID;
- int? patientID;
- int? admissionNo;
- String? sessionID;
- int? projectID;
+ bool isDentalAllowedBackend;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int deviceTypeID;
+ String tokenID;
+ int patientID;
+ int admissionNo;
+ String sessionID;
+ int projectID;
GetMedicationForInPatientRequestModel(
{this.isDentalAllowedBackend,
diff --git a/lib/core/model/Prescriptions/in_patient_prescription_model.dart b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
index 3f67e659..f6e88bf7 100644
--- a/lib/core/model/Prescriptions/in_patient_prescription_model.dart
+++ b/lib/core/model/Prescriptions/in_patient_prescription_model.dart
@@ -1,5 +1,5 @@
class InPatientPrescriptionRequestModel {
- String? vidaAuthTokenID;
+ String vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;
diff --git a/lib/core/model/Prescriptions/perscription_pharmacy.dart b/lib/core/model/Prescriptions/perscription_pharmacy.dart
index c6b013d3..3adaef7e 100644
--- a/lib/core/model/Prescriptions/perscription_pharmacy.dart
+++ b/lib/core/model/Prescriptions/perscription_pharmacy.dart
@@ -1,28 +1,28 @@
class PharmacyPrescriptions {
- String? expiryDate;
+ String expiryDate;
dynamic sellingPrice;
- int?quantity;
- int?itemID;
- int?locationID;
- int?projectID;
- String ?setupID;
- String ?locationDescription;
- dynamic locationDescriptionN;
- String ? itemDescription;
- dynamic itemDescriptionN;
- String ? alias;
- int ? locationTypeID;
- int ? barcode;
- dynamic companybarcode;
- int ? cityID;
- String? cityName;
- int ? distanceInKilometers;
- String? latitude;
- int ?locationType;
- String? longitude;
- String ?phoneNumber;
- String ? projectImageURL;
- dynamic sortOrder;
+ int quantity;
+ int itemID;
+ int locationID;
+ int projectID;
+ String setupID;
+ String locationDescription;
+ Null locationDescriptionN;
+ String itemDescription;
+ Null itemDescriptionN;
+ String alias;
+ int locationTypeID;
+ int barcode;
+ Null companybarcode;
+ int cityID;
+ String cityName;
+ int distanceInKilometers;
+ String latitude;
+ int locationType;
+ String longitude;
+ String phoneNumber;
+ String projectImageURL;
+ Null sortOrder;
PharmacyPrescriptions(
{this.expiryDate,
diff --git a/lib/core/model/Prescriptions/post_prescrition_req_model.dart b/lib/core/model/Prescriptions/post_prescrition_req_model.dart
index 9609a0df..06a524ed 100644
--- a/lib/core/model/Prescriptions/post_prescrition_req_model.dart
+++ b/lib/core/model/Prescriptions/post_prescrition_req_model.dart
@@ -1,10 +1,10 @@
class PostPrescriptionReqModel {
- String ?vidaAuthTokenID;
- int? clinicID;
- int? episodeID;
- int? appointmentNo;
- int? patientMRN;
- List ?prescriptionRequestModel;
+ String vidaAuthTokenID;
+ int clinicID;
+ int episodeID;
+ int appointmentNo;
+ int patientMRN;
+ List prescriptionRequestModel;
PostPrescriptionReqModel(
{this.vidaAuthTokenID,
@@ -21,9 +21,9 @@ class PostPrescriptionReqModel {
appointmentNo = json['AppointmentNo'];
patientMRN = json['PatientMRN'];
if (json['prescriptionRequestModel'] != null) {
- prescriptionRequestModel =[];
+ prescriptionRequestModel = new List();
json['prescriptionRequestModel'].forEach((v) {
- prescriptionRequestModel!.add(new PrescriptionRequestModel.fromJson(v));
+ prescriptionRequestModel.add(new PrescriptionRequestModel.fromJson(v));
});
}
}
@@ -37,25 +37,25 @@ class PostPrescriptionReqModel {
data['PatientMRN'] = this.patientMRN;
if (this.prescriptionRequestModel != null) {
data['prescriptionRequestModel'] =
- this.prescriptionRequestModel!.map((v) => v.toJson()).toList();
+ this.prescriptionRequestModel.map((v) => v.toJson()).toList();
}
return data;
}
}
class PrescriptionRequestModel {
- int ? itemId;
- String? doseStartDate;
- int ?duration;
- double? dose;
- int ?doseUnitId;
- int ?route;
- int ?frequency;
- int ?doseTime;
- bool ?covered;
- bool ?approvalRequired;
- String ?remarks;
- String ?icdcode10Id;
+ int itemId;
+ String doseStartDate;
+ int duration;
+ double dose;
+ int doseUnitId;
+ int route;
+ int frequency;
+ int doseTime;
+ bool covered;
+ bool approvalRequired;
+ String remarks;
+ String icdcode10Id;
PrescriptionRequestModel({
this.itemId,
diff --git a/lib/core/model/Prescriptions/prescription_in_patient.dart b/lib/core/model/Prescriptions/prescription_in_patient.dart
index f32556bc..c66bc8a4 100644
--- a/lib/core/model/Prescriptions/prescription_in_patient.dart
+++ b/lib/core/model/Prescriptions/prescription_in_patient.dart
@@ -1,50 +1,50 @@
class PrescriotionInPatient {
- int ?admissionNo;
- int ?authorizedBy;
+ int admissionNo;
+ int authorizedBy;
dynamic bedNo;
- String? comments;
- int ?createdBy;
- String ?createdByName;
+ String comments;
+ int createdBy;
+ String createdByName;
dynamic createdByNameN;
- String ?createdOn;
- String ?direction;
- int ?directionID;
+ String createdOn;
+ String direction;
+ int directionID;
dynamic directionN;
- String ?dose;
- int ?editedBy;
+ String dose;
+ int editedBy;
dynamic iVDiluentLine;
- int ?iVDiluentType;
+ int iVDiluentType;
dynamic iVDiluentVolume;
dynamic iVRate;
dynamic iVStability;
- String? itemDescription;
- int? itemID;
- int? lineItemNo;
- int? locationId;
- int? noOfDoses;
- int? orderNo;
- int? patientID;
- String ?pharmacyRemarks;
- String ?prescriptionDatetime;
- int ?prescriptionNo;
- String? processedBy;
- int ?projectID;
- int ?refillID;
- String ?refillType;
+ String itemDescription;
+ int itemID;
+ int lineItemNo;
+ int locationId;
+ int noOfDoses;
+ int orderNo;
+ int patientID;
+ String pharmacyRemarks;
+ String prescriptionDatetime;
+ int prescriptionNo;
+ String processedBy;
+ int projectID;
+ int refillID;
+ String refillType;
dynamic refillTypeN;
- int ?reviewedPharmacist;
+ int reviewedPharmacist;
dynamic roomId;
- String ?route;
- int ?routeId;
+ String route;
+ int routeId;
dynamic routeN;
dynamic setupID;
- String ?startDatetime;
- int ?status;
- String ?statusDescription;
+ String startDatetime;
+ int status;
+ String statusDescription;
dynamic statusDescriptionN;
- String ?stopDatetime;
- int ?unitofMeasurement;
- String? unitofMeasurementDescription;
+ String stopDatetime;
+ int unitofMeasurement;
+ String unitofMeasurementDescription;
dynamic unitofMeasurementDescriptionN;
PrescriotionInPatient(
diff --git a/lib/core/model/Prescriptions/prescription_model.dart b/lib/core/model/Prescriptions/prescription_model.dart
index 89959394..92574c66 100644
--- a/lib/core/model/Prescriptions/prescription_model.dart
+++ b/lib/core/model/Prescriptions/prescription_model.dart
@@ -1,5 +1,5 @@
class PrescriptionModel {
- List? entityList;
+ List entityList;
dynamic rowcount;
dynamic statusMessage;
@@ -7,9 +7,9 @@ class PrescriptionModel {
PrescriptionModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@@ -19,7 +19,7 @@ class PrescriptionModel {
Map toJson() {
final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
diff --git a/lib/core/model/Prescriptions/prescription_report.dart b/lib/core/model/Prescriptions/prescription_report.dart
index 4b5d574a..006a6fad 100644
--- a/lib/core/model/Prescriptions/prescription_report.dart
+++ b/lib/core/model/Prescriptions/prescription_report.dart
@@ -1,48 +1,48 @@
class PrescriptionReport {
- String? address;
- dynamic? appodynamicmentNo;
- String? clinic;
- String? companyName;
- dynamic? days;
- String? doctorName;
+ String address;
+ dynamic appodynamicmentNo;
+ String clinic;
+ String companyName;
+ dynamic days;
+ String doctorName;
var doseDailyQuantity;
- String? frequency;
- dynamic? frequencyNumber;
- String? image;
- String? imageExtension;
- String? imageSRCUrl;
- String? imageString;
- String? imageThumbUrl;
- String? isCovered;
- String? itemDescription;
- dynamic? itemID;
- String? orderDate;
- dynamic? patientID;
- String? patientName;
- String? phoneOffice1;
- String? prescriptionQR;
- dynamic? prescriptionTimes;
- String? productImage;
- String? productImageBase64;
- String? productImageString;
- dynamic? projectID;
- String? projectName;
- String? remarks;
- String? route;
- String? sKU;
- dynamic? scaleOffset;
- String? startDate;
+ String frequency;
+ dynamic frequencyNumber;
+ String image;
+ String imageExtension;
+ String imageSRCUrl;
+ String imageString;
+ String imageThumbUrl;
+ String isCovered;
+ String itemDescription;
+ dynamic itemID;
+ String orderDate;
+ dynamic patientID;
+ String patientName;
+ String phoneOffice1;
+ String prescriptionQR;
+ dynamic prescriptionTimes;
+ String productImage;
+ String productImageBase64;
+ String productImageString;
+ dynamic projectID;
+ String projectName;
+ String remarks;
+ String route;
+ String sKU;
+ dynamic scaleOffset;
+ String startDate;
- String? patientAge;
- String? patientGender;
- String? phoneOffice;
- dynamic? doseTimingID;
- dynamic? frequencyID;
- dynamic? routeID;
- String? name;
- String? itemDescriptionN;
- String? routeN;
- String? frequencyN;
+ String patientAge;
+ String patientGender;
+ String phoneOffice;
+ dynamic doseTimingID;
+ dynamic frequencyID;
+ dynamic routeID;
+ String name;
+ String itemDescriptionN;
+ String routeN;
+ String frequencyN;
PrescriptionReport({
this.address,
diff --git a/lib/core/model/Prescriptions/prescription_report_enh.dart b/lib/core/model/Prescriptions/prescription_report_enh.dart
index 96f811de..01b9a5c9 100644
--- a/lib/core/model/Prescriptions/prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/prescription_report_enh.dart
@@ -1,38 +1,37 @@
class PrescriptionReportEnh {
- String ? address;
+ String address;
dynamic appodynamicmentNo;
- int ? appointmentNo;
- String ? clinic;
+ String clinic;
dynamic companyName;
- int ? days;
- String ? doctorName;
- int ? doseDailyQuantity;
- String ? frequency;
- int ? frequencyNumber;
+ dynamic days;
+ String doctorName;
+ dynamic doseDailyQuantity;
+ String frequency;
+ dynamic frequencyNumber;
dynamic image;
dynamic imageExtension;
- String ? imageSRCUrl;
- dynamic imageString ;
- String ? imageThumbUrl;
- String ? isCovered;
- String ? itemDescription;
- dynamic ? itemID;
- String ? orderDate;
- dynamic ? patientID;
- String ? patientName;
- String ? phoneOffice1;
+ String imageSRCUrl;
+ dynamic imageString;
+ String imageThumbUrl;
+ String isCovered;
+ String itemDescription;
+ dynamic itemID;
+ String orderDate;
+ dynamic patientID;
+ String patientName;
+ String phoneOffice1;
dynamic prescriptionQR;
- dynamic ? prescriptionTimes;
+ dynamic prescriptionTimes;
dynamic productImage;
dynamic productImageBase64;
- String ? productImageString;
- dynamic ? projectID;
- String ? projectName;
- String ? remarks;
- String ? route;
- String ? sKU;
- dynamic ? scaleOffset;
- String ? startDate;
+ String productImageString;
+ dynamic projectID;
+ String projectName;
+ String remarks;
+ String route;
+ String sKU;
+ dynamic scaleOffset;
+ String startDate;
PrescriptionReportEnh(
{this.address,
diff --git a/lib/core/model/Prescriptions/prescription_req_model.dart b/lib/core/model/Prescriptions/prescription_req_model.dart
index 1177431d..a45878d8 100644
--- a/lib/core/model/Prescriptions/prescription_req_model.dart
+++ b/lib/core/model/Prescriptions/prescription_req_model.dart
@@ -1,5 +1,5 @@
class PrescriptionReqModel {
- String ?vidaAuthTokenID;
+ String vidaAuthTokenID;
dynamic patientMRN;
dynamic appNo;
dynamic admissionNo;
diff --git a/lib/core/model/Prescriptions/prescriptions_order.dart b/lib/core/model/Prescriptions/prescriptions_order.dart
index afe38aa1..f51420ec 100644
--- a/lib/core/model/Prescriptions/prescriptions_order.dart
+++ b/lib/core/model/Prescriptions/prescriptions_order.dart
@@ -1,32 +1,32 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionsOrder {
- int? iD;
+ int iD;
dynamic patientID;
- bool? patientOutSA;
- bool? isOutPatient;
- int? projectID;
- int? nearestProjectID;
- double? longitude;
- double? latitude;
+ bool patientOutSA;
+ bool isOutPatient;
+ int projectID;
+ int nearestProjectID;
+ double longitude;
+ double latitude;
dynamic appointmentNo;
dynamic dischargeID;
- int? lineItemNo;
- int? status;
+ int lineItemNo;
+ int status;
dynamic description;
dynamic descriptionN;
- DateTime? createdOn;
- int? serviceID;
- int? createdBy;
- DateTime? editedOn;
- int? editedBy;
- int? channel;
+ DateTime createdOn;
+ int serviceID;
+ int createdBy;
+ DateTime editedOn;
+ int editedBy;
+ int channel;
dynamic clientRequestID;
- bool? returnedToQueue;
+ bool returnedToQueue;
dynamic pickupDateTime;
dynamic pickupLocationName;
dynamic dropoffLocationName;
- int? realRRTHaveTransactions;
+ int realRRTHaveTransactions;
dynamic nearestProjectDescription;
dynamic nearestProjectDescriptionN;
dynamic projectDescription;
@@ -34,35 +34,35 @@ class PrescriptionsOrder {
PrescriptionsOrder(
{this.iD,
- this.patientID,
- this.patientOutSA,
- this.isOutPatient,
- this.projectID,
- this.nearestProjectID,
- this.longitude,
- this.latitude,
- this.appointmentNo,
- this.dischargeID,
- this.lineItemNo,
- this.status,
- this.description,
- this.descriptionN,
- this.createdOn,
- this.serviceID,
- this.createdBy,
- this.editedOn,
- this.editedBy,
- this.channel,
- this.clientRequestID,
- this.returnedToQueue,
- this.pickupDateTime,
- this.pickupLocationName,
- this.dropoffLocationName,
- this.realRRTHaveTransactions,
- this.nearestProjectDescription,
- this.nearestProjectDescriptionN,
- this.projectDescription,
- this.projectDescriptionN});
+ this.patientID,
+ this.patientOutSA,
+ this.isOutPatient,
+ this.projectID,
+ this.nearestProjectID,
+ this.longitude,
+ this.latitude,
+ this.appointmentNo,
+ this.dischargeID,
+ this.lineItemNo,
+ this.status,
+ this.description,
+ this.descriptionN,
+ this.createdOn,
+ this.serviceID,
+ this.createdBy,
+ this.editedOn,
+ this.editedBy,
+ this.channel,
+ this.clientRequestID,
+ this.returnedToQueue,
+ this.pickupDateTime,
+ this.pickupLocationName,
+ this.dropoffLocationName,
+ this.realRRTHaveTransactions,
+ this.nearestProjectDescription,
+ this.nearestProjectDescriptionN,
+ this.projectDescription,
+ this.projectDescriptionN});
PrescriptionsOrder.fromJson(Map json) {
iD = json['ID'];
diff --git a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
index 7b453b9b..739bb838 100644
--- a/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
+++ b/lib/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart
@@ -1,32 +1,32 @@
class RequestGetListPharmacyForPrescriptions {
- int? latitude;
- int? longitude;
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
- String? sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- int? itemID;
+ int latitude;
+ int longitude;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int itemID;
RequestGetListPharmacyForPrescriptions(
{this.latitude,
- this.longitude,
- this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.itemID});
+ this.longitude,
+ this.versionID,
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.itemID});
- RequestGetListPharmacyForPrescriptions.fromJson(Map json) {
+ RequestGetListPharmacyForPrescriptions.fromJson(Map json) {
latitude = json['Latitude'];
longitude = json['Longitude'];
versionID = json['VersionID'];
diff --git a/lib/core/model/Prescriptions/request_prescription_report.dart b/lib/core/model/Prescriptions/request_prescription_report.dart
index b7ade7d4..c8323740 100644
--- a/lib/core/model/Prescriptions/request_prescription_report.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report.dart
@@ -1,46 +1,46 @@
class RequestPrescriptionReport {
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
- String? sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- int? patientID;
- String? tokenID;
- int? patientTypeID;
- int? patientType;
- int? appointmentNo;
- String? setupID;
- int? episodeID;
- int? clinicID;
- int? projectID;
- int? dischargeNo;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
+ int appointmentNo;
+ String setupID;
+ int episodeID;
+ int clinicID;
+ int projectID;
+ int dischargeNo;
RequestPrescriptionReport(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.appointmentNo,
- this.setupID,
- this.episodeID,
- this.clinicID,
- this.projectID,
- this.dischargeNo});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.appointmentNo,
+ this.setupID,
+ this.episodeID,
+ this.clinicID,
+ this.projectID,
+ this.dischargeNo});
- RequestPrescriptionReport.fromJson(Map json) {
+ RequestPrescriptionReport.fromJson(Map json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];
diff --git a/lib/core/model/Prescriptions/request_prescription_report_enh.dart b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
index fc048a95..4905fc2a 100644
--- a/lib/core/model/Prescriptions/request_prescription_report_enh.dart
+++ b/lib/core/model/Prescriptions/request_prescription_report_enh.dart
@@ -1,46 +1,45 @@
class RequestPrescriptionReportEnh {
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
- String? sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- int? patientID;
- String? tokenID;
- int? patientTypeID;
- int? patientType;
- int? appointmentNo;
- String? setupID;
- int? dischargeNo;
- int? episodeID;
- int? clinicID;
- int? projectID;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
+ int appointmentNo;
+ String setupID;
+ int dischargeNo;
+ int episodeID;
+ int clinicID;
+ int projectID;
RequestPrescriptionReportEnh(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.appointmentNo,
- this.setupID,
- this.episodeID,
- this.clinicID,
- this.projectID,
- this.dischargeNo});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.appointmentNo,
+ this.setupID,
+ this.episodeID,
+ this.clinicID,
+ this.projectID,this.dischargeNo});
- RequestPrescriptionReportEnh.fromJson(Map json) {
+ RequestPrescriptionReportEnh.fromJson(Map json) {
versionID = json['VersionID'];
channel = json['Channel'];
languageID = json['LanguageID'];
diff --git a/lib/core/model/admissionRequest/admission-request.dart b/lib/core/model/admissionRequest/admission-request.dart
index 94fe46cc..1ab5a990 100644
--- a/lib/core/model/admissionRequest/admission-request.dart
+++ b/lib/core/model/admissionRequest/admission-request.dart
@@ -1,45 +1,45 @@
class AdmissionRequest {
- late int? patientMRN;
- late int? admitToClinic;
- late bool? isPregnant;
- late int pregnancyWeeks;
- late int pregnancyType;
- late int noOfBabies;
- late int? mrpDoctorID;
- late String? admissionDate;
- late int? expectedDays;
- late int? admissionType;
- late int admissionLocationID;
- late int roomCategoryID;
- late int? wardID;
- late bool? isSickLeaveRequired;
- late String sickLeaveComments;
- late bool isTransport;
- late String transportComments;
- late bool isPhysioAppointmentNeeded;
- late String physioAppointmentComments;
- late bool isOPDFollowupAppointmentNeeded;
- late String opdFollowUpComments;
- late bool? isDietType;
- late int? dietType;
- late String? dietRemarks;
- late bool isPhysicalActivityModification;
- late String physicalActivityModificationComments;
- late int orStatus;
- late String? mainLineOfTreatment;
- late int? estimatedCost;
- late String? elementsForImprovement;
- late bool isPackagePatient;
- late String complications;
- late String otherDepartmentInterventions;
- late String otherProcedures;
- late String pastMedicalHistory;
- late String pastSurgicalHistory;
- late List? admissionRequestDiagnoses;
- late List? admissionRequestProcedures;
- late int? appointmentNo;
- late int? episodeID;
- late int? admissionRequestNo;
+ int patientMRN;
+ int admitToClinic;
+ bool isPregnant;
+ int pregnancyWeeks;
+ int pregnancyType;
+ int noOfBabies;
+ int mrpDoctorID;
+ String admissionDate;
+ int expectedDays;
+ int admissionType;
+ int admissionLocationID;
+ int roomCategoryID;
+ int wardID;
+ bool isSickLeaveRequired;
+ String sickLeaveComments;
+ bool isTransport;
+ String transportComments;
+ bool isPhysioAppointmentNeeded;
+ String physioAppointmentComments;
+ bool isOPDFollowupAppointmentNeeded;
+ String opdFollowUpComments;
+ bool isDietType;
+ int dietType;
+ String dietRemarks;
+ bool isPhysicalActivityModification;
+ String physicalActivityModificationComments;
+ int orStatus;
+ String mainLineOfTreatment;
+ int estimatedCost;
+ String elementsForImprovement;
+ bool isPackagePatient;
+ String complications;
+ String otherDepartmentInterventions;
+ String otherProcedures;
+ String pastMedicalHistory;
+ String pastSurgicalHistory;
+ List admissionRequestDiagnoses;
+ List admissionRequestProcedures;
+ int appointmentNo;
+ int episodeID;
+ int admissionRequestNo;
AdmissionRequest(
{this.patientMRN,
@@ -110,7 +110,8 @@ class AdmissionRequest {
dietType = json['dietType'];
dietRemarks = json['dietRemarks'];
isPhysicalActivityModification = json['isPhysicalActivityModification'];
- physicalActivityModificationComments = json['physicalActivityModificationComments'];
+ physicalActivityModificationComments =
+ json['physicalActivityModificationComments'];
orStatus = json['orStatus'];
mainLineOfTreatment = json['mainLineOfTreatment'];
estimatedCost = json['estimatedCost'];
@@ -122,17 +123,17 @@ class AdmissionRequest {
pastMedicalHistory = json['pastMedicalHistory'];
pastSurgicalHistory = json['pastSurgicalHistory'];
if (json['admissionRequestDiagnoses'] != null) {
- admissionRequestDiagnoses = [];
+ admissionRequestDiagnoses = new List();
json['admissionRequestDiagnoses'].forEach((v) {
- admissionRequestDiagnoses!.add(v);
+ admissionRequestDiagnoses.add(v);
// admissionRequestDiagnoses
// .add(new AdmissionRequestDiagnoses.fromJson(v));
});
}
if (json['admissionRequestProcedures'] != null) {
- admissionRequestProcedures = [];
+ admissionRequestProcedures = new List();
json['admissionRequestProcedures'].forEach((v) {
- admissionRequestProcedures!.add(v);
+ admissionRequestProcedures.add(v);
// admissionRequestProcedures
// .add(new AdmissionRequestProcedures.fromJson(v));
});
@@ -163,13 +164,16 @@ class AdmissionRequest {
data['transportComments'] = this.transportComments;
data['isPhysioAppointmentNeeded'] = this.isPhysioAppointmentNeeded;
data['physioAppointmentComments'] = this.physioAppointmentComments;
- data['isOPDFollowupAppointmentNeeded'] = this.isOPDFollowupAppointmentNeeded;
+ data['isOPDFollowupAppointmentNeeded'] =
+ this.isOPDFollowupAppointmentNeeded;
data['opdFollowUpComments'] = this.opdFollowUpComments;
data['isDietType'] = this.isDietType;
data['dietType'] = this.dietType;
data['dietRemarks'] = this.dietRemarks;
- data['isPhysicalActivityModification'] = this.isPhysicalActivityModification;
- data['physicalActivityModificationComments'] = this.physicalActivityModificationComments;
+ data['isPhysicalActivityModification'] =
+ this.isPhysicalActivityModification;
+ data['physicalActivityModificationComments'] =
+ this.physicalActivityModificationComments;
data['orStatus'] = this.orStatus;
data['mainLineOfTreatment'] = this.mainLineOfTreatment;
data['estimatedCost'] = this.estimatedCost;
@@ -185,7 +189,8 @@ class AdmissionRequest {
// this.admissionRequestDiagnoses.map((v) => v.toJson()).toList();
}
if (this.admissionRequestProcedures != null) {
- data['admissionRequestProcedures'] = this.admissionRequestProcedures!.map((v) => v.toJson()).toList();
+ data['admissionRequestProcedures'] =
+ this.admissionRequestProcedures.map((v) => v.toJson()).toList();
}
data['appointmentNo'] = this.appointmentNo;
data['episodeID'] = this.episodeID;
diff --git a/lib/core/model/admissionRequest/clinic-model.dart b/lib/core/model/admissionRequest/clinic-model.dart
index e5a03264..05d34645 100644
--- a/lib/core/model/admissionRequest/clinic-model.dart
+++ b/lib/core/model/admissionRequest/clinic-model.dart
@@ -1,16 +1,16 @@
class Clinic {
- late int? clinicGroupID;
- late String? clinicGroupName;
- late int? clinicID;
- late String? clinicNameArabic;
- late String? clinicNameEnglish;
+ int clinicGroupID;
+ String clinicGroupName;
+ int clinicID;
+ String clinicNameArabic;
+ String clinicNameEnglish;
Clinic(
{this.clinicGroupID,
- this.clinicGroupName,
- this.clinicID,
- this.clinicNameArabic,
- this.clinicNameEnglish});
+ this.clinicGroupName,
+ this.clinicID,
+ this.clinicNameArabic,
+ this.clinicNameEnglish});
Clinic.fromJson(Map json) {
clinicGroupID = json['clinicGroupID'];
@@ -29,4 +29,5 @@ class Clinic {
data['clinicNameEnglish'] = this.clinicNameEnglish;
return data;
}
-}
+
+}
\ No newline at end of file
diff --git a/lib/core/model/admissionRequest/ward-model.dart b/lib/core/model/admissionRequest/ward-model.dart
index 8f7b9fe5..606758d3 100644
--- a/lib/core/model/admissionRequest/ward-model.dart
+++ b/lib/core/model/admissionRequest/ward-model.dart
@@ -1,9 +1,9 @@
class WardModel{
- late String ? description;
- late String ? descriptionN;
- late int ? floorID;
- late bool ? isActive;
+ String description;
+ String descriptionN;
+ int floorID;
+ bool isActive;
WardModel(
{this.description, this.descriptionN, this.floorID, this.isActive});
diff --git a/lib/core/model/auth/activation_Code_req_model.dart b/lib/core/model/auth/activation_Code_req_model.dart
index 13d64f6a..85d7f1d3 100644
--- a/lib/core/model/auth/activation_Code_req_model.dart
+++ b/lib/core/model/auth/activation_Code_req_model.dart
@@ -1,12 +1,12 @@
class ActivationCodeModel {
- late int? channel;
- late int? loginDoctorID;
- late int? languageID;
- late double? versionID;
- late int? memberID;
- late int? facilityId;
- late String? generalid;
- late String? otpSendType;
+ int channel;
+ int languageID;
+ int loginDoctorID;
+ double versionID;
+ int memberID;
+ int facilityId;
+ String generalid;
+ String otpSendType;
ActivationCodeModel(
{this.channel,
diff --git a/lib/core/model/auth/activation_code_for_verification_screen_model.dart b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
index 51fb5ab3..dae31f8c 100644
--- a/lib/core/model/auth/activation_code_for_verification_screen_model.dart
+++ b/lib/core/model/auth/activation_code_for_verification_screen_model.dart
@@ -1,19 +1,18 @@
class ActivationCodeForVerificationScreenModel {
- late int? oTPSendType;
- late String? mobileNumber;
- late String? zipCode;
- late int? channel;
- late int? loginDoctorID;
- late int? languageID;
- late double? versionID;
- late int? memberID;
- late int? facilityId;
- late String? generalid;
- late int? isMobileFingerPrint;
- late String? vidaAuthTokenID;
- late String? vidaRefreshTokenID;
- late String? iMEI;
-
+ int oTPSendType;
+ String mobileNumber;
+ String zipCode;
+ int channel;
+ int loginDoctorID;
+ int languageID;
+ double versionID;
+ int memberID;
+ int facilityId;
+ String generalid;
+ int isMobileFingerPrint;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ String iMEI;
ActivationCodeForVerificationScreenModel(
{this.oTPSendType,
this.mobileNumber,
diff --git a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
index 3fa2f69b..e39518e6 100644
--- a/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
@@ -1,12 +1,12 @@
import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart';
class CheckActivationCodeForDoctorAppResponseModel {
- late String? authenticationTokenID;
- late List? listDoctorsClinic;
- List? listDoctorProfile;
- late MemberInformation? memberInformation;
- String? vidaAuthTokenID;
- String? vidaRefreshTokenID;
+ String authenticationTokenID;
+ List listDoctorsClinic;
+ List listDoctorProfile;
+ MemberInformation memberInformation;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
CheckActivationCodeForDoctorAppResponseModel(
{this.authenticationTokenID,
@@ -20,16 +20,16 @@ class CheckActivationCodeForDoctorAppResponseModel {
Map json) {
authenticationTokenID = json['AuthenticationTokenID'];
if (json['List_DoctorsClinic'] != null) {
- listDoctorsClinic = [];
+ listDoctorsClinic = new List();
json['List_DoctorsClinic'].forEach((v) {
- listDoctorsClinic!.add(new ListDoctorsClinic.fromJson(v));
+ listDoctorsClinic.add(new ListDoctorsClinic.fromJson(v));
});
}
if (json['List_DoctorProfile'] != null) {
- listDoctorProfile = [];
+ listDoctorProfile = new List();
json['List_DoctorProfile'].forEach((v) {
- listDoctorProfile!.add(new DoctorProfileModel.fromJson(v));
+ listDoctorProfile.add(new DoctorProfileModel.fromJson(v));
});
}
vidaAuthTokenID = json['VidaAuthTokenID'];
@@ -45,27 +45,27 @@ class CheckActivationCodeForDoctorAppResponseModel {
data['AuthenticationTokenID'] = this.authenticationTokenID;
if (this.listDoctorsClinic != null) {
data['List_DoctorsClinic'] =
- this.listDoctorsClinic!.map((v) => v.toJson()).toList();
+ this.listDoctorsClinic.map((v) => v.toJson()).toList();
}
if (this.listDoctorProfile != null) {
data['List_DoctorProfile'] =
- this.listDoctorProfile!.map((v) => v.toJson()).toList();
+ this.listDoctorProfile.map((v) => v.toJson()).toList();
}
if (this.memberInformation != null) {
- data['memberInformation'] = this.memberInformation!.toJson();
+ data['memberInformation'] = this.memberInformation.toJson();
}
return data;
}
}
class ListDoctorsClinic {
- late dynamic setupID;
- late int? projectID;
- late int? doctorID;
- late int? clinicID;
- late bool? isActive;
- late String? clinicName;
+ Null setupID;
+ int projectID;
+ int doctorID;
+ int clinicID;
+ bool isActive;
+ String clinicName;
ListDoctorsClinic(
{this.setupID,
@@ -97,15 +97,15 @@ class ListDoctorsClinic {
}
class MemberInformation {
- late List? clinics;
- late int? doctorId;
- late String? email;
- late int? employeeId;
- late int? memberId;
- late dynamic memberName;
- late dynamic memberNameArabic;
- late String? preferredLanguage;
- late List? roles;
+ List clinics;
+ int doctorId;
+ String email;
+ int employeeId;
+ int memberId;
+ Null memberName;
+ Null memberNameArabic;
+ String preferredLanguage;
+ List roles;
MemberInformation(
{this.clinics,
@@ -120,9 +120,9 @@ class MemberInformation {
MemberInformation.fromJson(Map json) {
if (json['clinics'] != null) {
- clinics = [];
+ clinics = new List();
json['clinics'].forEach((v) {
- clinics!.add(new Clinics.fromJson(v));
+ clinics.add(new Clinics.fromJson(v));
});
}
doctorId = json['doctorId'];
@@ -133,9 +133,9 @@ class MemberInformation {
memberNameArabic = json['memberNameArabic'];
preferredLanguage = json['preferredLanguage'];
if (json['roles'] != null) {
- roles = [];
+ roles = new List();
json['roles'].forEach((v) {
- roles!.add(new Roles.fromJson(v));
+ roles.add(new Roles.fromJson(v));
});
}
}
@@ -143,7 +143,7 @@ class MemberInformation {
Map toJson() {
final Map data = new Map();
if (this.clinics != null) {
- data['clinics'] = this.clinics!.map((v) => v.toJson()).toList();
+ data['clinics'] = this.clinics.map((v) => v.toJson()).toList();
}
data['doctorId'] = this.doctorId;
data['email'] = this.email;
@@ -153,16 +153,16 @@ class MemberInformation {
data['memberNameArabic'] = this.memberNameArabic;
data['preferredLanguage'] = this.preferredLanguage;
if (this.roles != null) {
- data['roles'] = this.roles!.map((v) => v.toJson()).toList();
+ data['roles'] = this.roles.map((v) => v.toJson()).toList();
}
return data;
}
}
class Clinics {
- late bool? defaultClinic;
- late int? id;
- late String? name;
+ bool defaultClinic;
+ int id;
+ String name;
Clinics({this.defaultClinic, this.id, this.name});
@@ -182,8 +182,8 @@ class Clinics {
}
class Roles {
- late String? name;
- late int? roleId;
+ String name;
+ int roleId;
Roles({this.name, this.roleId});
diff --git a/lib/core/model/auth/check_activation_code_request_model.dart b/lib/core/model/auth/check_activation_code_request_model.dart
index fee596fe..94502a71 100644
--- a/lib/core/model/auth/check_activation_code_request_model.dart
+++ b/lib/core/model/auth/check_activation_code_request_model.dart
@@ -1,24 +1,24 @@
class CheckActivationCodeRequestModel {
- String? mobileNumber;
- String? zipCode;
- int? doctorID;
- int? memberID;
- int? loginDoctorID;
- String? password;
- String? facilityId;
- String? iPAdress;
- int? channel;
- int? languageID;
- int? projectID;
- double? versionID;
- String? generalid;
- String? logInTokenID;
- String? activationCode;
- String? vidaAuthTokenID;
- String? vidaRefreshTokenID;
- String? iMEI;
- bool? isForSilentLogin;
- int? oTPSendType;
+ String mobileNumber;
+ String zipCode;
+ int doctorID;
+ int memberID;
+ int loginDoctorID;
+ String password;
+ String facilityId;
+ String iPAdress;
+ int channel;
+ int languageID;
+ int projectID;
+ double versionID;
+ String generalid;
+ String logInTokenID;
+ String activationCode;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ String iMEI;
+ bool isForSilentLogin;
+ int oTPSendType;
CheckActivationCodeRequestModel(
{this.mobileNumber,
this.zipCode,
diff --git a/lib/core/model/auth/imei_details.dart b/lib/core/model/auth/imei_details.dart
index 95ff1e74..eb37e736 100644
--- a/lib/core/model/auth/imei_details.dart
+++ b/lib/core/model/auth/imei_details.dart
@@ -1,34 +1,33 @@
class GetIMEIDetailsModel {
- late int? iD;
- late String? iMEI;
- late int? logInTypeID;
- late bool? outSA;
- late String? mobile;
- late dynamic identificationNo;
- late int? doctorID;
- late String? doctorName;
- late String? doctorNameN;
- late int? clinicID;
- late String? clinicDescription;
- late dynamic clinicDescriptionN;
- late int? projectID;
- late String? projectName;
- late String? genderDescription;
- late dynamic genderDescriptionN;
- late String? titleDescription;
- late dynamic titleDescriptionN;
- late dynamic zipCode;
- late String? createdOn;
- late dynamic createdBy;
- late String? editedOn;
- late dynamic editedBy;
- late bool? biometricEnabled;
- late dynamic preferredLanguage;
- late bool? isActive;
- late String? vidaAuthTokenID;
- late String? vidaRefreshTokenID;
- late String? password;
-
+ int iD;
+ String iMEI;
+ int logInTypeID;
+ bool outSA;
+ String mobile;
+ dynamic identificationNo;
+ int doctorID;
+ String doctorName;
+ String doctorNameN;
+ int clinicID;
+ String clinicDescription;
+ dynamic clinicDescriptionN;
+ int projectID;
+ String projectName;
+ String genderDescription;
+ dynamic genderDescriptionN;
+ String titleDescription;
+ dynamic titleDescriptionN;
+ dynamic zipCode;
+ String createdOn;
+ dynamic createdBy;
+ String editedOn;
+ dynamic editedBy;
+ bool biometricEnabled;
+ dynamic preferredLanguage;
+ bool isActive;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ String password;
GetIMEIDetailsModel(
{this.iD,
this.iMEI,
diff --git a/lib/core/model/auth/insert_imei_model.dart b/lib/core/model/auth/insert_imei_model.dart
index 5e54b127..25e22b7a 100644
--- a/lib/core/model/auth/insert_imei_model.dart
+++ b/lib/core/model/auth/insert_imei_model.dart
@@ -1,37 +1,37 @@
class InsertIMEIDetailsModel {
- late String? iMEI;
- late int ?logInTypeID;
- late dynamic outSA;
- late String? mobile;
- late dynamic identificationNo;
- late int ?doctorID;
- late String? doctorName;
- late String ?doctorNameN;
- late int ?clinicID;
- late String ?clinicDescription;
- late dynamic clinicDescriptionN;
- late String ?projectName;
- late String ?genderDescription;
- late dynamic genderDescriptionN;
- late String ?titleDescription;
- late dynamic titleDescriptionN;
- late bool ?bioMetricEnabled;
- late dynamic preferredLanguage;
- late bool ?isActive;
- late int ?editedBy;
- late int ?projectID;
- late String ?tokenID;
- late int ?languageID;
- late String ?stamp;
- late String ?iPAdress;
- late double ?versionID;
- late int ?channel;
- late String ?sessionID;
- late bool ?isLoginForDoctorApp;
- late int ?patientOutSA;
- late String ?vidaAuthTokenID;
- late String ?vidaRefreshTokenID;
- late dynamic password;
+ String iMEI;
+ int logInTypeID;
+ dynamic outSA;
+ String mobile;
+ dynamic identificationNo;
+ int doctorID;
+ String doctorName;
+ String doctorNameN;
+ int clinicID;
+ String clinicDescription;
+ Null clinicDescriptionN;
+ String projectName;
+ String genderDescription;
+ Null genderDescriptionN;
+ String titleDescription;
+ Null titleDescriptionN;
+ bool bioMetricEnabled;
+ Null preferredLanguage;
+ bool isActive;
+ int editedBy;
+ int projectID;
+ String tokenID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ int patientOutSA;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ dynamic password;
InsertIMEIDetailsModel(
{this.iMEI,
this.logInTypeID,
diff --git a/lib/core/model/auth/new_login_information_response_model.dart b/lib/core/model/auth/new_login_information_response_model.dart
index c834580b..117060e4 100644
--- a/lib/core/model/auth/new_login_information_response_model.dart
+++ b/lib/core/model/auth/new_login_information_response_model.dart
@@ -1,13 +1,13 @@
class NewLoginInformationModel {
- late int? doctorID;
- late List? listMemberInformation;
- late String ?logInTokenID;
- late String ?mobileNumber;
- late dynamic sELECTDeviceIMEIbyIMEIList;
- late int ?userID;
- late String ?zipCode;
- late bool ?isActiveCode;
- late bool ?isSMSSent;
+ int doctorID;
+ List listMemberInformation;
+ String logInTokenID;
+ String mobileNumber;
+ Null sELECTDeviceIMEIbyIMEIList;
+ int userID;
+ String zipCode;
+ bool isActiveCode;
+ bool isSMSSent;
NewLoginInformationModel(
{this.doctorID,
@@ -23,9 +23,9 @@ class NewLoginInformationModel {
NewLoginInformationModel.fromJson(Map json) {
doctorID = json['DoctorID'];
if (json['List_MemberInformation'] != null) {
- listMemberInformation = [];
+ listMemberInformation = new List();
json['List_MemberInformation'].forEach((v) {
- listMemberInformation!.add(new ListMemberInformation.fromJson(v));
+ listMemberInformation.add(new ListMemberInformation.fromJson(v));
});
}
logInTokenID = json['LogInTokenID'];
@@ -42,7 +42,7 @@ class NewLoginInformationModel {
data['DoctorID'] = this.doctorID;
if (this.listMemberInformation != null) {
data['List_MemberInformation'] =
- this.listMemberInformation!.map((v) => v.toJson()).toList();
+ this.listMemberInformation.map((v) => v.toJson()).toList();
}
data['LogInTokenID'] = this.logInTokenID;
data['MobileNumber'] = this.mobileNumber;
@@ -56,17 +56,17 @@ class NewLoginInformationModel {
}
class ListMemberInformation {
- late dynamic setupID;
- late int ? memberID;
- late String ? memberName;
- late dynamic memberNameN;
- late String ? preferredLang;
- late String ? pIN;
- late String ? saltHash;
- late int ? referenceID;
- late int ? employeeID;
- late int ? roleID;
- late int ? projectid;
+ Null setupID;
+ int memberID;
+ String memberName;
+ Null memberNameN;
+ String preferredLang;
+ String pIN;
+ String saltHash;
+ int referenceID;
+ int employeeID;
+ int roleID;
+ int projectid;
ListMemberInformation(
{this.setupID,
diff --git a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
index db971954..ceaf4c65 100644
--- a/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
+++ b/lib/core/model/auth/send_activation_code_for_doctor_app_response_model.dart
@@ -1,8 +1,8 @@
class SendActivationCodeForDoctorAppResponseModel {
- String? logInTokenID;
- String? verificationCode;
- String? vidaAuthTokenID;
- String? vidaRefreshTokenID;
+ String logInTokenID;
+ String verificationCode;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
SendActivationCodeForDoctorAppResponseModel(
{this.logInTokenID,
diff --git a/lib/core/model/calculate_box_request_model.dart b/lib/core/model/calculate_box_request_model.dart
index 24e75bb7..80281854 100644
--- a/lib/core/model/calculate_box_request_model.dart
+++ b/lib/core/model/calculate_box_request_model.dart
@@ -1,9 +1,9 @@
class CalculateBoxQuantityRequestModel {
- int? itemCode;
- double? strength;
- int? frequency;
- int? duration;
- String? vidaAuthTokenID;
+ int itemCode;
+ double strength;
+ int frequency;
+ int duration;
+ String vidaAuthTokenID;
CalculateBoxQuantityRequestModel(
{this.itemCode,
diff --git a/lib/core/model/diabetic_chart/DiabeticType.dart b/lib/core/model/diabetic_chart/DiabeticType.dart
index 8a9cfbe1..26641e61 100644
--- a/lib/core/model/diabetic_chart/DiabeticType.dart
+++ b/lib/core/model/diabetic_chart/DiabeticType.dart
@@ -1,7 +1,7 @@
class DiabeticType {
- int? value;
- String? nameEn;
- String? nameAr;
+ int value;
+ String nameEn;
+ String nameAr;
DiabeticType({this.value, this.nameEn, this.nameAr});
diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
index 34a8e997..7fad3106 100644
--- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
+++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart
@@ -1,22 +1,22 @@
class GetDiabeticChartValuesRequestModel {
- int? deviceTypeID;
- int? patientID;
- int? resultType;
- int? admissionNo;
- String? setupID;
- bool? patientOutSA;
- int? patientType;
- int? patientTypeID;
+ int deviceTypeID;
+ int patientID;
+ int resultType;
+ int admissionNo;
+ String setupID;
+ bool patientOutSA;
+ int patientType;
+ int patientTypeID;
GetDiabeticChartValuesRequestModel(
{this.deviceTypeID,
- this.patientID,
- this.resultType,
- this.admissionNo,
- this.setupID,
- this.patientOutSA,
- this.patientType,
- this.patientTypeID});
+ this.patientID,
+ this.resultType,
+ this.admissionNo,
+ this.setupID,
+ this.patientOutSA,
+ this.patientType,
+ this.patientTypeID});
GetDiabeticChartValuesRequestModel.fromJson(Map json) {
deviceTypeID = json['DeviceTypeID'];
diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
index 1e5dd8fd..fa2c1ca2 100644
--- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
+++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart
@@ -1,18 +1,18 @@
class GetDiabeticChartValuesResponseModel {
- String? resultType;
- int? admissionNo;
- String? dateChart;
- int? resultValue;
- int? createdBy;
- String? createdOn;
+ String resultType;
+ int admissionNo;
+ String dateChart;
+ int resultValue;
+ int createdBy;
+ String createdOn;
GetDiabeticChartValuesResponseModel(
{this.resultType,
- this.admissionNo,
- this.dateChart,
- this.resultValue,
- this.createdBy,
- this.createdOn});
+ this.admissionNo,
+ this.dateChart,
+ this.resultValue,
+ this.createdBy,
+ this.createdOn});
GetDiabeticChartValuesResponseModel.fromJson(Map json) {
resultType = json['ResultType'];
diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
index bea61fc9..310cfb50 100644
--- a/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
+++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart
@@ -1,16 +1,16 @@
class GetDiagnosisForInPatientRequestModel {
- int? patientID;
- int? admissionNo;
- String? setupID;
- int? patientType;
- int? patientTypeID;
+ int patientID;
+ int admissionNo;
+ String setupID;
+ int patientType;
+ int patientTypeID;
GetDiagnosisForInPatientRequestModel(
{this.patientID,
- this.admissionNo,
- this.setupID,
- this.patientType,
- this.patientTypeID});
+ this.admissionNo,
+ this.setupID,
+ this.patientType,
+ this.patientTypeID});
GetDiagnosisForInPatientRequestModel.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
index 491ac591..1ec48964 100644
--- a/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
+++ b/lib/core/model/diagnosis/GetDiagnosisForInPatientResponseModel.dart
@@ -1,27 +1,26 @@
class GetDiagnosisForInPatientResponseModel {
- String? iCDCode10ID;
- int? diagnosisTypeID;
- int? conditionID;
- bool? complexDiagnosis;
- String? asciiDesc;
- int? createdBy;
- String? createdOn;
- int? editedBy;
- String? editedOn;
- String? createdByName;
- String? editedByName;
+ String iCDCode10ID;
+ int diagnosisTypeID;
+ int conditionID;
+ bool complexDiagnosis;
+ String asciiDesc;
+ int createdBy;
+ String createdOn;
+ int editedBy;
+ String editedOn;
+ String createdByName;
+ String editedByName;
GetDiagnosisForInPatientResponseModel(
{this.iCDCode10ID,
- this.diagnosisTypeID,
- this.conditionID,
- this.complexDiagnosis,
- this.asciiDesc,
- this.createdBy,
- this.createdOn,
- this.editedBy,
- this.editedOn,
- this.createdByName});
+ this.diagnosisTypeID,
+ this.conditionID,
+ this.complexDiagnosis,
+ this.asciiDesc,
+ this.createdBy,
+ this.createdOn,
+ this.editedBy,
+ this.editedOn, this.createdByName});
GetDiagnosisForInPatientResponseModel.fromJson(Map json) {
iCDCode10ID = json['ICDCode10ID'];
diff --git a/lib/core/model/hospitals/get_hospitals_request_model.dart b/lib/core/model/hospitals/get_hospitals_request_model.dart
index 550f8ca8..8a5f1bc1 100644
--- a/lib/core/model/hospitals/get_hospitals_request_model.dart
+++ b/lib/core/model/hospitals/get_hospitals_request_model.dart
@@ -1,13 +1,13 @@
class GetHospitalsRequestModel {
- int ?languageID;
- String? stamp;
- String? iPAdress;
- double? versionID;
- int ?channel;
- String? tokenID;
- String? sessionID;
- bool ?isLoginForDoctorApp;
- String ?memberID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ String memberID;
GetHospitalsRequestModel(
{this.languageID,
diff --git a/lib/core/model/hospitals/get_hospitals_response_model.dart b/lib/core/model/hospitals/get_hospitals_response_model.dart
index 1109b58b..edbc3fe5 100644
--- a/lib/core/model/hospitals/get_hospitals_response_model.dart
+++ b/lib/core/model/hospitals/get_hospitals_response_model.dart
@@ -1,7 +1,7 @@
class GetHospitalsResponseModel {
- String? facilityGroupId;
- int ?facilityId;
- String ?facilityName;
+ String facilityGroupId;
+ int facilityId;
+ String facilityName;
GetHospitalsResponseModel(
{this.facilityGroupId, this.facilityId, this.facilityName});
diff --git a/lib/core/model/hospitals_model.dart b/lib/core/model/hospitals_model.dart
index f2c89cfb..b09807d6 100644
--- a/lib/core/model/hospitals_model.dart
+++ b/lib/core/model/hospitals_model.dart
@@ -1,20 +1,20 @@
class HospitalsModel {
- String? desciption;
+ String desciption;
dynamic desciptionN;
- int? iD;
- String? legalName;
- String? legalNameN;
- String? name;
+ int iD;
+ String legalName;
+ String legalNameN;
+ String name;
dynamic nameN;
- String? phoneNumber;
- String? setupID;
- int? distanceInKilometers;
- bool ?isActive;
- String? latitude;
- String? longitude;
- int? mainProjectID;
+ String phoneNumber;
+ String setupID;
+ int distanceInKilometers;
+ bool isActive;
+ String latitude;
+ String longitude;
+ int mainProjectID;
dynamic projectOutSA;
- bool ?usingInDoctorApp;
+ bool usingInDoctorApp;
HospitalsModel({this.desciption,
this.desciptionN,
@@ -33,7 +33,7 @@ class HospitalsModel {
this.projectOutSA,
this.usingInDoctorApp});
- HospitalsModel.fromJson(Map json) {
+ HospitalsModel.fromJson(Map json) {
desciption = json['Desciption'];
desciptionN = json['DesciptionN'];
iD = json['ID'];
@@ -52,8 +52,8 @@ class HospitalsModel {
usingInDoctorApp = json['UsingInDoctorApp'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['Desciption'] = this.desciption;
data['DesciptionN'] = this.desciptionN;
data['ID'] = this.iD;
diff --git a/lib/core/model/insurance/insurance_approval.dart b/lib/core/model/insurance/insurance_approval.dart
index 69e88a2e..a3717c42 100644
--- a/lib/core/model/insurance/insurance_approval.dart
+++ b/lib/core/model/insurance/insurance_approval.dart
@@ -1,11 +1,11 @@
class ApporvalDetails {
- int? approvalNo;
+ int approvalNo;
- String? procedureName;
+ String procedureName;
//String procedureNameN;
- String ?status;
+ String status;
- String ?isInvoicedDesc;
+ String isInvoicedDesc;
ApporvalDetails(
{this.approvalNo, this.procedureName, this.status, this.isInvoicedDesc});
@@ -35,35 +35,35 @@ class ApporvalDetails {
}
class InsuranceApprovalModel {
- List ?apporvalDetails;
- double ?versionID;
- int ? channel;
- int ? languageID;
- String ? iPAdress;
- String ? generalid;
- int ? patientOutSA;
- String ? sessionID;
- bool ? isDentalAllowedBackend;
- int ? deviceTypeID;
- int ? patientID;
- String ? tokenID;
- int ? patientTypeID;
- int ? patientType;
- int ? eXuldAPPNO;
- int ? projectID;
- String ? doctorName;
- String ? clinicName;
- String ? patientDescription;
- int ? approvalNo;
- String ?approvalStatusDescption;
- int ? unUsedCount;
- String ? doctorImage;
- String ? projectName;
+ List apporvalDetails;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
+ int eXuldAPPNO;
+ int projectID;
+ String doctorName;
+ String clinicName;
+ String patientDescription;
+ int approvalNo;
+ String approvalStatusDescption;
+ int unUsedCount;
+ String doctorImage;
+ String projectName;
//String companyName;
- String ? expiryDate;
- String ? rceiptOn;
- int ?appointmentNo;
+ String expiryDate;
+ String rceiptOn;
+ int appointmentNo;
InsuranceApprovalModel(
{this.versionID,
@@ -126,9 +126,9 @@ class InsuranceApprovalModel {
doctorImage = json['DoctorImageURL'];
clinicName = json['ClinicName'];
if (json['ApporvalDetails'] != null) {
- apporvalDetails =[];
+ apporvalDetails = new List();
json['ApporvalDetails'].forEach((v) {
- apporvalDetails!.add(new ApporvalDetails.fromJson(v));
+ apporvalDetails.add(new ApporvalDetails.fromJson(v));
});
}
appointmentNo = json['AppointmentNo'];
diff --git a/lib/core/model/insurance/insurance_approval_in_patient_model.dart b/lib/core/model/insurance/insurance_approval_in_patient_model.dart
index 722d34c7..f185a8bf 100644
--- a/lib/core/model/insurance/insurance_approval_in_patient_model.dart
+++ b/lib/core/model/insurance/insurance_approval_in_patient_model.dart
@@ -1,36 +1,36 @@
class InsuranceApprovalInPatientModel {
- String? setupID;
- int? projectID;
- int? approvalNo;
- int? status;
- String? approvalDate;
- int? patientType;
- int? patientID;
- int? companyID;
- bool? subCategoryID;
- int? doctorID;
- int? clinicID;
- int? approvalType;
- int? inpatientApprovalSubType;
+ String setupID;
+ int projectID;
+ int approvalNo;
+ int status;
+ String approvalDate;
+ int patientType;
+ int patientID;
+ int companyID;
+ bool subCategoryID;
+ int doctorID;
+ int clinicID;
+ int approvalType;
+ int inpatientApprovalSubType;
dynamic isApprovalOnGross;
- String? companyApprovalNo;
+ String companyApprovalNo;
dynamic progNoteOrderNo;
- String? submitOn;
- String? receiptOn;
- String? expiryDate;
- int? admissionNo;
- int? admissionRequestNo;
- String? approvalStatusDescption;
+ String submitOn;
+ String receiptOn;
+ String expiryDate;
+ int admissionNo;
+ int admissionRequestNo;
+ String approvalStatusDescption;
dynamic approvalStatusDescptionN;
dynamic remarks;
- List? apporvalDetails;
- String? clinicName;
+ List apporvalDetails;
+ String clinicName;
dynamic companyName;
- String? doctorName;
- String? projectName;
- int? totaUnUsedCount;
- int? unUsedCount;
- String? doctorImage;
+ String doctorName;
+ String projectName;
+ int totaUnUsedCount;
+ int unUsedCount;
+ String doctorImage;
InsuranceApprovalInPatientModel(
{this.setupID,
@@ -93,9 +93,9 @@ class InsuranceApprovalInPatientModel {
approvalStatusDescptionN = json['ApprovalStatusDescptionN'];
remarks = json['Remarks'];
if (json['ApporvalDetails'] != null) {
- apporvalDetails = [];
+ apporvalDetails = new List();
json['ApporvalDetails'].forEach((v) {
- apporvalDetails!.add(new ApporvalDetails.fromJson(v));
+ apporvalDetails.add(new ApporvalDetails.fromJson(v));
});
}
clinicName = json['ClinicName'];
@@ -135,7 +135,7 @@ class InsuranceApprovalInPatientModel {
data['Remarks'] = this.remarks;
if (this.apporvalDetails != null) {
data['ApporvalDetails'] =
- this.apporvalDetails!.map((v) => v.toJson()).toList();
+ this.apporvalDetails.map((v) => v.toJson()).toList();
}
data['ClinicName'] = this.clinicName;
data['CompanyName'] = this.companyName;
@@ -148,35 +148,35 @@ class InsuranceApprovalInPatientModel {
}
class ApporvalDetails {
- dynamic setupID;
- dynamic projectID;
- int? approvalNo;
- dynamic lineItemNo;
- dynamic orderType;
- dynamic procedureID;
- dynamic toothNo;
- dynamic price;
- dynamic approvedAmount;
- dynamic unapprovedPatientShare;
- dynamic waivedAmount;
- dynamic discountType;
- dynamic discountValue;
- dynamic shareType;
- dynamic patientShareTypeValue;
- dynamic companyShareTypeValue;
- dynamic patientShare;
- dynamic companyShare;
- dynamic deductableAmount;
- String? disapprovedRemarks;
- dynamic progNoteOrderNo;
- dynamic progNoteLineItemNo;
- dynamic invoiceTransactionType;
- dynamic invoiceNo;
- String? procedureName;
- String? procedureNameN;
- String? status;
- dynamic isInvoiced;
- String? isInvoicedDesc;
+ Null setupID;
+ Null projectID;
+ int approvalNo;
+ Null lineItemNo;
+ Null orderType;
+ Null procedureID;
+ Null toothNo;
+ Null price;
+ Null approvedAmount;
+ Null unapprovedPatientShare;
+ Null waivedAmount;
+ Null discountType;
+ Null discountValue;
+ Null shareType;
+ Null patientShareTypeValue;
+ Null companyShareTypeValue;
+ Null patientShare;
+ Null companyShare;
+ Null deductableAmount;
+ String disapprovedRemarks;
+ Null progNoteOrderNo;
+ Null progNoteLineItemNo;
+ Null invoiceTransactionType;
+ Null invoiceNo;
+ String procedureName;
+ String procedureNameN;
+ String status;
+ Null isInvoiced;
+ String isInvoicedDesc;
ApporvalDetails(
{this.setupID,
diff --git a/lib/core/model/labs/LabOrderResult.dart b/lib/core/model/labs/LabOrderResult.dart
index 7fc4432f..ecb4ae65 100644
--- a/lib/core/model/labs/LabOrderResult.dart
+++ b/lib/core/model/labs/LabOrderResult.dart
@@ -1,23 +1,23 @@
class LabOrderResult {
- String? description;
+ String description;
dynamic femaleInterpretativeData;
- int ?gender;
- int? lineItemNo;
+ int gender;
+ int lineItemNo;
dynamic maleInterpretativeData;
dynamic notes;
- String ?packageID;
- int ?patientID;
- String ? projectID;
- String ? referanceRange;
- String ? resultValue;
- String ? sampleCollectedOn;
- String ? sampleReceivedOn;
- String ? setupID;
+ String packageID;
+ int patientID;
+ String projectID;
+ String referanceRange;
+ String resultValue;
+ String sampleCollectedOn;
+ String sampleReceivedOn;
+ String setupID;
dynamic superVerifiedOn;
- String? testCode;
- String? uOM;
- String? verifiedOn;
- String? verifiedOnDateTime;
+ String testCode;
+ String uOM;
+ String verifiedOn;
+ String verifiedOnDateTime;
LabOrderResult(
{this.description,
diff --git a/lib/core/model/labs/LabResultHistory.dart b/lib/core/model/labs/LabResultHistory.dart
index 4d4221e1..7c4221ca 100644
--- a/lib/core/model/labs/LabResultHistory.dart
+++ b/lib/core/model/labs/LabResultHistory.dart
@@ -1,54 +1,54 @@
class LabResultHistory {
- String? description;
- String? femaleInterpretativeData;
- int? gender;
- bool? isCertificateAllowed;
- int? lineItemNo;
- String? maleInterpretativeData;
- String? notes;
- int? orderLineItemNo;
- int? orderNo;
- String? packageID;
- int? patientID;
- String? projectID;
- String? referanceRange;
- String? resultValue;
- int? resultValueBasedLineItemNo;
- String? resultValueFlag;
- String? sampleCollectedOn;
- String? sampleReceivedOn;
- String? setupID;
- String? superVerifiedOn;
- String? testCode;
- String? uOM;
- String? verifiedOn;
- String? verifiedOnDateTime;
+ String description;
+ String femaleInterpretativeData;
+ int gender;
+ bool isCertificateAllowed;
+ int lineItemNo;
+ String maleInterpretativeData;
+ String notes;
+ int orderLineItemNo;
+ int orderNo;
+ String packageID;
+ int patientID;
+ String projectID;
+ String referanceRange;
+ String resultValue;
+ int resultValueBasedLineItemNo;
+ String resultValueFlag;
+ String sampleCollectedOn;
+ String sampleReceivedOn;
+ String setupID;
+ String superVerifiedOn;
+ String testCode;
+ String uOM;
+ String verifiedOn;
+ String verifiedOnDateTime;
LabResultHistory(
{this.description,
- this.femaleInterpretativeData,
- this.gender,
- this.isCertificateAllowed,
- this.lineItemNo,
- this.maleInterpretativeData,
- this.notes,
- this.orderLineItemNo,
- this.orderNo,
- this.packageID,
- this.patientID,
- this.projectID,
- this.referanceRange,
- this.resultValue,
- this.resultValueBasedLineItemNo,
- this.resultValueFlag,
- this.sampleCollectedOn,
- this.sampleReceivedOn,
- this.setupID,
- this.superVerifiedOn,
- this.testCode,
- this.uOM,
- this.verifiedOn,
- this.verifiedOnDateTime});
+ this.femaleInterpretativeData,
+ this.gender,
+ this.isCertificateAllowed,
+ this.lineItemNo,
+ this.maleInterpretativeData,
+ this.notes,
+ this.orderLineItemNo,
+ this.orderNo,
+ this.packageID,
+ this.patientID,
+ this.projectID,
+ this.referanceRange,
+ this.resultValue,
+ this.resultValueBasedLineItemNo,
+ this.resultValueFlag,
+ this.sampleCollectedOn,
+ this.sampleReceivedOn,
+ this.setupID,
+ this.superVerifiedOn,
+ this.testCode,
+ this.uOM,
+ this.verifiedOn,
+ this.verifiedOnDateTime});
LabResultHistory.fromJson(Map json) {
description = json['Description'];
@@ -105,4 +105,4 @@ class LabResultHistory {
data['VerifiedOnDateTime'] = this.verifiedOnDateTime;
return data;
}
-}
+}
\ No newline at end of file
diff --git a/lib/core/model/labs/all_special_lab_result_model.dart b/lib/core/model/labs/all_special_lab_result_model.dart
index a177e16e..ffdc5ee5 100644
--- a/lib/core/model/labs/all_special_lab_result_model.dart
+++ b/lib/core/model/labs/all_special_lab_result_model.dart
@@ -5,51 +5,51 @@ class AllSpecialLabResultModel {
dynamic appointmentDate;
dynamic appointmentNo;
dynamic appointmentTime;
- String? clinicDescription;
- String? clinicDescriptionEnglish;
+ String clinicDescription;
+ String clinicDescriptionEnglish;
dynamic clinicDescriptionN;
dynamic clinicID;
dynamic createdOn;
- double? decimalDoctorRate;
+ double decimalDoctorRate;
dynamic doctorID;
- String? doctorImageURL;
- String? doctorName;
- String? doctorNameEnglish;
+ String doctorImageURL;
+ String doctorName;
+ String doctorNameEnglish;
dynamic doctorNameN;
dynamic doctorRate;
dynamic doctorStarsRate;
- String? doctorTitle;
+ String doctorTitle;
dynamic gender;
- String? genderDescription;
- bool? inOutPatient;
- String? invoiceNo;
- bool? isActiveDoctorProfile;
- bool? isDoctorAllowVedioCall;
- bool? isExecludeDoctor;
- bool? isInOutPatient;
+ String genderDescription;
+ bool inOutPatient;
+ String invoiceNo;
+ bool isActiveDoctorProfile;
+ bool isDoctorAllowVedioCall;
+ bool isExecludeDoctor;
+ bool isInOutPatient;
dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN;
- bool? isLiveCareAppointment;
- bool? isRead;
- bool? isSendEmail;
- String? moduleID;
- String? nationalityFlagURL;
+ bool isLiveCareAppointment;
+ bool isRead;
+ bool isSendEmail;
+ String moduleID;
+ String nationalityFlagURL;
dynamic noOfPatientsRate;
dynamic orderDate;
- String? orderNo;
+ String orderNo;
dynamic patientID;
- String? projectID;
- String? projectName;
+ String projectID;
+ String projectName;
dynamic projectNameN;
- String? qR;
- String? resultData;
- String? resultDataHTML;
+ String qR;
+ String resultData;
+ String resultDataHTML;
dynamic resultDataTxt;
- String? setupID;
+ String setupID;
//List speciality;
dynamic status;
dynamic statusDesc;
- String? strOrderDate;
+ String strOrderDate;
AllSpecialLabResultModel(
{this.actualDoctorRate,
diff --git a/lib/core/model/labs/all_special_lab_result_request.dart b/lib/core/model/labs/all_special_lab_result_request.dart
index 950f0e96..d5df1405 100644
--- a/lib/core/model/labs/all_special_lab_result_request.dart
+++ b/lib/core/model/labs/all_special_lab_result_request.dart
@@ -1,18 +1,18 @@
class AllSpecialLabResultRequestModel {
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
- String? sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- String? tokenID;
- int? patientTypeID;
- int? patientType;
- int? patientID;
- int? projectID;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
+ int patientID;
+ int projectID;
AllSpecialLabResultRequestModel(
{this.versionID,
diff --git a/lib/core/model/labs/lab_result.dart b/lib/core/model/labs/lab_result.dart
index 0cc48aef..ee9f981d 100644
--- a/lib/core/model/labs/lab_result.dart
+++ b/lib/core/model/labs/lab_result.dart
@@ -1,24 +1,24 @@
class LabResult {
- String? description;
+ String description;
dynamic femaleInterpretativeData;
- int? gender;
- int? lineItemNo;
+ int gender;
+ int lineItemNo;
dynamic maleInterpretativeData;
- String? notes;
- String? packageID;
- int? patientID;
- String? projectID;
- String? referanceRange;
- String? resultValue;
- String? sampleCollectedOn;
- String? sampleReceivedOn;
- String? setupID;
- String? maxValue;
- String? minValue;
+ String notes;
+ String packageID;
+ int patientID;
+ String projectID;
+ String referanceRange;
+ String resultValue;
+ String maxValue;
+ String minValue;
+ String sampleCollectedOn;
+ String sampleReceivedOn;
+ String setupID;
dynamic superVerifiedOn;
- String? testCode;
- String? uOM;
- String? verifiedOn;
+ String testCode;
+ String uOM;
+ String verifiedOn;
dynamic verifiedOnDateTime;
LabResult(
@@ -96,9 +96,9 @@ class LabResult {
int checkResultStatus() {
try {
- var max = double.tryParse(maxValue!) ?? null;
- var min = double.tryParse(minValue!) ?? null;
- var result = double.tryParse(resultValue!) ?? null;
+ var max = double.tryParse(maxValue) ?? null;
+ var min = double.tryParse(minValue) ?? null;
+ var result = double.tryParse(resultValue) ?? null;
if (max != null && min != null && result != null) {
if (result > max) {
return 1;
@@ -110,17 +110,18 @@ class LabResult {
} else {
return 0;
}
- } catch (e) {
+ }catch (e){
return 0;
}
+
}
}
class LabResultList {
String filterName = "";
- List patientLabResultList = [];
+ List patientLabResultList = List();
- LabResultList({required this.filterName, required LabResult lab}) {
+ LabResultList({this.filterName, LabResult lab}) {
patientLabResultList.add(lab);
}
}
diff --git a/lib/core/model/labs/patient_lab_orders.dart b/lib/core/model/labs/patient_lab_orders.dart
index 08f81f16..af60f86f 100644
--- a/lib/core/model/labs/patient_lab_orders.dart
+++ b/lib/core/model/labs/patient_lab_orders.dart
@@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PatientLabOrders {
- int ?actualDoctorRate;
- String ?clinicDescription;
- String ?clinicDescriptionEnglish;
- dynamic clinicDescriptionN;
- int ?clinicID;
- int ?doctorID;
- String? doctorImageURL;
- String ?doctorName;
- String ?doctorNameEnglish;
- dynamic doctorNameN;
- int ?doctorRate;
- String ?doctorTitle;
- int ?gender;
- String ?genderDescription;
- String ?invoiceNo;
- bool ?isActiveDoctorProfile;
- bool ?isDoctorAllowVedioCall;
- bool ?isExecludeDoctor;
- bool ?isInOutPatient;
- String ?isInOutPatientDescription;
- String ?isInOutPatientDescriptionN;
- bool ?isRead;
- String ?nationalityFlagURL;
- int ?noOfPatientsRate;
- DateTime? orderDate;
- String ?orderNo;
- String ?patientID;
- String ?projectID;
- String ?projectName;
- dynamic projectNameN;
- String ?qR;
- String ?setupID;
- List ?speciality;
- bool ?isLiveCareAppointment;
+ int actualDoctorRate;
+ String clinicDescription;
+ String clinicDescriptionEnglish;
+ Null clinicDescriptionN;
+ int clinicID;
+ int doctorID;
+ String doctorImageURL;
+ String doctorName;
+ String doctorNameEnglish;
+ Null doctorNameN;
+ int doctorRate;
+ String doctorTitle;
+ int gender;
+ String genderDescription;
+ String invoiceNo;
+ bool isActiveDoctorProfile;
+ bool isDoctorAllowVedioCall;
+ bool isExecludeDoctor;
+ bool isInOutPatient;
+ String isInOutPatientDescription;
+ String isInOutPatientDescriptionN;
+ bool isRead;
+ String nationalityFlagURL;
+ int noOfPatientsRate;
+ DateTime orderDate;
+ String orderNo;
+ String patientID;
+ String projectID;
+ String projectName;
+ Null projectNameN;
+ String qR;
+ String setupID;
+ List speciality;
+ bool isLiveCareAppointment;
PatientLabOrders(
{this.actualDoctorRate,
this.clinicDescription,
@@ -149,10 +149,10 @@ class PatientLabOrders {
class PatientLabOrdersList {
String filterName = "";
- List patientLabOrdersList = [];
+ List patientLabOrdersList = List();
PatientLabOrdersList(
- {required this.filterName, required PatientLabOrders patientDoctorAppointment}) {
+ {this.filterName, PatientLabOrders patientDoctorAppointment}) {
patientLabOrdersList.add(patientDoctorAppointment);
}
}
diff --git a/lib/core/model/labs/patient_lab_special_result.dart b/lib/core/model/labs/patient_lab_special_result.dart
index f86dd56f..2fbcb832 100644
--- a/lib/core/model/labs/patient_lab_special_result.dart
+++ b/lib/core/model/labs/patient_lab_special_result.dart
@@ -1,9 +1,9 @@
class PatientLabSpecialResult {
- String ?invoiceNo;
- String ?moduleID;
- String ? resultData;
- String ? resultDataHTML;
- dynamic resultDataTxt;
+ String invoiceNo;
+ String moduleID;
+ String resultData;
+ String resultDataHTML;
+ Null resultDataTxt;
PatientLabSpecialResult(
{this.invoiceNo,
diff --git a/lib/core/model/labs/request_patient_lab_orders.dart b/lib/core/model/labs/request_patient_lab_orders.dart
index 4f746277..ce9263ef 100644
--- a/lib/core/model/labs/request_patient_lab_orders.dart
+++ b/lib/core/model/labs/request_patient_lab_orders.dart
@@ -1,17 +1,17 @@
class RequestPatientLabOrders {
- double? versionID;
- int ?channel;
- int ?languageID;
- String? iPAdress;
- String ?generalid;
- int? patientOutSA;
- String? sessionID;
- bool ?isDentalAllowedBackend;
- int ?deviceTypeID;
- int ?patientID;
- String ?tokenID;
- int ?patientTypeID;
- int ?patientType;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
RequestPatientLabOrders(
{this.versionID,
diff --git a/lib/core/model/labs/request_patient_lab_special_result.dart b/lib/core/model/labs/request_patient_lab_special_result.dart
index 100f92b5..b48cf0e1 100644
--- a/lib/core/model/labs/request_patient_lab_special_result.dart
+++ b/lib/core/model/labs/request_patient_lab_special_result.dart
@@ -1,22 +1,22 @@
class RequestPatientLabSpecialResult {
- String? invoiceNo;
- String? orderNo;
- String? setupID;
- String? projectID;
- int ?clinicID;
- double? versionID;
- int ?channel;
- int ?languageID;
- String? iPAdress;
- String ?generalid;
- int ?patientOutSA;
- String ?sessionID;
- bool ?isDentalAllowedBackend;
- int ?deviceTypeID;
- int ?patientID;
- String? tokenID;
- int ?patientTypeID;
- int ?patientType;
+ String invoiceNo;
+ String orderNo;
+ String setupID;
+ String projectID;
+ int clinicID;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
RequestPatientLabSpecialResult(
{this.invoiceNo,
diff --git a/lib/core/model/labs/request_send_lab_report_email.dart b/lib/core/model/labs/request_send_lab_report_email.dart
index 66f5e2a0..118da906 100644
--- a/lib/core/model/labs/request_send_lab_report_email.dart
+++ b/lib/core/model/labs/request_send_lab_report_email.dart
@@ -1,56 +1,56 @@
class RequestSendLabReportEmail {
- double? versionID;
- int? channel;
- int? languageID;
- String? iPAdress;
- String? generalid;
- int? patientOutSA;
- String? sessionID;
- bool? isDentalAllowedBackend;
- int? deviceTypeID;
- int? patientID;
- String? tokenID;
- int? patientTypeID;
- int? patientType;
- String? to;
- String? dateofBirth;
- String? patientIditificationNum;
- String? patientMobileNumber;
- String? patientName;
- String? setupID;
- String? projectName;
- String? clinicName;
- String? doctorName;
- String? projectID;
- String? invoiceNo;
- String? orderDate;
+ double versionID;
+ int channel;
+ int languageID;
+ String iPAdress;
+ String generalid;
+ int patientOutSA;
+ String sessionID;
+ bool isDentalAllowedBackend;
+ int deviceTypeID;
+ int patientID;
+ String tokenID;
+ int patientTypeID;
+ int patientType;
+ String to;
+ String dateofBirth;
+ String patientIditificationNum;
+ String patientMobileNumber;
+ String patientName;
+ String setupID;
+ String projectName;
+ String clinicName;
+ String doctorName;
+ String projectID;
+ String invoiceNo;
+ String orderDate;
RequestSendLabReportEmail(
{this.versionID,
- this.channel,
- this.languageID,
- this.iPAdress,
- this.generalid,
- this.patientOutSA,
- this.sessionID,
- this.isDentalAllowedBackend,
- this.deviceTypeID,
- this.patientID,
- this.tokenID,
- this.patientTypeID,
- this.patientType,
- this.to,
- this.dateofBirth,
- this.patientIditificationNum,
- this.patientMobileNumber,
- this.patientName,
- this.setupID,
- this.projectName,
- this.clinicName,
- this.doctorName,
- this.projectID,
- this.invoiceNo,
- this.orderDate});
+ this.channel,
+ this.languageID,
+ this.iPAdress,
+ this.generalid,
+ this.patientOutSA,
+ this.sessionID,
+ this.isDentalAllowedBackend,
+ this.deviceTypeID,
+ this.patientID,
+ this.tokenID,
+ this.patientTypeID,
+ this.patientType,
+ this.to,
+ this.dateofBirth,
+ this.patientIditificationNum,
+ this.patientMobileNumber,
+ this.patientName,
+ this.setupID,
+ this.projectName,
+ this.clinicName,
+ this.doctorName,
+ this.projectID,
+ this.invoiceNo,
+ this.orderDate});
RequestSendLabReportEmail.fromJson(Map json) {
versionID = json['VersionID'];
diff --git a/lib/core/model/live_care/AlternativeServicesList.dart b/lib/core/model/live_care/AlternativeServicesList.dart
index 28d70805..11f27b95 100644
--- a/lib/core/model/live_care/AlternativeServicesList.dart
+++ b/lib/core/model/live_care/AlternativeServicesList.dart
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
class AlternativeService {
- int? serviceID;
- String? serviceName;
- bool? isSelected;
+ int serviceID;
+ String serviceName;
+ bool isSelected;
AlternativeService(
{this.serviceID, this.serviceName, this.isSelected = false});
@@ -23,7 +23,7 @@ class AlternativeService {
}
class AlternativeServicesList with ChangeNotifier {
- late List _alternativeServicesList;
+ List _alternativeServicesList;
getServicesList(){
return _alternativeServicesList;
diff --git a/lib/core/model/live_care/PendingPatientERForDoctorAppRequestModel.dart b/lib/core/model/live_care/PendingPatientERForDoctorAppRequestModel.dart
index a99c9649..dc1f25b3 100644
--- a/lib/core/model/live_care/PendingPatientERForDoctorAppRequestModel.dart
+++ b/lib/core/model/live_care/PendingPatientERForDoctorAppRequestModel.dart
@@ -1,7 +1,7 @@
class PendingPatientERForDoctorAppRequestModel {
- bool ? outSA;
- int ? doctorID;
- String ? sErServiceID;
+ bool outSA;
+ int doctorID;
+ String sErServiceID;
PendingPatientERForDoctorAppRequestModel(
{this.outSA, this.doctorID, this.sErServiceID});
diff --git a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
index f96016d7..1d63e885 100644
--- a/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
+++ b/lib/core/model/live_care/add_patient_to_doctor_list_request_model.dart
@@ -1,12 +1,11 @@
class AddPatientToDoctorListRequestModel {
- int? vCID;
- String? tokenID;
- String? generalid;
- int? doctorId;
- bool? isOutKsa;
+ int vCID;
+ String tokenID;
+ String generalid;
+ int doctorId;
+ bool isOutKsa;
- AddPatientToDoctorListRequestModel(
- {this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa});
+ AddPatientToDoctorListRequestModel({this.vCID, this.tokenID, this.generalid, this.doctorId, this.isOutKsa});
AddPatientToDoctorListRequestModel.fromJson(Map json) {
vCID = json['VC_ID'];
diff --git a/lib/core/model/live_care/live_care_login_reguest_model.dart b/lib/core/model/live_care/live_care_login_reguest_model.dart
index 90ea0ff1..e14d4223 100644
--- a/lib/core/model/live_care/live_care_login_reguest_model.dart
+++ b/lib/core/model/live_care/live_care_login_reguest_model.dart
@@ -1,9 +1,9 @@
class LiveCareUserLoginRequestModel {
- String? tokenID;
- String? generalid;
- int? doctorId;
- int? isOutKsa;
- int? isLogin;
+ String tokenID;
+ String generalid;
+ int doctorId;
+ int isOutKsa;
+ int isLogin;
LiveCareUserLoginRequestModel({this.tokenID, this.generalid, this.doctorId, this.isOutKsa, this.isLogin});
diff --git a/lib/core/model/medical_report/medical_file_model.dart b/lib/core/model/medical_report/medical_file_model.dart
index 53737499..deebb2af 100644
--- a/lib/core/model/medical_report/medical_file_model.dart
+++ b/lib/core/model/medical_report/medical_file_model.dart
@@ -1,14 +1,14 @@
class MedicalFileModel {
- List? entityList;
+ List entityList;
dynamic statusMessage;
MedicalFileModel({this.entityList, this.statusMessage});
MedicalFileModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
statusMessage = json['statusMessage'];
@@ -17,7 +17,7 @@ class MedicalFileModel {
Map toJson() {
final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['statusMessage'] = this.statusMessage;
return data;
@@ -25,15 +25,15 @@ class MedicalFileModel {
}
class EntityList {
- List? timelines;
+ List timelines;
EntityList({this.timelines});
EntityList.fromJson(Map json) {
if (json['Timelines'] != null) {
- timelines = [];
+ timelines = new List();
json['Timelines'].forEach((v) {
- timelines!.add(new Timelines.fromJson(v));
+ timelines.add(new Timelines.fromJson(v));
});
}
}
@@ -41,25 +41,25 @@ class EntityList {
Map toJson() {
final Map data = new Map();
if (this.timelines != null) {
- data['Timelines'] = this.timelines!.map((v) => v.toJson()).toList();
+ data['Timelines'] = this.timelines.map((v) => v.toJson()).toList();
}
return data;
}
}
class Timelines {
- int? clinicId;
- String? clinicName;
- String? date;
- int? doctorId;
- String? doctorImage;
- String? doctorName;
- int? encounterNumber;
- String? encounterType;
- int? projectID;
- String? projectName;
- String? setupID;
- List? timeLineEvents;
+ int clinicId;
+ String clinicName;
+ String date;
+ int doctorId;
+ String doctorImage;
+ String doctorName;
+ int encounterNumber;
+ String encounterType;
+ int projectID;
+ String projectName;
+ String setupID;
+ List timeLineEvents;
Timelines(
{this.clinicId,
@@ -88,9 +88,9 @@ class Timelines {
projectName = json['ProjectName'];
setupID = json['SetupID'];
if (json['TimeLineEvents'] != null) {
- timeLineEvents = [];
+ timeLineEvents = new List();
json['TimeLineEvents'].forEach((v) {
- timeLineEvents!.add(new TimeLineEvents.fromJson(v));
+ timeLineEvents.add(new TimeLineEvents.fromJson(v));
});
}
}
@@ -110,25 +110,25 @@ class Timelines {
data['SetupID'] = this.setupID;
if (this.timeLineEvents != null) {
data['TimeLineEvents'] =
- this.timeLineEvents!.map((v) => v.toJson()).toList();
+ this.timeLineEvents.map((v) => v.toJson()).toList();
}
return data;
}
}
class TimeLineEvents {
- List? admissions;
- String? colorClass;
- List? consulations;
+ List admissions;
+ String colorClass;
+ List consulations;
TimeLineEvents({this.admissions, this.colorClass, this.consulations});
TimeLineEvents.fromJson(Map json) {
colorClass = json['ColorClass'];
if (json['Consulations'] != null) {
- consulations = [];
+ consulations = new List();
json['Consulations'].forEach((v) {
- consulations!.add(new Consulations.fromJson(v));
+ consulations.add(new Consulations.fromJson(v));
});
}
}
@@ -138,38 +138,38 @@ class TimeLineEvents {
data['ColorClass'] = this.colorClass;
if (this.consulations != null) {
- data['Consulations'] = this.consulations!.map((v) => v.toJson()).toList();
+ data['Consulations'] = this.consulations.map((v) => v.toJson()).toList();
}
return data;
}
}
class Consulations {
- int? admissionNo;
- String? appointmentDate;
- int? appointmentNo;
- String? appointmentType;
- String? clinicID;
- String? clinicName;
- int? doctorID;
- String? doctorName;
- String? endTime;
- String? episodeDate;
- int? episodeID;
- int? patientID;
- int? projectID;
- String? projectName;
- String? remarks;
- String? setupID;
- String? startTime;
- String? visitFor;
- String? visitType;
- String? dispalyName;
- List? lstAssessments;
- List? lstPhysicalExam;
- List? lstProcedure;
- List? lstMedicalHistory;
- List? lstCheifComplaint;
+ int admissionNo;
+ String appointmentDate;
+ int appointmentNo;
+ String appointmentType;
+ String clinicID;
+ String clinicName;
+ int doctorID;
+ String doctorName;
+ String endTime;
+ String episodeDate;
+ int episodeID;
+ int patientID;
+ int projectID;
+ String projectName;
+ String remarks;
+ String setupID;
+ String startTime;
+ String visitFor;
+ String visitType;
+ String dispalyName;
+ List lstAssessments;
+ List lstPhysicalExam;
+ List lstProcedure;
+ List lstMedicalHistory;
+ List lstCheifComplaint;
Consulations(
{this.admissionNo,
@@ -220,33 +220,33 @@ class Consulations {
visitType = json['VisitType'];
dispalyName = json['dispalyName'];
if (json['lstAssessments'] != null) {
- lstAssessments = [];
+ lstAssessments = new List();
json['lstAssessments'].forEach((v) {
- lstAssessments!.add(new LstAssessments.fromJson(v));
+ lstAssessments.add(new LstAssessments.fromJson(v));
});
}
if (json['lstCheifComplaint'] != null) {
- lstCheifComplaint = [];
+ lstCheifComplaint = new List();
json['lstCheifComplaint'].forEach((v) {
- lstCheifComplaint!.add(new LstCheifComplaint.fromJson(v));
+ lstCheifComplaint.add(new LstCheifComplaint.fromJson(v));
});
}
if (json['lstPhysicalExam'] != null) {
- lstPhysicalExam = [];
+ lstPhysicalExam = new List();
json['lstPhysicalExam'].forEach((v) {
- lstPhysicalExam!.add(new LstPhysicalExam.fromJson(v));
+ lstPhysicalExam.add(new LstPhysicalExam.fromJson(v));
});
}
if (json['lstProcedure'] != null) {
- lstProcedure = [];
+ lstProcedure = new List();
json['lstProcedure'].forEach((v) {
- lstProcedure!.add(new LstProcedure.fromJson(v));
+ lstProcedure.add(new LstProcedure.fromJson(v));
});
}
if (json['lstMedicalHistory'] != null) {
- lstMedicalHistory = [];
+ lstMedicalHistory = new List();
json['lstMedicalHistory'].forEach((v) {
- lstMedicalHistory!.add(new LstMedicalHistory.fromJson(v));
+ lstMedicalHistory.add(new LstMedicalHistory.fromJson(v));
});
}
}
@@ -275,40 +275,40 @@ class Consulations {
data['dispalyName'] = this.dispalyName;
if (this.lstAssessments != null) {
data['lstAssessments'] =
- this.lstAssessments!.map((v) => v.toJson()).toList();
+ this.lstAssessments.map((v) => v.toJson()).toList();
}
if (this.lstCheifComplaint != null) {
data['lstCheifComplaint'] =
- this.lstCheifComplaint!.map((v) => v.toJson()).toList();
+ this.lstCheifComplaint.map((v) => v.toJson()).toList();
}
if (this.lstPhysicalExam != null) {
data['lstPhysicalExam'] =
- this.lstPhysicalExam!.map((v) => v.toJson()).toList();
+ this.lstPhysicalExam.map((v) => v.toJson()).toList();
}
if (this.lstProcedure != null) {
- data['lstProcedure'] = this.lstProcedure!.map((v) => v.toJson()).toList();
+ data['lstProcedure'] = this.lstProcedure.map((v) => v.toJson()).toList();
}
if (this.lstMedicalHistory != null) {
data['lstMedicalHistory'] =
- this.lstMedicalHistory!.map((v) => v.toJson()).toList();
+ this.lstMedicalHistory.map((v) => v.toJson()).toList();
}
return data;
}
}
class LstCheifComplaint {
- int? appointmentNo;
- String? cCDate;
- String? chiefComplaint;
- String? currentMedication;
- int? episodeID;
- String? hOPI;
- int? patientID;
- String? patientType;
- int? projectID;
- String? projectName;
- String? setupID;
- String? dispalyName;
+ int appointmentNo;
+ String cCDate;
+ String chiefComplaint;
+ String currentMedication;
+ int episodeID;
+ String hOPI;
+ int patientID;
+ String patientType;
+ int projectID;
+ String projectName;
+ String setupID;
+ String dispalyName;
LstCheifComplaint(
{this.appointmentNo,
@@ -358,19 +358,19 @@ class LstCheifComplaint {
}
class LstAssessments {
- int? appointmentNo;
- String? condition;
- String? description;
- int? episodeID;
- String? iCD10;
- int? patientID;
- String? patientType;
- int? projectID;
- String? projectName;
- String? remarks;
- String? setupID;
- String? type;
- String? dispalyName;
+ int appointmentNo;
+ String condition;
+ String description;
+ int episodeID;
+ String iCD10;
+ int patientID;
+ String patientType;
+ int projectID;
+ String projectName;
+ String remarks;
+ String setupID;
+ String type;
+ String dispalyName;
LstAssessments(
{this.appointmentNo,
@@ -423,19 +423,19 @@ class LstAssessments {
}
class LstPhysicalExam {
- String? abnormal;
- int? appointmentNo;
- int? episodeID;
- String? examDesc;
- String? examID;
- String? examType;
- int? patientID;
- String? patientType;
- int? projectID;
- String? projectName;
- String? remarks;
- String? setupID;
- String? dispalyName;
+ String abnormal;
+ int appointmentNo;
+ int episodeID;
+ String examDesc;
+ String examID;
+ String examType;
+ int patientID;
+ String patientType;
+ int projectID;
+ String projectName;
+ String remarks;
+ String setupID;
+ String dispalyName;
LstPhysicalExam(
{this.abnormal,
@@ -488,17 +488,17 @@ class LstPhysicalExam {
}
class LstProcedure {
- int? appointmentNo;
- int? episodeID;
- String? orderDate;
- int? patientID;
- String? patientType;
- String? procName;
- String? procedureId;
- int? projectID;
- String? projectName;
- String? setupID;
- String? dispalyName;
+ int appointmentNo;
+ int episodeID;
+ String orderDate;
+ int patientID;
+ String patientType;
+ String procName;
+ String procedureId;
+ int projectID;
+ String projectName;
+ String setupID;
+ String dispalyName;
LstProcedure(
{this.appointmentNo,
@@ -545,17 +545,17 @@ class LstProcedure {
}
class LstMedicalHistory {
- int? appointmentNo;
- String? checked;
- int? episodeID;
- String? history;
- int? patientID;
- String? patientType;
- int? projectID;
- String? projectName;
- String? remarks;
- String? setupID;
- String? dispalyName;
+ int appointmentNo;
+ String checked;
+ int episodeID;
+ String history;
+ int patientID;
+ String patientType;
+ int projectID;
+ String projectName;
+ String remarks;
+ String setupID;
+ String dispalyName;
LstMedicalHistory(
{this.appointmentNo,
diff --git a/lib/core/model/medical_report/medical_file_request_model.dart b/lib/core/model/medical_report/medical_file_request_model.dart
index 01a2abf2..8703141a 100644
--- a/lib/core/model/medical_report/medical_file_request_model.dart
+++ b/lib/core/model/medical_report/medical_file_request_model.dart
@@ -1,7 +1,7 @@
class MedicalFileRequestModel {
- int ?patientMRN;
- String ?vidaAuthTokenID;
- String ?iPAdress;
+ int patientMRN;
+ String vidaAuthTokenID;
+ String iPAdress;
MedicalFileRequestModel({this.patientMRN, this.vidaAuthTokenID,this.iPAdress});
diff --git a/lib/core/model/note/CreateNoteModel.dart b/lib/core/model/note/CreateNoteModel.dart
index 5d1709ca..ce076705 100644
--- a/lib/core/model/note/CreateNoteModel.dart
+++ b/lib/core/model/note/CreateNoteModel.dart
@@ -1,23 +1,23 @@
class CreateNoteModel {
- int? visitType;
- int? admissionNo;
- int? projectID;
- int? patientTypeID;
- int? patientID;
- int? clinicID;
- String? notes;
- int ?createdBy;
- int ?editedBy;
- String ?nursingRemarks;
- int ?languageID;
- String? stamp;
- String ?iPAdress;
- double ?versionID;
- int ?channel;
- String ?tokenID;
- String? sessionID;
- bool ?isLoginForDoctorApp;
- bool ?patientOutSA;
+ int visitType;
+ int admissionNo;
+ int projectID;
+ int patientTypeID;
+ int patientID;
+ int clinicID;
+ String notes;
+ int createdBy;
+ int editedBy;
+ String nursingRemarks;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
CreateNoteModel(
{this.visitType,
diff --git a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
index b7fd7aa5..4335053c 100644
--- a/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
+++ b/lib/core/model/note/GetNursingProgressNoteRequestModel.dart
@@ -1,18 +1,14 @@
import 'package:doctor_app_flutter/config/config.dart';
class GetNursingProgressNoteRequestModel {
- int? patientID;
- int? admissionNo;
- int? patientTypeID;
- int? patientType;
- String? setupID;
+ int patientID;
+ int admissionNo;
+ int patientTypeID;
+ int patientType;
+ String setupID;
GetNursingProgressNoteRequestModel(
- {this.patientID,
- this.admissionNo,
- this.patientTypeID = 1,
- this.patientType = 1,
- this.setupID});
+ {this.patientID, this.admissionNo, this.patientTypeID = 1, this.patientType = 1, this.setupID });
GetNursingProgressNoteRequestModel.fromJson(Map json) {
patientID = json['PatientID'];
diff --git a/lib/core/model/note/GetNursingProgressNoteResposeModel.dart b/lib/core/model/note/GetNursingProgressNoteResposeModel.dart
index aaf9c7ab..fb7fbcec 100644
--- a/lib/core/model/note/GetNursingProgressNoteResposeModel.dart
+++ b/lib/core/model/note/GetNursingProgressNoteResposeModel.dart
@@ -1,14 +1,14 @@
class GetNursingProgressNoteResposeModel {
- String? notes;
+ String notes;
dynamic conditionType;
- int? createdBy;
- String? createdOn;
+ int createdBy;
+ String createdOn;
dynamic editedBy;
dynamic editedOn;
- String? createdByName;
+ String createdByName;
- String? editedByName;
+ String editedByName;
GetNursingProgressNoteResposeModel(
{this.notes,
diff --git a/lib/core/model/note/note_model.dart b/lib/core/model/note/note_model.dart
index 713de924..797f9b6d 100644
--- a/lib/core/model/note/note_model.dart
+++ b/lib/core/model/note/note_model.dart
@@ -1,24 +1,24 @@
class NoteModel {
- String? setupID;
- int ?projectID;
- int ?patientID;
- int ?patientType;
- String ?admissionNo;
- int ?lineItemNo;
- int ?visitType;
- String ?notes;
- String ?assessmentDate;
- String ?visitTime;
- int ?status;
- String ?nursingRemarks;
- String ?createdOn;
- String ?editedOn;
- int ?createdBy;
- int ?admissionClinicID;
- String ?admissionClinicName;
- dynamic doctorClinicName;
- String ?doctorName;
- String ?visitTypeDesc;
+ String setupID;
+ int projectID;
+ int patientID;
+ int patientType;
+ String admissionNo;
+ int lineItemNo;
+ int visitType;
+ String notes;
+ String assessmentDate;
+ String visitTime;
+ int status;
+ String nursingRemarks;
+ String createdOn;
+ String editedOn;
+ int createdBy;
+ int admissionClinicID;
+ String admissionClinicName;
+ Null doctorClinicName;
+ String doctorName;
+ String visitTypeDesc;
NoteModel(
{this.setupID,
diff --git a/lib/core/model/note/update_note_model.dart b/lib/core/model/note/update_note_model.dart
index a3189e39..20fd4b86 100644
--- a/lib/core/model/note/update_note_model.dart
+++ b/lib/core/model/note/update_note_model.dart
@@ -1,40 +1,40 @@
class UpdateNoteReqModel {
- int? projectID;
- int? createdBy;
- int? admissionNo;
- int? lineItemNo;
- String? notes;
- bool? verifiedNote;
- bool? cancelledNote;
- int? languageID;
- String? stamp;
- String? iPAdress;
- double? versionID;
- int? channel;
- String? tokenID;
- String? sessionID;
- bool? isLoginForDoctorApp;
- bool? patientOutSA;
- int? patientTypeID;
+ int projectID;
+ int createdBy;
+ int admissionNo;
+ int lineItemNo;
+ String notes;
+ bool verifiedNote;
+ bool cancelledNote;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String tokenID;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+ int patientTypeID;
UpdateNoteReqModel(
{this.projectID,
- this.createdBy,
- this.admissionNo,
- this.lineItemNo,
- this.notes,
- this.verifiedNote,
- this.cancelledNote,
- this.languageID,
- this.stamp,
- this.iPAdress,
- this.versionID,
- this.channel,
- this.tokenID,
- this.sessionID,
- this.isLoginForDoctorApp,
- this.patientOutSA,
- this.patientTypeID});
+ this.createdBy,
+ this.admissionNo,
+ this.lineItemNo,
+ this.notes,
+ this.verifiedNote,
+ this.cancelledNote,
+ this.languageID,
+ this.stamp,
+ this.iPAdress,
+ this.versionID,
+ this.channel,
+ this.tokenID,
+ this.sessionID,
+ this.isLoginForDoctorApp,
+ this.patientOutSA,
+ this.patientTypeID});
UpdateNoteReqModel.fromJson(Map json) {
projectID = json['ProjectID'];
diff --git a/lib/core/model/patient_muse/PatientMuseResultsModel.dart b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
index 970d48cb..401fd1a7 100644
--- a/lib/core/model/patient_muse/PatientMuseResultsModel.dart
+++ b/lib/core/model/patient_muse/PatientMuseResultsModel.dart
@@ -1,19 +1,19 @@
import 'package:doctor_app_flutter/util/date-utils.dart';
class PatientMuseResultsModel {
- int ?rowID;
- String? setupID;
- int ?projectID;
- String? orderNo;
- int? lineItemNo;
- int? patientType;
- int? patientID;
- String ?procedureID;
+ int rowID;
+ String setupID;
+ int projectID;
+ String orderNo;
+ int lineItemNo;
+ int patientType;
+ int patientID;
+ String procedureID;
dynamic reportData;
- String? imageURL;
- String? createdBy;
- String? createdOn;
- DateTime? createdOnDateTime;
+ String imageURL;
+ String createdBy;
+ String createdOn;
+ DateTime createdOnDateTime;
PatientMuseResultsModel(
{this.rowID,
diff --git a/lib/core/model/patient_muse/PatientSearchRequestModel.dart b/lib/core/model/patient_muse/PatientSearchRequestModel.dart
index c2c1bab8..dcb9b31c 100644
--- a/lib/core/model/patient_muse/PatientSearchRequestModel.dart
+++ b/lib/core/model/patient_muse/PatientSearchRequestModel.dart
@@ -1,19 +1,19 @@
class PatientSearchRequestModel {
- int? doctorID;
- String? firstName;
- String? middleName;
- String? lastName;
- String? patientMobileNumber;
- String? patientIdentificationID;
- int? patientID;
- String? from;
- String? to;
- int? searchType;
- int? projectID;
- String? mobileNo;
- String? identificationNo;
- int? nursingStationID;
- int? clinicID = 0;
+ int doctorID;
+ String firstName;
+ String middleName;
+ String lastName;
+ String patientMobileNumber;
+ String patientIdentificationID;
+ int patientID;
+ String from;
+ String to;
+ int searchType;
+ int projectID;
+ String mobileNo;
+ String identificationNo;
+ int nursingStationID;
+ int clinicID = 0;
PatientSearchRequestModel(
{this.doctorID,
diff --git a/lib/core/model/procedure/ControlsModel.dart b/lib/core/model/procedure/ControlsModel.dart
index e14c7768..b3e8ae9c 100644
--- a/lib/core/model/procedure/ControlsModel.dart
+++ b/lib/core/model/procedure/ControlsModel.dart
@@ -1,6 +1,6 @@
class Controls {
- String ?code;
- String ?controlValue;
+ String code;
+ String controlValue;
Controls({this.code, this.controlValue});
diff --git a/lib/core/model/procedure/Procedure_template_request_model.dart b/lib/core/model/procedure/Procedure_template_request_model.dart
index abd6a2b3..698178e3 100644
--- a/lib/core/model/procedure/Procedure_template_request_model.dart
+++ b/lib/core/model/procedure/Procedure_template_request_model.dart
@@ -1,31 +1,31 @@
class ProcedureTempleteRequestModel {
- int? doctorID;
- String? firstName;
- String? middleName;
- String? lastName;
- String? patientMobileNumber;
- String? patientIdentificationID;
- int? patientID;
- String? from;
- String? to;
- int? searchType;
- String? mobileNo;
- String? identificationNo;
- int? editedBy;
- int? projectID;
- int? clinicID;
- String? tokenID;
- int? languageID;
- String? stamp;
- String? iPAdress;
- double? versionID;
- int? channel;
- String? sessionID;
- bool? isLoginForDoctorApp;
- bool? patientOutSA;
- String? vidaAuthTokenID;
- String? vidaRefreshTokenID;
- int? deviceTypeID;
+ int doctorID;
+ String firstName;
+ String middleName;
+ String lastName;
+ String patientMobileNumber;
+ String patientIdentificationID;
+ int patientID;
+ String from;
+ String to;
+ int searchType;
+ String mobileNo;
+ String identificationNo;
+ int editedBy;
+ int projectID;
+ int clinicID;
+ String tokenID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ int deviceTypeID;
ProcedureTempleteRequestModel(
{this.doctorID,
@@ -56,7 +56,7 @@ class ProcedureTempleteRequestModel {
this.vidaRefreshTokenID,
this.deviceTypeID});
- ProcedureTempleteRequestModel.fromJson(Map json) {
+ ProcedureTempleteRequestModel.fromJson(Map json) {
doctorID = json['DoctorID'];
firstName = json['FirstName'];
middleName = json['MiddleName'];
diff --git a/lib/core/model/procedure/categories_procedure.dart b/lib/core/model/procedure/categories_procedure.dart
index e4df9963..9e6f847f 100644
--- a/lib/core/model/procedure/categories_procedure.dart
+++ b/lib/core/model/procedure/categories_procedure.dart
@@ -1,26 +1,26 @@
class CategoriseProcedureModel {
- List ?entityList;
- int ?rowcount;
+ List entityList;
+ int rowcount;
dynamic statusMessage;
CategoriseProcedureModel(
- {this.entityList, this.rowcount, this.statusMessage});
+ {this.entityList, this.rowcount, this.statusMessage});
- CategoriseProcedureModel.fromJson(Map json) {
+ CategoriseProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
statusMessage = json['statusMessage'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@@ -29,20 +29,20 @@ class CategoriseProcedureModel {
}
class EntityList {
- bool ?allowedClinic;
- String ? category;
- String ? categoryID;
- String ? genderValidation;
- String ? group;
- String ? orderedValidation;
+ bool allowedClinic;
+ String category;
+ String categoryID;
+ String genderValidation;
+ String group;
+ String orderedValidation;
dynamic price;
- String ? procedureId;
- String ? procedureName;
- String ? specialPermission;
- String ? subGroup;
- String ? template;
- String ? remarks;
- String ? type;
+ String procedureId;
+ String procedureName;
+ String specialPermission;
+ String subGroup;
+ String template;
+ String remarks;
+ String type;
EntityList(
{this.allowedClinic,
@@ -60,7 +60,7 @@ class EntityList {
this.remarks,
this.type});
- EntityList.fromJson(Map json) {
+ EntityList.fromJson(Map json) {
allowedClinic = json['allowedClinic'];
category = json['category'];
categoryID = json['categoryID'];
@@ -75,8 +75,8 @@ class EntityList {
template = json['template'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['allowedClinic'] = this.allowedClinic;
data['category'] = this.category;
data['categoryID'] = this.categoryID;
diff --git a/lib/core/model/procedure/get_ordered_procedure_model.dart b/lib/core/model/procedure/get_ordered_procedure_model.dart
index 5b0d4695..c3c7718f 100644
--- a/lib/core/model/procedure/get_ordered_procedure_model.dart
+++ b/lib/core/model/procedure/get_ordered_procedure_model.dart
@@ -1,26 +1,26 @@
class GetOrderedProcedureModel {
- List? entityList;
- int? rowcount;
+ List entityList;
+ int rowcount;
dynamic statusMessage;
GetOrderedProcedureModel(
{this.entityList, this.rowcount, this.statusMessage});
- GetOrderedProcedureModel.fromJson(Map json) {
+ GetOrderedProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
statusMessage = json['statusMessage'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@@ -29,31 +29,31 @@ class GetOrderedProcedureModel {
}
class EntityList {
- String? achiCode;
- String? appointmentDate;
- int? appointmentNo;
- int? categoryID;
- String? clinicDescription;
- String? cptCode;
- int? createdBy;
- String? createdOn;
- String? doctorName;
- bool? isApprovalCreated;
- bool? isApprovalRequired;
- bool? isCovered;
- bool? isInvoiced;
- bool? isReferralInvoiced;
- bool? isUncoveredByDoctor;
- int? lineItemNo;
- String? orderDate;
- int? orderNo;
- int? orderType;
- String? procedureId;
- String? procedureName;
- String? remarks;
- String? status;
- String? template;
- int? doctorID;
+ String achiCode;
+ String appointmentDate;
+ int appointmentNo;
+ int categoryID;
+ String clinicDescription;
+ String cptCode;
+ int createdBy;
+ String createdOn;
+ String doctorName;
+ bool isApprovalCreated;
+ bool isApprovalRequired;
+ bool isCovered;
+ bool isInvoiced;
+ bool isReferralInvoiced;
+ bool isUncoveredByDoctor;
+ int lineItemNo;
+ String orderDate;
+ int orderNo;
+ int orderType;
+ String procedureId;
+ String procedureName;
+ String remarks;
+ String status;
+ String template;
+ int doctorID;
EntityList(
{this.achiCode,
@@ -82,7 +82,7 @@ class EntityList {
this.template,
this.doctorID});
- EntityList.fromJson(Map json) {
+ EntityList.fromJson(Map json) {
achiCode = json['achiCode'];
doctorID = json['doctorID'];
appointmentDate = json['appointmentDate'];
@@ -110,8 +110,8 @@ class EntityList {
template = json['template'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['achiCode'] = this.achiCode;
data['doctorID'] = this.doctorID;
data['appointmentDate'] = this.appointmentDate;
diff --git a/lib/core/model/procedure/get_ordered_procedure_request_model.dart b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
index dbfb75cd..5178ab14 100644
--- a/lib/core/model/procedure/get_ordered_procedure_request_model.dart
+++ b/lib/core/model/procedure/get_ordered_procedure_request_model.dart
@@ -1,10 +1,9 @@
class GetOrderedProcedureRequestModel {
- String? vidaAuthTokenID;
- int? patientMRN;
- int? appointmentNo;
+ String vidaAuthTokenID;
+ int patientMRN;
+ int appointmentNo;
- GetOrderedProcedureRequestModel(
- {this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
+ GetOrderedProcedureRequestModel({this.vidaAuthTokenID, this.patientMRN, this.appointmentNo});
GetOrderedProcedureRequestModel.fromJson(Map json) {
vidaAuthTokenID = json['VidaAuthTokenID'];
diff --git a/lib/core/model/procedure/get_procedure_model.dart b/lib/core/model/procedure/get_procedure_model.dart
index 516c8e42..5c83b49b 100644
--- a/lib/core/model/procedure/get_procedure_model.dart
+++ b/lib/core/model/procedure/get_procedure_model.dart
@@ -1,25 +1,25 @@
class GetProcedureModel {
- List? entityList;
- int? rowcount;
+ List entityList;
+ int rowcount;
dynamic statusMessage;
GetProcedureModel({this.entityList, this.rowcount, this.statusMessage});
- GetProcedureModel.fromJson(Map json) {
+ GetProcedureModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
statusMessage = json['statusMessage'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@@ -28,18 +28,18 @@ class GetProcedureModel {
}
class EntityList {
- bool? allowedClinic;
- String? category;
- String? categoryID;
- String? genderValidation;
- String? group;
- String? orderedValidation;
+ bool allowedClinic;
+ String category;
+ String categoryID;
+ String genderValidation;
+ String group;
+ String orderedValidation;
dynamic price;
- String? procedureId;
- String? procedureName;
- String? specialPermission;
- String? subGroup;
- String? template;
+ String procedureId;
+ String procedureName;
+ String specialPermission;
+ String subGroup;
+ String template;
EntityList(
{this.allowedClinic,
@@ -55,7 +55,7 @@ class EntityList {
this.subGroup,
this.template});
- EntityList.fromJson(Map json) {
+ EntityList.fromJson(Map json) {
allowedClinic = json['allowedClinic'];
category = json['category'];
categoryID = json['categoryID'];
@@ -70,8 +70,8 @@ class EntityList {
template = json['template'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['allowedClinic'] = this.allowedClinic;
data['category'] = this.category;
data['categoryID'] = this.categoryID;
diff --git a/lib/core/model/procedure/get_procedure_req_model.dart b/lib/core/model/procedure/get_procedure_req_model.dart
index 832fbadb..6202a520 100644
--- a/lib/core/model/procedure/get_procedure_req_model.dart
+++ b/lib/core/model/procedure/get_procedure_req_model.dart
@@ -1,11 +1,11 @@
class GetProcedureReqModel {
- int? clinicId;
- int? patientMRN;
- int? pageSize;
- int? pageIndex;
- List ?search;
+ int clinicId;
+ int patientMRN;
+ int pageSize;
+ int pageIndex;
+ List search;
dynamic category;
- String ?vidaAuthTokenID;
+ String vidaAuthTokenID;
GetProcedureReqModel(
{this.clinicId,
diff --git a/lib/core/model/procedure/post_procedure_req_model.dart b/lib/core/model/procedure/post_procedure_req_model.dart
index 44ef9775..b12563f8 100644
--- a/lib/core/model/procedure/post_procedure_req_model.dart
+++ b/lib/core/model/procedure/post_procedure_req_model.dart
@@ -1,11 +1,11 @@
import 'ControlsModel.dart';
class PostProcedureReqModel {
- int? patientMRN;
- int? appointmentNo;
- int? episodeID;
- List ?procedures;
- String ?vidaAuthTokenID;
+ int patientMRN;
+ int appointmentNo;
+ int episodeID;
+ List procedures;
+ String vidaAuthTokenID;
PostProcedureReqModel(
{this.patientMRN,
@@ -19,9 +19,9 @@ class PostProcedureReqModel {
appointmentNo = json['AppointmentNo'];
episodeID = json['EpisodeID'];
if (json['Procedures'] != null) {
- procedures = [];
+ procedures = new List();
json['Procedures'].forEach((v) {
- procedures!.add(new Procedures.fromJson(v));
+ procedures.add(new Procedures.fromJson(v));
});
}
vidaAuthTokenID = json['VidaAuthTokenID'];
@@ -33,7 +33,7 @@ class PostProcedureReqModel {
data['AppointmentNo'] = this.appointmentNo;
data['EpisodeID'] = this.episodeID;
if (this.procedures != null) {
- data['Procedures'] = this.procedures!.map((v) => v.toJson()).toList();
+ data['Procedures'] = this.procedures.map((v) => v.toJson()).toList();
}
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data;
@@ -41,9 +41,9 @@ class PostProcedureReqModel {
}
class Procedures {
- String ?procedure;
- String ?category;
- List ?controls;
+ String procedure;
+ String category;
+ List controls;
Procedures({this.procedure, this.category, this.controls});
@@ -51,9 +51,9 @@ class Procedures {
procedure = json['Procedure'];
category = json['Category'];
if (json['Controls'] != null) {
- controls = [];
+ controls = new List();
json['Controls'].forEach((v) {
- controls!.add(new Controls.fromJson(v));
+ controls.add(new Controls.fromJson(v));
});
}
}
@@ -63,7 +63,7 @@ class Procedures {
data['Procedure'] = this.procedure;
data['Category'] = this.category;
if (this.controls != null) {
- data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
+ data['Controls'] = this.controls.map((v) => v.toJson()).toList();
}
return data;
}
diff --git a/lib/core/model/procedure/procedure_category_list_model.dart b/lib/core/model/procedure/procedure_category_list_model.dart
index 50048080..849e84e5 100644
--- a/lib/core/model/procedure/procedure_category_list_model.dart
+++ b/lib/core/model/procedure/procedure_category_list_model.dart
@@ -1,6 +1,6 @@
class ProcedureCategoryListModel {
- List? entityList;
- int? rowcount;
+ List entityList;
+ int rowcount;
dynamic statusMessage;
ProcedureCategoryListModel(
@@ -8,9 +8,9 @@ class ProcedureCategoryListModel {
ProcedureCategoryListModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@@ -20,7 +20,7 @@ class ProcedureCategoryListModel {
Map toJson() {
final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@@ -29,8 +29,8 @@ class ProcedureCategoryListModel {
}
class EntityList {
- int? categoryId;
- String? categoryName;
+ int categoryId;
+ String categoryName;
EntityList({this.categoryId, this.categoryName});
diff --git a/lib/core/model/procedure/procedure_templateModel.dart b/lib/core/model/procedure/procedure_templateModel.dart
index 38a05693..3b12d646 100644
--- a/lib/core/model/procedure/procedure_templateModel.dart
+++ b/lib/core/model/procedure/procedure_templateModel.dart
@@ -1,13 +1,13 @@
class ProcedureTempleteModel {
- String? setupID;
- int? projectID;
- int? clinicID;
- int? doctorID;
- int? templateID;
- String? templateName;
- bool? isActive;
- int? createdBy;
- String? createdOn;
+ String setupID;
+ int projectID;
+ int clinicID;
+ int doctorID;
+ int templateID;
+ String templateName;
+ bool isActive;
+ int createdBy;
+ String createdOn;
dynamic editedBy;
dynamic editedOn;
diff --git a/lib/core/model/procedure/procedure_template_details_model.dart b/lib/core/model/procedure/procedure_template_details_model.dart
index 13316fa8..1fc797ae 100644
--- a/lib/core/model/procedure/procedure_template_details_model.dart
+++ b/lib/core/model/procedure/procedure_template_details_model.dart
@@ -1,29 +1,29 @@
class ProcedureTempleteDetailsModel {
- String? setupID;
- int? projectID;
- int? clinicID;
- int? doctorID;
- int? templateID;
- String? templateName;
- String? procedureID;
- bool ?isActive;
- int? createdBy;
- String? createdOn;
+ String setupID;
+ int projectID;
+ int clinicID;
+ int doctorID;
+ int templateID;
+ String templateName;
+ String procedureID;
+ bool isActive;
+ int createdBy;
+ String createdOn;
dynamic editedBy;
dynamic editedOn;
- String? procedureName;
- String? procedureNameN;
- String? alias;
- String? aliasN;
- String? categoryID;
- String? subGroupID;
- String? categoryDescription;
- String? categoryDescriptionN;
- String? categoryAlias;
+ String procedureName;
+ String procedureNameN;
+ String alias;
+ String aliasN;
+ String categoryID;
+ String subGroupID;
+ String categoryDescription;
+ String categoryDescriptionN;
+ String categoryAlias;
dynamic riskCategoryID;
- String? type = "1";
- String? remarks;
- int? selectedType = 0;
+ String type = "1";
+ String remarks;
+ int selectedType = 0;
ProcedureTempleteDetailsModel(
{this.setupID,
@@ -52,7 +52,7 @@ class ProcedureTempleteDetailsModel {
this.type = "1",
this.selectedType = 0});
- ProcedureTempleteDetailsModel.fromJson(Map json) {
+ ProcedureTempleteDetailsModel.fromJson(Map json) {
setupID = json['SetupID'];
projectID = json['ProjectID'];
clinicID = json['ClinicID'];
@@ -77,8 +77,8 @@ class ProcedureTempleteDetailsModel {
categoryAlias = json['CategoryAlias'];
}
- Map toJson() {
- final Map data = new Map();
+ Map toJson() {
+ final Map data = new Map();
data['SetupID'] = this.setupID;
data['ProjectID'] = this.projectID;
data['ClinicID'] = this.clinicID;
@@ -105,12 +105,12 @@ class ProcedureTempleteDetailsModel {
}
}
class ProcedureTempleteDetailsModelList {
- List procedureTemplate =[];
- String? templateName;
- int? templateId;
+ List procedureTemplate = List();
+ String templateName;
+ int templateId;
ProcedureTempleteDetailsModelList(
- {this.templateName, this.templateId, required ProcedureTempleteDetailsModel template}) {
+ {this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) {
procedureTemplate.add(template);
}
}
diff --git a/lib/core/model/procedure/procedure_template_details_request_model.dart b/lib/core/model/procedure/procedure_template_details_request_model.dart
index c5504cdd..6df6fc73 100644
--- a/lib/core/model/procedure/procedure_template_details_request_model.dart
+++ b/lib/core/model/procedure/procedure_template_details_request_model.dart
@@ -1,32 +1,32 @@
class ProcedureTempleteDetailsRequestModel {
- int? doctorID;
- String? firstName;
- int? templateID;
- String? middleName;
- String? lastName;
- String? patientMobileNumber;
- String? patientIdentificationID;
- int? patientID;
- String? from;
- String? to;
- int? searchType;
- String? mobileNo;
- String? identificationNo;
- int? editedBy;
- int? projectID;
- int? clinicID;
- String? tokenID;
- int? languageID;
- String? stamp;
- String? iPAdress;
- double? versionID;
- int? channel;
- String? sessionID;
- bool? isLoginForDoctorApp;
- bool? patientOutSA;
- String? vidaAuthTokenID;
- String? vidaRefreshTokenID;
- int? deviceTypeID;
+ int doctorID;
+ String firstName;
+ int templateID;
+ String middleName;
+ String lastName;
+ String patientMobileNumber;
+ String patientIdentificationID;
+ int patientID;
+ String from;
+ String to;
+ int searchType;
+ String mobileNo;
+ String identificationNo;
+ int editedBy;
+ int projectID;
+ int clinicID;
+ String tokenID;
+ int languageID;
+ String stamp;
+ String iPAdress;
+ double versionID;
+ int channel;
+ String sessionID;
+ bool isLoginForDoctorApp;
+ bool patientOutSA;
+ String vidaAuthTokenID;
+ String vidaRefreshTokenID;
+ int deviceTypeID;
ProcedureTempleteDetailsRequestModel(
{this.doctorID,
@@ -58,7 +58,7 @@ class ProcedureTempleteDetailsRequestModel {
this.vidaRefreshTokenID,
this.deviceTypeID});
- ProcedureTempleteDetailsRequestModel.fromJson(Map json) {
+ ProcedureTempleteDetailsRequestModel.fromJson(Map json) {
doctorID = json['DoctorID'];
firstName = json['FirstName'];
templateID = json['TemplateID'];
diff --git a/lib/core/model/procedure/procedure_valadate_model.dart b/lib/core/model/procedure/procedure_valadate_model.dart
index 431d369a..3a3e23cf 100644
--- a/lib/core/model/procedure/procedure_valadate_model.dart
+++ b/lib/core/model/procedure/procedure_valadate_model.dart
@@ -1,6 +1,6 @@
class ProcedureValadteModel {
- List? entityList;
- int? rowcount;
+ List entityList;
+ int rowcount;
dynamic statusMessage;
dynamic success;
@@ -9,9 +9,9 @@ class ProcedureValadteModel {
ProcedureValadteModel.fromJson(Map json) {
if (json['entityList'] != null) {
- entityList = [];
+ entityList = new List();
json['entityList'].forEach((v) {
- entityList!.add(new EntityList.fromJson(v));
+ entityList.add(new EntityList.fromJson(v));
});
}
rowcount = json['rowcount'];
@@ -22,7 +22,7 @@ class ProcedureValadteModel {
Map toJson() {
final Map data = new Map();
if (this.entityList != null) {
- data['entityList'] = this.entityList!.map((v) => v.toJson()).toList();
+ data['entityList'] = this.entityList.map((v) => v.toJson()).toList();
}
data['rowcount'] = this.rowcount;
data['statusMessage'] = this.statusMessage;
@@ -32,8 +32,8 @@ class ProcedureValadteModel {
}
class EntityList {
- String? procedureId;
- List? warringMessages;
+ String procedureId;
+ List warringMessages;
EntityList({this.procedureId, this.warringMessages});
diff --git a/lib/core/model/procedure/procedure_valadate_request_model.dart b/lib/core/model/procedure/procedure_valadate_request_model.dart
index 581ff41f..0b872b93 100644
--- a/lib/core/model/procedure/procedure_valadate_request_model.dart
+++ b/lib/core/model/procedure/procedure_valadate_request_model.dart
@@ -1,9 +1,9 @@
class ProcedureValadteRequestModel {
- String? vidaAuthTokenID;
- int? patientMRN;
- int? appointmentNo;
- int? episodeID;
- List? procedure;
+ String vidaAuthTokenID;
+ int patientMRN;
+ int appointmentNo;
+ int episodeID;
+ List procedure;
ProcedureValadteRequestModel(
{this.vidaAuthTokenID,
diff --git a/lib/core/model/procedure/update_procedure_request_model.dart b/lib/core/model/procedure/update_procedure_request_model.dart
index a6b92d16..aee39879 100644
--- a/lib/core/model/procedure/update_procedure_request_model.dart
+++ b/lib/core/model/procedure/update_procedure_request_model.dart
@@ -1,13 +1,13 @@
import 'ControlsModel.dart';
class UpdateProcedureRequestModel {
- int? orderNo;
- int? patientMRN;
- int? appointmentNo;
- int? episodeID;
- int? lineItemNo;
- ProcedureDetail? procedureDetail;
- String? vidaAuthTokenID;
+ int orderNo;
+ int patientMRN;
+ int appointmentNo;
+ int episodeID;
+ int lineItemNo;
+ ProcedureDetail procedureDetail;
+ String vidaAuthTokenID;
UpdateProcedureRequestModel(
{this.orderNo,
@@ -38,7 +38,7 @@ class UpdateProcedureRequestModel {
data['EpisodeID'] = this.episodeID;
data['LineItemNo'] = this.lineItemNo;
if (this.procedureDetail != null) {
- data['procedureDetail'] = this.procedureDetail!.toJson();
+ data['procedureDetail'] = this.procedureDetail.toJson();
}
data['VidaAuthTokenID'] = this.vidaAuthTokenID;
return data;
@@ -46,9 +46,9 @@ class UpdateProcedureRequestModel {
}
class ProcedureDetail {
- String? procedure;
- String? category;
- List? controls;
+ String procedure;
+ String category;
+ List controls;
ProcedureDetail({this.procedure, this.category, this.controls});
@@ -56,9 +56,9 @@ class ProcedureDetail {
procedure = json['Procedure'];
category = json['Category'];
if (json['Controls'] != null) {
- controls = [];
+ controls = new List();
json['Controls'].forEach((v) {
- controls!.add(new Controls.fromJson(v));
+ controls.add(new Controls.fromJson(v));
});
}
}
@@ -68,7 +68,7 @@ class ProcedureDetail {
data['Procedure'] = this.procedure;
data['Category'] = this.category;
if (this.controls != null) {
- data['Controls'] = this.controls!.map((v) => v.toJson()).toList();
+ data['Controls'] = this.controls.map((v) => v.toJson()).toList();
}
return data;
}
diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart
index 4c16151c..e09f269a 100644
--- a/lib/core/model/radiology/final_radiology.dart
+++ b/lib/core/model/radiology/final_radiology.dart
@@ -8,17 +8,17 @@ class FinalRadiology {
dynamic invoiceNo;
dynamic doctorID;
dynamic clinicID;
- DateTime? orderDate;
- DateTime ?reportDate;
+ DateTime orderDate;
+ DateTime reportDate;
dynamic reportData;
dynamic imageURL;
dynamic procedureID;
dynamic appodynamicmentNo;
dynamic dIAPacsURL;
- bool? isRead;
+ bool isRead;
dynamic readOn;
var admissionNo;
- bool ?isInOutPatient;
+ bool isInOutPatient;
dynamic actualDoctorRate;
dynamic clinicDescription;
dynamic dIAPACSURL;
@@ -28,8 +28,8 @@ class FinalRadiology {
dynamic doctorTitle;
dynamic gender;
dynamic genderDescription;
- bool? isActiveDoctorProfile;
- bool ?isExecludeDoctor;
+ bool isActiveDoctorProfile;
+ bool isExecludeDoctor;
dynamic isInOutPatientDescription;
dynamic isInOutPatientDescriptionN;
dynamic nationalityFlagURL;
@@ -39,10 +39,10 @@ class FinalRadiology {
dynamic qR;
dynamic reportDataHTML;
dynamic reportDataTextdynamic;
- List? speciality;
- bool ?isCVI;
- bool ?isRadMedicalReport;
- bool ?isLiveCareAppodynamicment;
+ List speciality;
+ bool isCVI;
+ bool isRadMedicalReport;
+ bool isLiveCareAppodynamicment;
FinalRadiology(
{this.setupID,
@@ -186,9 +186,9 @@ class FinalRadiology {
class FinalRadiologyList {
dynamic filterName = "";
- List finalRadiologyList = [];
+ List