first step from upgrade

html_rich_text
Elham Rababah 5 years ago
parent e5cee51ba9
commit e934d3b003

@ -53,12 +53,7 @@ target 'Runner' do
generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path) generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path)
cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR']; cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR'];
unless File.exist?(copied_framework_path)
FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir)
end
unless File.exist?(copied_podspec_path)
FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir)
end
end end
# Keep pod path relative so it can be checked into Podfile.lock. # Keep pod path relative so it can be checked into Podfile.lock.

@ -1,325 +0,0 @@
PODS:
- Alamofire (4.9.1)
- barcode_scan (0.0.1):
- Flutter
- MTBBarcodeScanner
- SwiftProtobuf
- connectivity (0.0.1):
- Flutter
- Reachability
- connectivity_for_web (0.1.0):
- Flutter
- connectivity_macos (0.0.1):
- Flutter
- device_info (0.0.1):
- Flutter
- Firebase/CoreOnly (6.33.0):
- FirebaseCore (= 6.10.3)
- Firebase/Messaging (6.33.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 4.7.0)
- firebase_core (0.5.3):
- Firebase/CoreOnly (~> 6.33.0)
- Flutter
- firebase_core_web (0.1.0):
- Flutter
- firebase_messaging (7.0.3):
- Firebase/CoreOnly (~> 6.33.0)
- Firebase/Messaging (~> 6.33.0)
- firebase_core
- Flutter
- FirebaseCore (6.10.3):
- FirebaseCoreDiagnostics (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- FirebaseCoreDiagnostics (1.7.0):
- GoogleDataTransport (~> 7.4)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Logger (~> 6.7)
- nanopb (~> 1.30906.0)
- FirebaseInstallations (1.7.0):
- FirebaseCore (~> 6.10)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- PromisesObjC (~> 1.2)
- FirebaseInstanceID (4.8.0):
- FirebaseCore (~> 6.10)
- FirebaseInstallations (~> 1.6)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- FirebaseMessaging (4.7.1):
- FirebaseCore (~> 6.10)
- FirebaseInstanceID (~> 4.7)
- GoogleUtilities/AppDelegateSwizzler (~> 6.7)
- GoogleUtilities/Environment (~> 6.7)
- GoogleUtilities/Reachability (~> 6.7)
- GoogleUtilities/UserDefaults (~> 6.7)
- Protobuf (>= 3.9.2, ~> 3.9)
- Flutter (1.0.0)
- flutter_flexible_toast (0.0.1):
- Flutter
- flutter_plugin_android_lifecycle (0.0.1):
- Flutter
- GoogleDataTransport (7.5.1):
- nanopb (~> 1.30906.0)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (6.7.2):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Network (6.7.2):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (6.7.2)"
- GoogleUtilities/Reachability (6.7.2):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (6.7.2):
- GoogleUtilities/Logger
- hexcolor (0.0.1):
- Flutter
- imei_plugin (0.0.1):
- Flutter
- local_auth (0.0.1):
- Flutter
- maps_launcher (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
- nanopb (1.30906.0):
- nanopb/decode (= 1.30906.0)
- nanopb/encode (= 1.30906.0)
- nanopb/decode (1.30906.0)
- nanopb/encode (1.30906.0)
- OpenTok (2.15.3)
- path_provider_linux (0.0.1):
- Flutter
- path_provider_windows (0.0.1):
- Flutter
- "permission_handler (5.1.0+2)":
- Flutter
- PromisesObjC (1.2.11)
- Protobuf (3.13.0)
- Reachability (3.2)
- screen (0.0.1):
- Flutter
- shared_preferences (0.0.1):
- Flutter
- shared_preferences_linux (0.0.1):
- Flutter
- shared_preferences_macos (0.0.1):
- Flutter
- shared_preferences_web (0.0.1):
- Flutter
- shared_preferences_windows (0.0.1):
- Flutter
- speech_to_text (0.0.1):
- Flutter
- Try
- SwiftProtobuf (1.9.0)
- Try (2.1.1)
- url_launcher (0.0.1):
- Flutter
- url_launcher_linux (0.0.1):
- Flutter
- url_launcher_macos (0.0.1):
- Flutter
- url_launcher_web (0.0.1):
- Flutter
- url_launcher_windows (0.0.1):
- Flutter
- video_player (0.0.1):
- Flutter
- video_player_web (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter (0.0.1):
- Flutter
DEPENDENCIES:
- Alamofire
- barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
- connectivity (from `.symlinks/plugins/connectivity/ios`)
- connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`)
- connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`)
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- Flutter (from `Flutter`)
- flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`)
- flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`)
- hexcolor (from `.symlinks/plugins/hexcolor/ios`)
- imei_plugin (from `.symlinks/plugins/imei_plugin/ios`)
- local_auth (from `.symlinks/plugins/local_auth/ios`)
- maps_launcher (from `.symlinks/plugins/maps_launcher/ios`)
- OpenTok
- path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`)
- path_provider_windows (from `.symlinks/plugins/path_provider_windows/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- screen (from `.symlinks/plugins/screen/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`)
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
- shared_preferences_windows (from `.symlinks/plugins/shared_preferences_windows/ios`)
- speech_to_text (from `.symlinks/plugins/speech_to_text/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`)
- url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`)
- url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
- url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- video_player_web (from `.symlinks/plugins/video_player_web/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
SPEC REPOS:
trunk:
- Alamofire
- Firebase
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseInstallations
- FirebaseInstanceID
- FirebaseMessaging
- GoogleDataTransport
- GoogleUtilities
- MTBBarcodeScanner
- nanopb
- OpenTok
- PromisesObjC
- Protobuf
- Reachability
- SwiftProtobuf
- Try
EXTERNAL SOURCES:
barcode_scan:
:path: ".symlinks/plugins/barcode_scan/ios"
connectivity:
:path: ".symlinks/plugins/connectivity/ios"
connectivity_for_web:
:path: ".symlinks/plugins/connectivity_for_web/ios"
connectivity_macos:
:path: ".symlinks/plugins/connectivity_macos/ios"
device_info:
:path: ".symlinks/plugins/device_info/ios"
firebase_core:
:path: ".symlinks/plugins/firebase_core/ios"
firebase_core_web:
:path: ".symlinks/plugins/firebase_core_web/ios"
firebase_messaging:
:path: ".symlinks/plugins/firebase_messaging/ios"
Flutter:
:path: Flutter
flutter_flexible_toast:
:path: ".symlinks/plugins/flutter_flexible_toast/ios"
flutter_plugin_android_lifecycle:
:path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios"
hexcolor:
:path: ".symlinks/plugins/hexcolor/ios"
imei_plugin:
:path: ".symlinks/plugins/imei_plugin/ios"
local_auth:
:path: ".symlinks/plugins/local_auth/ios"
maps_launcher:
:path: ".symlinks/plugins/maps_launcher/ios"
path_provider_linux:
:path: ".symlinks/plugins/path_provider_linux/ios"
path_provider_windows:
:path: ".symlinks/plugins/path_provider_windows/ios"
permission_handler:
:path: ".symlinks/plugins/permission_handler/ios"
screen:
:path: ".symlinks/plugins/screen/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
shared_preferences_linux:
:path: ".symlinks/plugins/shared_preferences_linux/ios"
shared_preferences_macos:
:path: ".symlinks/plugins/shared_preferences_macos/ios"
shared_preferences_web:
:path: ".symlinks/plugins/shared_preferences_web/ios"
shared_preferences_windows:
:path: ".symlinks/plugins/shared_preferences_windows/ios"
speech_to_text:
:path: ".symlinks/plugins/speech_to_text/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
url_launcher_linux:
:path: ".symlinks/plugins/url_launcher_linux/ios"
url_launcher_macos:
:path: ".symlinks/plugins/url_launcher_macos/ios"
url_launcher_web:
:path: ".symlinks/plugins/url_launcher_web/ios"
url_launcher_windows:
:path: ".symlinks/plugins/url_launcher_windows/ios"
video_player:
:path: ".symlinks/plugins/video_player/ios"
video_player_web:
:path: ".symlinks/plugins/video_player_web/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
:path: ".symlinks/plugins/webview_flutter/ios"
SPEC CHECKSUMS:
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b
connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
Firebase: 8db6f2d1b2c5e2984efba4949a145875a8f65fe5
firebase_core: 5d6a02f3d85acd5f8321c2d6d62877626a670659
firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1
firebase_messaging: 0aea2cd5885b65e19ede58ee3507f485c992cc75
FirebaseCore: d889d9e12535b7f36ac8bfbf1713a0836a3012cd
FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1
FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2
FirebaseInstanceID: bd3ffc24367f901a43c063b36c640b345a4a5dd1
FirebaseMessaging: 5eca4ef173de76253352511aafef774caa1cba2a
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143
flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89
imei_plugin: cb1af7c223ac2d82dcd1457a7137d93d65d2a3cd
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
OpenTok: fde03ecc5ea31fe0a453242847c4ee1f47e1d735
path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4
path_provider_windows: a2b81600c677ac1959367280991971cb9a1edb3b
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748
Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
screen: abd91ca7bf3426e1cc3646d27e9b2358d6bf07b0
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
shared_preferences_windows: 36b76d6f54e76ead957e60b49e2f124b4cd3e6ae
speech_to_text: b43a7d99aef037bd758ed8e45d79bbac035d2dfe
SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
Try: 5ef669ae832617b3cee58cb2c6f99fb767a4ff96
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0
url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7
wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4
webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
PODFILE CHECKSUM: 649616dc336b3659ac6b2b25159d8e488e042b69
COCOAPODS: 1.10.0.rc.1

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

@ -10,11 +10,11 @@ import 'package:url_launcher/url_launcher.dart';
import 'widgets/shared/buttons/secondary_button.dart'; import 'widgets/shared/buttons/secondary_button.dart';
class UpdatePage extends StatelessWidget { class UpdatePage extends StatelessWidget {
final String message; final String? message;
final String androidLink; final String? androidLink;
final String iosLink; final String? iosLink;
const UpdatePage({Key key, this.message, this.androidLink, this.iosLink}) const UpdatePage({Key? key, this.message, this.androidLink, this.iosLink})
: super(key: key); : super(key: key);
@override @override
@ -35,7 +35,7 @@ class UpdatePage extends StatelessWidget {
Image.asset('assets/images/HMG_logo.png'), Image.asset('assets/images/HMG_logo.png'),
SizedBox(height: 8,), SizedBox(height: 8,),
AppText( AppText(
TranslationBase.of(context).updateTheApp.toUpperCase(),fontSize: 17, TranslationBase.of(context)!.updateTheApp!.toUpperCase(),fontSize: 17,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
SizedBox(height: 12,), SizedBox(height: 12,),
@ -55,11 +55,11 @@ class UpdatePage extends StatelessWidget {
color: Colors.red[800], color: Colors.red[800],
onTap: () { onTap: () {
if (Platform.isIOS) if (Platform.isIOS)
launch(iosLink); launch(iosLink!);
else else
launch(androidLink); launch(androidLink!);
}, },
label: TranslationBase.of(context).updateNow.toUpperCase(), label: TranslationBase.of(context)!.updateNow!.toUpperCase(),
), ),
), ),
), ),

@ -18,9 +18,9 @@ Helpers helpers = new Helpers();
class BaseAppClient { class BaseAppClient {
//TODO change the post fun to nun static when you change all service //TODO change the post fun to nun static when you change all service
post(String endPoint, post(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, Function(dynamic response, int statusCode)? onSuccess,
Function(String error, int statusCode) onFailure, Function(String error, int statusCode)? onFailure,
bool isAllowAny = false}) async { bool isAllowAny = false}) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
@ -29,7 +29,7 @@ class BaseAppClient {
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
String token = await sharedPref.getString(TOKEN); String token = await sharedPref.getString(TOKEN);
if (profile != null) { if (profile != null) {
DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
if (body['DoctorID'] == null) if (body['DoctorID'] == null)
body['DoctorID'] = doctorProfile?.doctorID; body['DoctorID'] = doctorProfile?.doctorID;
if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['DoctorID'] == "") body['DoctorID'] = null;
@ -91,7 +91,7 @@ class BaseAppClient {
}); });
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
if (statusCode < 200 || statusCode >= 400) { if (statusCode < 200 || statusCode >= 400) {
onFailure(Helpers.generateContactAdminMsg(), statusCode); onFailure!(Helpers.generateContactAdminMsg(), statusCode);
} else { } else {
var parsed = json.decode(response.body.toString()); var parsed = json.decode(response.body.toString());
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
@ -101,37 +101,37 @@ class BaseAppClient {
if (!parsed['IsAuthenticated']) { if (!parsed['IsAuthenticated']) {
if (body['OTP_SendType'] != null) { if (body['OTP_SendType'] != null) {
onFailure(getError(parsed), statusCode); onFailure!(getError(parsed), statusCode);
} else if (!isAllowAny) { } else if (!isAllowAny) {
await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout(isSessionTimeout: true); await Provider.of<AuthenticationViewModel>(AppGlobal.CONTEX, listen: false).logout(isSessionTimeout: true);
Helpers.showErrorToast('Your session expired Please login again'); Helpers.showErrorToast('Your session expired Please login again');
} }
if (isAllowAny) { if (isAllowAny) {
onFailure(getError(parsed), statusCode); onFailure!(getError(parsed), statusCode);
} }
} else if (parsed['MessageStatus'] == 1) { } else if (parsed['MessageStatus'] == 1) {
if (!parsed['IsAuthenticated']) if (!parsed['IsAuthenticated'])
onFailure(getError(parsed), statusCode); onFailure!(getError(parsed), statusCode);
else else
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
onFailure(getError(parsed), statusCode); onFailure!(getError(parsed), statusCode);
} }
} }
} else { } else {
onFailure('Please Check The Internet Connection', -1); onFailure!('Please Check The Internet Connection', -1);
} }
} catch (e) { } catch (e) {
print(e); print(e);
onFailure(e.toString(), -1); onFailure!(e.toString(), -1);
} }
} }
postPatient(String endPoint, postPatient(String endPoint,
{Map<String, dynamic> body, {required Map<String, dynamic> body,
Function(dynamic response, int statusCode) onSuccess, Function(dynamic response, int statusCode)? onSuccess,
Function(String error, int statusCode) onFailure, Function(String? error, int statusCode)? onFailure,
@required PatiantInformtion patient, required PatiantInformtion? patient,
bool isExternal = false}) async { bool isExternal = false}) async {
String url = BASE_URL + endPoint; String url = BASE_URL + endPoint;
@ -178,7 +178,7 @@ class BaseAppClient {
body['PatientType'] = body.containsKey('PatientType') body['PatientType'] = body.containsKey('PatientType')
? body['PatientType'] != null ? body['PatientType'] != null
? body['PatientType'] ? body['PatientType']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE : PATIENT_TYPE
: PATIENT_TYPE; : PATIENT_TYPE;
@ -186,7 +186,7 @@ class BaseAppClient {
body['PatientTypeID'] = body.containsKey('PatientTypeID') body['PatientTypeID'] = body.containsKey('PatientTypeID')
? body['PatientTypeID'] != null ? body['PatientTypeID'] != null
? body['PatientTypeID'] ? body['PatientTypeID']
: patient.patientType != null : patient!.patientType != null
? patient.patientType ? patient.patientType
: PATIENT_TYPE_ID : PATIENT_TYPE_ID
: PATIENT_TYPE_ID; : PATIENT_TYPE_ID;
@ -194,7 +194,7 @@ class BaseAppClient {
body['TokenID'] = token; body['TokenID'] = token;
body['PatientID'] = body['PatientID'] != null body['PatientID'] = body['PatientID'] != null
? body['PatientID'] ? body['PatientID']
: patient.patientId ?? patient.patientMRN; : patient!.patientId ?? patient.patientMRN;
body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it body['PatientOutSA'] = 0; //user['OutSA']; //TODO change it
body['SessionID'] = SESSION_ID; //getSe body['SessionID'] = SESSION_ID; //getSe
@ -214,12 +214,12 @@ class BaseAppClient {
final int statusCode = response.statusCode; final int statusCode = response.statusCode;
print("statusCode :$statusCode"); print("statusCode :$statusCode");
if (statusCode < 200 || statusCode >= 400 || json == null) { if (statusCode < 200 || statusCode >= 400 || json == null) {
onFailure('Error While Fetching data', statusCode); onFailure!('Error While Fetching data', statusCode);
} else { } else {
// var parsed = json.decode(response.body.toString()); // var parsed = json.decode(response.body.toString());
var parsed = json.decode(utf8.decode(response.bodyBytes)); var parsed = json.decode(utf8.decode(response.bodyBytes));
if (parsed['Response_Message'] != null) { if (parsed['Response_Message'] != null) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
if (parsed['ErrorType'] == 4) { if (parsed['ErrorType'] == 4) {
helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'], helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],
@ -227,36 +227,36 @@ class BaseAppClient {
} }
if (parsed['IsAuthenticated'] == null) { if (parsed['IsAuthenticated'] == null) {
if (parsed['isSMSSent'] == true) { if (parsed['isSMSSent'] == true) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else if (parsed['MessageStatus'] == 1) { } else if (parsed['MessageStatus'] == 1) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else if (parsed['Result'] == 'OK') { } else if (parsed['Result'] == 'OK') {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
if (parsed != null) { if (parsed != null) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
onFailure(getError(parsed), statusCode); onFailure!(getError(parsed), statusCode);
} }
} }
} else if (parsed['MessageStatus'] == 1 || } else if (parsed['MessageStatus'] == 1 ||
parsed['SMSLoginRequired'] == true) { parsed['SMSLoginRequired'] == true) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else if (parsed['MessageStatus'] == 2 && } else if (parsed['MessageStatus'] == 2 &&
parsed['IsAuthenticated']) { parsed['IsAuthenticated']) {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
if (parsed['message'] == null && if (parsed['message'] == null &&
parsed['ErrorEndUserMessage'] == null) { parsed['ErrorEndUserMessage'] == null) {
if (parsed['ErrorSearchMsg'] == null) { if (parsed['ErrorSearchMsg'] == null) {
onFailure("Server Error found with no available message", onFailure!("Server Error found with no available message",
statusCode); statusCode);
} else { } else {
onFailure(parsed['ErrorSearchMsg'], statusCode); onFailure!(parsed['ErrorSearchMsg'], statusCode);
} }
} else { } else {
onFailure( onFailure!(
parsed['message'] ?? parsed['message'] ??
parsed['ErrorEndUserMessage'] ?? parsed['ErrorEndUserMessage'] ??
parsed['ErrorMessage'], parsed['ErrorMessage'],
@ -265,12 +265,12 @@ class BaseAppClient {
} }
} else { } else {
if (parsed['SameClinicApptList'] != null) { if (parsed['SameClinicApptList'] != null) {
onSuccess(parsed, statusCode); onSuccess!(parsed, statusCode);
} else { } else {
if (parsed['message'] != null) { if (parsed['message'] != null) {
onFailure(parsed['message'] ?? parsed['message'], statusCode); onFailure!(parsed['message'] ?? parsed['message'], statusCode);
} else { } else {
onFailure( onFailure!(
parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'], parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'],
statusCode); statusCode);
} }
@ -279,17 +279,17 @@ class BaseAppClient {
} }
} }
} else { } else {
onFailure('Please Check The Internet Connection', -1); onFailure!('Please Check The Internet Connection', -1);
} }
} catch (e) { } catch (e) {
print(e); print(e);
onFailure(e.toString(), -1); onFailure!(e.toString(), -1);
} }
} }
String getError(parsed) { String getError(parsed) {
//TODO change this fun //TODO change this fun
String error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage']; String? error = parsed['ErrorEndUserMessage'] ?? parsed['ErrorMessage'];
if (parsed["ValidationErrors"] != null) { if (parsed["ValidationErrors"] != null) {
error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n"; error = parsed["ValidationErrors"]["StatusMessage"].toString() + "\n";
@ -298,7 +298,7 @@ class BaseAppClient {
for (var i = 0; for (var i = 0;
i < parsed["ValidationErrors"]["ValidationErrors"].length; i < parsed["ValidationErrors"]["ValidationErrors"].length;
i++) { i++) {
error = error + error = error! +
parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] + parsed["ValidationErrors"]["ValidationErrors"][i]["Messages"][0] +
"\n"; "\n";
} }

@ -350,6 +350,6 @@ const PATIENT_TYPE_ID = 1;
const TIMER_MIN = 10; const TIMER_MIN = 10;
class AppGlobal { class AppGlobal {
static var CONTEX; static late var CONTEX;
static Color appPrimaryColor = Color(0xFFB9382C); static Color appPrimaryColor = Color(0xFFB9382C);
} }

@ -5,14 +5,14 @@ class SizeConfig {
static double _blockWidth = 0; static double _blockWidth = 0;
static double _blockHeight = 0; static double _blockHeight = 0;
static double realScreenWidth; static double? realScreenWidth;
static double realScreenHeight; static double? realScreenHeight;
static double screenWidth; static double? screenWidth;
static double screenHeight; static double? screenHeight;
static double textMultiplier; static late double textMultiplier;
static double imageSizeMultiplier; static late double imageSizeMultiplier;
static double heightMultiplier; static late double heightMultiplier;
static double widthMultiplier; static late double widthMultiplier;
static bool isPortrait = true; static bool isPortrait = true;
static bool isMobilePortrait = false; static bool isMobilePortrait = false;
@ -28,7 +28,7 @@ class SizeConfig {
} }
if (orientation == Orientation.portrait) { if (orientation == Orientation.portrait) {
isPortrait = true; isPortrait = true;
if (realScreenWidth < 450) { if (realScreenWidth! < 450) {
isMobilePortrait = true; isMobilePortrait = true;
} }
// textMultiplier = _blockHeight; // textMultiplier = _blockHeight;
@ -43,8 +43,8 @@ class SizeConfig {
screenHeight = realScreenWidth; screenHeight = realScreenWidth;
screenWidth = realScreenHeight; screenWidth = realScreenHeight;
} }
_blockWidth = screenWidth / 100; _blockWidth = screenWidth! / 100;
_blockHeight = screenHeight / 100; _blockHeight = screenHeight! / 100;
textMultiplier = _blockHeight; textMultiplier = _blockHeight;
imageSizeMultiplier = _blockWidth; imageSizeMultiplier = _blockWidth;

@ -1,5 +1,5 @@
enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions } enum AuthMethodTypes { SMS, WhatsApp, Fingerprint,FaceID,MoreOptions }
extension SelectedAuthMethodTypesService on AuthMethodTypes { extension SelectedAuthMethodTypesService on AuthMethodTypes? {
// ignore: missing_return // ignore: missing_return
int getTypeIdService() { int getTypeIdService() {
switch (this) { switch (this) {
@ -18,12 +18,14 @@ extension SelectedAuthMethodTypesService on AuthMethodTypes {
case AuthMethodTypes.MoreOptions: case AuthMethodTypes.MoreOptions:
return 5; return 5;
break; break;
default: return 1;
} }
} }
// ignore: missing_return // ignore: missing_return
static getMethodsTypeService( int typeId) { static getMethodsTypeService( int? typeId) {
switch (typeId) { switch (typeId) {
case 1: case 1:
return AuthMethodTypes.SMS; return AuthMethodTypes.SMS;

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

@ -1,40 +1,40 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class Prescriptions { class Prescriptions {
String setupID; String? setupID;
int projectID; int? projectID;
int patientID; int? patientID;
int appointmentNo; int? appointmentNo;
String appointmentDate; String? appointmentDate;
String doctorName; String? doctorName;
String clinicDescription; String? clinicDescription;
String name; String? name;
int episodeID; int? episodeID;
int actualDoctorRate; int? actualDoctorRate;
int admission; int? admission;
int clinicID; int? clinicID;
String companyName; String? companyName;
String despensedStatus; String? despensedStatus;
DateTime dischargeDate; DateTime? dischargeDate;
int dischargeNo; int? dischargeNo;
int doctorID; int? doctorID;
String doctorImageURL; String? doctorImageURL;
int doctorRate; int? doctorRate;
String doctorTitle; String? doctorTitle;
int gender; int? gender;
String genderDescription; String? genderDescription;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
String isInOutPatientDescription; String? isInOutPatientDescription;
String isInOutPatientDescriptionN; String? isInOutPatientDescriptionN;
bool isInsurancePatient; bool? isInsurancePatient;
String nationalityFlagURL; String? nationalityFlagURL;
int noOfPatientsRate; int? noOfPatientsRate;
String qR; String? qR;
List<String> speciality; List<String>? speciality;
Prescriptions( Prescriptions(
{this.setupID, {this.setupID,
@ -149,10 +149,10 @@ class Prescriptions {
} }
class PrescriptionsList { class PrescriptionsList {
String filterName = ""; String? filterName = "";
List<Prescriptions> prescriptionsList = List(); List<Prescriptions?> prescriptionsList = [];
PrescriptionsList({this.filterName, Prescriptions prescriptions}) { PrescriptionsList({this.filterName, Prescriptions? prescriptions}) {
prescriptionsList.add(prescriptions); prescriptionsList.add(prescriptions);
} }
} }

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

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

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

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

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

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

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

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

@ -1,32 +1,32 @@
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionsOrder { class PrescriptionsOrder {
int iD; int? iD;
dynamic patientID; dynamic patientID;
bool patientOutSA; bool? patientOutSA;
bool isOutPatient; bool? isOutPatient;
int projectID; int? projectID;
int nearestProjectID; int? nearestProjectID;
double longitude; double? longitude;
double latitude; double? latitude;
dynamic appointmentNo; dynamic appointmentNo;
dynamic dischargeID; dynamic dischargeID;
int lineItemNo; int? lineItemNo;
int status; int? status;
dynamic description; dynamic description;
dynamic descriptionN; dynamic descriptionN;
DateTime createdOn; DateTime? createdOn;
int serviceID; int? serviceID;
int createdBy; int? createdBy;
DateTime editedOn; DateTime? editedOn;
int editedBy; int? editedBy;
int channel; int? channel;
dynamic clientRequestID; dynamic clientRequestID;
bool returnedToQueue; bool? returnedToQueue;
dynamic pickupDateTime; dynamic pickupDateTime;
dynamic pickupLocationName; dynamic pickupLocationName;
dynamic dropoffLocationName; dynamic dropoffLocationName;
int realRRTHaveTransactions; int? realRRTHaveTransactions;
dynamic nearestProjectDescription; dynamic nearestProjectDescription;
dynamic nearestProjectDescriptionN; dynamic nearestProjectDescriptionN;
dynamic projectDescription; dynamic projectDescription;

@ -1,16 +1,16 @@
class RequestGetListPharmacyForPrescriptions { class RequestGetListPharmacyForPrescriptions {
int latitude; int? latitude;
int longitude; int? longitude;
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int itemID; int? itemID;
RequestGetListPharmacyForPrescriptions( RequestGetListPharmacyForPrescriptions(
{this.latitude, {this.latitude,

@ -1,23 +1,23 @@
class RequestPrescriptionReport { class RequestPrescriptionReport {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
int appointmentNo; int? appointmentNo;
String setupID; String? setupID;
int episodeID; int? episodeID;
int clinicID; int? clinicID;
int projectID; int? projectID;
int dischargeNo; int? dischargeNo;
RequestPrescriptionReport( RequestPrescriptionReport(
{this.versionID, {this.versionID,

@ -1,23 +1,23 @@
class RequestPrescriptionReportEnh { class RequestPrescriptionReportEnh {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
int appointmentNo; int? appointmentNo;
String setupID; String? setupID;
int dischargeNo; int? dischargeNo;
int episodeID; int? episodeID;
int clinicID; int? clinicID;
int projectID; int? projectID;
RequestPrescriptionReportEnh( RequestPrescriptionReportEnh(
{this.versionID, {this.versionID,

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

@ -1,9 +1,9 @@
class Clinic { class Clinic {
int clinicGroupID; int? clinicGroupID;
String clinicGroupName; String? clinicGroupName;
int clinicID; int? clinicID;
String clinicNameArabic; String? clinicNameArabic;
String clinicNameEnglish; String? clinicNameEnglish;
Clinic( Clinic(
{this.clinicGroupID, {this.clinicGroupID,

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,20 +1,20 @@
class HospitalsModel { class HospitalsModel {
String desciption; String? desciption;
dynamic desciptionN; dynamic desciptionN;
int iD; int? iD;
String legalName; String? legalName;
String legalNameN; String? legalNameN;
String name; String? name;
dynamic nameN; dynamic nameN;
String phoneNumber; String? phoneNumber;
String setupID; String? setupID;
int distanceInKilometers; int? distanceInKilometers;
bool isActive; bool? isActive;
String latitude; String? latitude;
String longitude; String? longitude;
int mainProjectID; int? mainProjectID;
dynamic projectOutSA; dynamic projectOutSA;
bool usingInDoctorApp; bool? usingInDoctorApp;
HospitalsModel({this.desciption, HospitalsModel({this.desciption,
this.desciptionN, this.desciptionN,

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

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

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

@ -1,22 +1,22 @@
class LabResult { class LabResult {
String description; String? description;
dynamic femaleInterpretativeData; dynamic femaleInterpretativeData;
int gender; int? gender;
int lineItemNo; int? lineItemNo;
dynamic maleInterpretativeData; dynamic maleInterpretativeData;
String notes; String? notes;
String packageID; String? packageID;
int patientID; int? patientID;
String projectID; String? projectID;
String referanceRange; String? referanceRange;
String resultValue; String? resultValue;
String sampleCollectedOn; String? sampleCollectedOn;
String sampleReceivedOn; String? sampleReceivedOn;
String setupID; String? setupID;
dynamic superVerifiedOn; dynamic superVerifiedOn;
String testCode; String? testCode;
String uOM; String? uOM;
String verifiedOn; String? verifiedOn;
dynamic verifiedOnDateTime; dynamic verifiedOnDateTime;
LabResult( LabResult(
@ -89,10 +89,10 @@ class LabResult {
class LabResultList { class LabResultList {
String filterName = ""; String? filterName = "";
List<LabResult> patientLabResultList = List(); List<LabResult?> patientLabResultList = [];
LabResultList({this.filterName, LabResult lab}) { LabResultList({this.filterName, LabResult? lab}) {
patientLabResultList.add(lab); patientLabResultList.add(lab);
} }
} }

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

@ -1,8 +1,8 @@
class PatientLabSpecialResult { class PatientLabSpecialResult {
String invoiceNo; String? invoiceNo;
String moduleID; String? moduleID;
String resultData; String? resultData;
String resultDataHTML; String? resultDataHTML;
Null resultDataTxt; Null resultDataTxt;
PatientLabSpecialResult( PatientLabSpecialResult(

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

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

@ -1,29 +1,29 @@
class RequestSendLabReportEmail { class RequestSendLabReportEmail {
double versionID; double? versionID;
int channel; int? channel;
int languageID; int? languageID;
String iPAdress; String? iPAdress;
String generalid; String? generalid;
int patientOutSA; int? patientOutSA;
String sessionID; String? sessionID;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int deviceTypeID; int? deviceTypeID;
int patientID; int? patientID;
String tokenID; String? tokenID;
int patientTypeID; int? patientTypeID;
int patientType; int? patientType;
String to; String? to;
String dateofBirth; String? dateofBirth;
String patientIditificationNum; String? patientIditificationNum;
String patientMobileNumber; String? patientMobileNumber;
String patientName; String? patientName;
String setupID; String? setupID;
String projectName; String? projectName;
String clinicName; String? clinicName;
String doctorName; String? doctorName;
String projectID; String? projectID;
String invoiceNo; String? invoiceNo;
String orderDate; String? orderDate;
RequestSendLabReportEmail( RequestSendLabReportEmail(
{this.versionID, {this.versionID,

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

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

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

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

@ -1,21 +1,21 @@
class UpdateNoteReqModel { class UpdateNoteReqModel {
int projectID; int? projectID;
int createdBy; int? createdBy;
int admissionNo; int? admissionNo;
int lineItemNo; int? lineItemNo;
String notes; String? notes;
bool verifiedNote; bool? verifiedNote;
bool cancelledNote; bool? cancelledNote;
int languageID; int? languageID;
String stamp; String? stamp;
String iPAdress; String? iPAdress;
double versionID; double? versionID;
int channel; int? channel;
String tokenID; String? tokenID;
String sessionID; String? sessionID;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
bool patientOutSA; bool? patientOutSA;
int patientTypeID; int? patientTypeID;
UpdateNoteReqModel( UpdateNoteReqModel(
{this.projectID, {this.projectID,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,30 +1,30 @@
class RequestSendRadReportEmail { class RequestSendRadReportEmail {
int channel; int? channel;
String clinicName; String? clinicName;
String dateofBirth; String? dateofBirth;
int deviceTypeID; int? deviceTypeID;
String doctorName; String? doctorName;
String generalid; String? generalid;
int invoiceNo; int? invoiceNo;
String iPAdress; String? iPAdress;
bool isDentalAllowedBackend; bool? isDentalAllowedBackend;
int languageID; int? languageID;
String orderDate; String? orderDate;
int patientID; int? patientID;
String patientIditificationNum; String? patientIditificationNum;
String patientMobileNumber; String? patientMobileNumber;
String patientName; String? patientName;
int patientOutSA; int? patientOutSA;
int patientType; int? patientType;
int patientTypeID; int? patientTypeID;
int projectID; int? projectID;
String projectName; String? projectName;
String radResult; String? radResult;
String sessionID; String? sessionID;
String setupID; String? setupID;
String to; String? to;
String tokenID; String? tokenID;
double versionID; double? versionID;
RequestSendRadReportEmail( RequestSendRadReportEmail(
{this.channel, {this.channel,

@ -2,56 +2,56 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class DischargeReferralPatient { class DischargeReferralPatient {
dynamic rowID; dynamic rowID;
int projectID; int? projectID;
int lineItemNo; int? lineItemNo;
int doctorID; int? doctorID;
int patientID; int? patientID;
String doctorName; String? doctorName;
dynamic doctorNameN; dynamic doctorNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
dynamic firstNameN; dynamic firstNameN;
dynamic middleNameN; dynamic middleNameN;
dynamic lastNameN; dynamic lastNameN;
int gender; int? gender;
String dateofBirth; String? dateofBirth;
String mobileNumber; String? mobileNumber;
String emailAddress; String? emailAddress;
String patientIdentificationNo; String? patientIdentificationNo;
int patientType; int? patientType;
String admissionNo; String? admissionNo;
String admissionDate; String? admissionDate;
String roomID; String? roomID;
String bedID; String? bedID;
dynamic nursingStationID; dynamic nursingStationID;
dynamic description; dynamic description;
String nationalityName; String? nationalityName;
dynamic nationalityNameN; dynamic nationalityNameN;
int referralDoctor; int? referralDoctor;
int referringDoctor; int? referringDoctor;
int referralClinic; int? referralClinic;
int referringClinic; int? referringClinic;
int referralStatus; int? referralStatus;
DateTime referralDate; DateTime? referralDate;
String referringDoctorRemarks; String? referringDoctorRemarks;
String referredDoctorRemarks; String? referredDoctorRemarks;
String referralResponseOn; String? referralResponseOn;
int priority; int? priority;
int frequency; int? frequency;
String mAXResponseTime; String? mAXResponseTime;
String dischargeDate; String? dischargeDate;
dynamic clinicID; dynamic clinicID;
String age; String? age;
String clinicDescription; String? clinicDescription;
String frequencyDescription; String? frequencyDescription;
String genderDescription; String? genderDescription;
bool isDoctorLate; bool? isDoctorLate;
bool isDoctorResponse; bool? isDoctorResponse;
String nursingStationName; String? nursingStationName;
String priorityDescription; String? priorityDescription;
String referringClinicDescription; String? referringClinicDescription;
String referringDoctorName; String? referringDoctorName;
DischargeReferralPatient( DischargeReferralPatient(
{this.rowID, {this.rowID,

@ -2,65 +2,65 @@ import 'package:doctor_app_flutter/util/date-utils.dart';
class MyReferralPatientModel { class MyReferralPatientModel {
dynamic rowID; dynamic rowID;
int projectID; int? projectID;
int lineItemNo; int? lineItemNo;
int doctorID; int? doctorID;
int patientID; int? patientID;
String doctorName; String? doctorName;
dynamic doctorNameN; dynamic doctorNameN;
String firstName; String? firstName;
String middleName; String? middleName;
String lastName; String? lastName;
dynamic firstNameN; dynamic firstNameN;
dynamic middleNameN; dynamic middleNameN;
dynamic lastNameN; dynamic lastNameN;
int gender; int? gender;
String dateofBirth; String? dateofBirth;
String mobileNumber; String? mobileNumber;
String emailAddress; String? emailAddress;
String patientIdentificationNo; String? patientIdentificationNo;
int patientType; int? patientType;
String admissionNo; String? admissionNo;
String admissionDate; String? admissionDate;
String roomID; String? roomID;
String bedID; String? bedID;
dynamic nursingStationID; dynamic nursingStationID;
dynamic description; dynamic description;
String nationalityName; String? nationalityName;
dynamic nationalityNameN; dynamic nationalityNameN;
String clinicDescription; String? clinicDescription;
String clinicDescriptionN; String? clinicDescriptionN;
int referralDoctor; int? referralDoctor;
int referringDoctor; int? referringDoctor;
int referralClinic; int? referralClinic;
int referringClinic; int? referringClinic;
int referralStatus; int? referralStatus;
DateTime referralDate; DateTime? referralDate;
String referringDoctorRemarks; String? referringDoctorRemarks;
String referredDoctorRemarks; String? referredDoctorRemarks;
String referralResponseOn; String? referralResponseOn;
int priority; int? priority;
int frequency; int? frequency;
String mAXResponseTime; String? mAXResponseTime;
int episodeID; int? episodeID;
int appointmentNo; int? appointmentNo;
String appointmentDate; String? appointmentDate;
int appointmentType; int? appointmentType;
int patientMRN; int? patientMRN;
String createdOn; String? createdOn;
int clinicID; int? clinicID;
String nationalityID; String? nationalityID;
String age; String? age;
String doctorImageURL; String? doctorImageURL;
String frequencyDescription; String? frequencyDescription;
String genderDescription; String? genderDescription;
bool isDoctorLate; bool? isDoctorLate;
bool isDoctorResponse; bool? isDoctorResponse;
String nationalityFlagURL; String? nationalityFlagURL;
String nursingStationName; String? nursingStationName;
String priorityDescription; String? priorityDescription;
String referringClinicDescription; String? referringClinicDescription;
String referringDoctorName; String? referringDoctorName;
MyReferralPatientModel( MyReferralPatientModel(
{this.rowID, {this.rowID,
@ -253,6 +253,6 @@ class MyReferralPatientModel {
} }
get patientName { get patientName {
return this.firstName+" "+this.lastName; return this.firstName!+" "+this.lastName!;
} }
} }

@ -1,28 +1,28 @@
class ReferralRequest { class ReferralRequest {
String roomID; String? roomID;
String referralClinic; String? referralClinic;
String referralDoctor; String? referralDoctor;
int createdBy; int? createdBy;
int editedBy; int? editedBy;
int patientID; int? patientID;
int patientTypeID; int? patientTypeID;
int referringClinic; int? referringClinic;
int referringDoctor; int? referringDoctor;
int projectID; int? projectID;
int admissionNo; int? admissionNo;
String referringDoctorRemarks; String? referringDoctorRemarks;
String priority; String? priority;
String frequency; String? frequency;
String extension; String? extension;
int languageID; int? languageID;
String stamp; String? stamp;
String iPAdress; String? iPAdress;
double versionID; double? versionID;
int channel; int? channel;
String tokenID; String? tokenID;
String sessionID; String? sessionID;
bool isLoginForDoctorApp; bool? isLoginForDoctorApp;
bool patientOutSA; bool? patientOutSA;
ReferralRequest( ReferralRequest(
{this.roomID, {this.roomID,

@ -1,13 +1,13 @@
class GetMedicationResponseModel { class GetMedicationResponseModel {
String description; String? description;
String genericName; String? genericName;
int itemId; int? itemId;
String keywords; String? keywords;
dynamic price; dynamic price;
dynamic quantity; dynamic quantity;
dynamic mediSpanGPICode; dynamic mediSpanGPICode;
bool isNarcotic; bool? isNarcotic;
String uom; String? uom;
GetMedicationResponseModel( GetMedicationResponseModel(
{this.description, {this.description,
this.genericName, this.genericName,

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

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

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

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

@ -1,41 +1,41 @@
import 'package:doctor_app_flutter/widgets/shared/StarRating.dart'; import 'package:doctor_app_flutter/widgets/shared/StarRating.dart';
class SickLeavePatientModel { class SickLeavePatientModel {
String setupID; String? setupID;
int projectID; int? projectID;
int patientID; int? patientID;
int patientType; int? patientType;
int clinicID; int? clinicID;
int doctorID; int? doctorID;
int requestNo; int? requestNo;
String requestDate; String? requestDate;
int sickLeaveDays; int? sickLeaveDays;
int appointmentNo; int? appointmentNo;
int admissionNo; int? admissionNo;
int actualDoctorRate; int? actualDoctorRate;
String appointmentDate; String? appointmentDate;
String clinicName; String? clinicName;
String doctorImageURL; String? doctorImageURL;
String doctorName; String? doctorName;
int doctorRate; int? doctorRate;
String doctorTitle; String? doctorTitle;
int gender; int? gender;
String genderDescription; String? genderDescription;
bool isActiveDoctorProfile; bool? isActiveDoctorProfile;
bool isDoctorAllowVedioCall; bool? isDoctorAllowVedioCall;
bool isExecludeDoctor; bool? isExecludeDoctor;
bool isInOutPatient; bool? isInOutPatient;
String isInOutPatientDescription; String? isInOutPatientDescription;
String isInOutPatientDescriptionN; String? isInOutPatientDescriptionN;
bool isLiveCareAppointment; bool? isLiveCareAppointment;
int noOfPatientsRate; int? noOfPatientsRate;
dynamic patientName; dynamic patientName;
String projectName; String? projectName;
String qR; String? qR;
// List<String> speciality; // List<String> speciality;
String strRequestDate; String? strRequestDate;
String startDate; String? startDate;
String endDate; String? endDate;
SickLeavePatientModel( SickLeavePatientModel(
{this.setupID, {this.setupID,

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

@ -3,7 +3,7 @@ import 'dart:async';
class RobotProvider { class RobotProvider {
static final RobotProvider _singleton = RobotProvider._internal(); static final RobotProvider _singleton = RobotProvider._internal();
var value; var value;
StreamController<Map> controller = StreamController<Map>.broadcast(); StreamController<Map?> controller = StreamController<Map?>.broadcast();
getData() { getData() {
// return data; // return data;

@ -49,7 +49,7 @@ class AuthenticationService extends BaseService {
}, body: {"IMEI": imei, "TokenID": "@dm!n"}); }, body: {"IMEI": imei, "TokenID": "@dm!n"});
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -66,7 +66,7 @@ class AuthenticationService extends BaseService {
}, body: userInfo.toJson()); }, body: userInfo.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -84,7 +84,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson()); }, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -102,7 +102,7 @@ class AuthenticationService extends BaseService {
}, body: activationCodeModel.toJson()); }, body: activationCodeModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -119,7 +119,7 @@ class AuthenticationService extends BaseService {
}, body: checkActivationCodeRequestModel.toJson()); }, body: checkActivationCodeRequestModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -138,7 +138,7 @@ class AuthenticationService extends BaseService {
}, body: insertIMEIDetailsModel.toJson()); }, body: insertIMEIDetailsModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
@ -157,7 +157,7 @@ class AuthenticationService extends BaseService {
}, body: profileReqModel.toJson()); }, body: profileReqModel.toJson());
} catch (error) { } catch (error) {
hasError = true; hasError = true;
super.error = error; super.error = error.toString();
} }
} }
} }

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

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

@ -4,15 +4,15 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
class DischargedPatientService extends BaseService { class DischargedPatientService extends BaseService {
List<PatiantInformtion> myDischargedPatients = List(); List<PatiantInformtion> myDischargedPatients = [];
List<DischargeReferralPatient> myDischargeReferralPatients = List(); List<DischargeReferralPatient> myDischargeReferralPatients = [];
Future getDischargedPatient() async { Future getDischargedPatient() async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true); await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID; body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0"; body['FirstName'] = "0";
body['MiddleName'] = "0"; body['MiddleName'] = "0";
body['LastName'] = "0"; body['LastName'] = "0";
@ -45,7 +45,7 @@ class DischargedPatientService extends BaseService {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
await getDoctorProfile(isGetProfile: true); await getDoctorProfile(isGetProfile: true);
body['DoctorID'] = doctorProfile.doctorID; body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0"; body['FirstName'] = "0";
body['MiddleName'] = "0"; body['MiddleName'] = "0";
body['LastName'] = "0"; body['LastName'] = "0";

@ -4,13 +4,13 @@ import 'package:doctor_app_flutter/core/service/base/base_service.dart';
import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart'; import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart';
class MyReferralInPatientService extends BaseService { class MyReferralInPatientService extends BaseService {
List<MyReferralPatientModel> myReferralPatients = List(); List<MyReferralPatientModel> myReferralPatients = [];
Future getMyReferralPatientService() async { Future getMyReferralPatientService() async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
await getDoctorProfile(); await getDoctorProfile();
body['DoctorID'] = doctorProfile.doctorID; body['DoctorID'] = doctorProfile!.doctorID;
body['FirstName'] = "0"; body['FirstName'] = "0";
body['MiddleName'] = "0"; body['MiddleName'] = "0";
body['LastName'] = "0"; body['LastName'] = "0";
@ -54,7 +54,7 @@ class MyReferralInPatientService extends BaseService {
_requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo; _requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo;
_requestAddReferredDoctorRemarks.referredDoctorRemarks = _requestAddReferredDoctorRemarks.referredDoctorRemarks =
referredDoctorRemarks; referredDoctorRemarks;
_requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID; _requestAddReferredDoctorRemarks.editedBy = doctorProfile!.doctorID;
_requestAddReferredDoctorRemarks.patientID = referral.patientID; _requestAddReferredDoctorRemarks.patientID = referral.patientID;
_requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor; _requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor;
await baseAppClient.post( await baseAppClient.post(

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

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

@ -12,15 +12,15 @@ import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_mo
import '../base/lookup-service.dart'; import '../base/lookup-service.dart';
class PatientReferralService extends LookupService { class PatientReferralService extends LookupService {
List<dynamic> projectsList = []; List<dynamic>? projectsList = [];
List<dynamic> clinicsList = []; List<dynamic>? clinicsList = [];
List<ClinicDoctor> doctorsList = List(); List<ClinicDoctor> doctorsList = [];
List<MyReferredPatientModel> listMyReferredPatientModel = []; List<MyReferredPatientModel> listMyReferredPatientModel = [];
List<PendingReferral> pendingReferralList = []; List<PendingReferral> pendingReferralList = [];
List<PendingReferral> patientReferralList = []; List<PendingReferral> patientReferralList = [];
String setupID = "0"; String? setupID = "0";
var frequencyList = []; List<dynamic>? frequencyList = [];
Future getProjectsList() async { Future getProjectsList() async {
hasError = false; hasError = false;
@ -65,7 +65,7 @@ class PatientReferralService extends LookupService {
}, body: body); }, body: body);
} }
Future getProjectInfo(int projectId) async { Future getProjectInfo(int? projectId) async {
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['ProjectID'] = projectId; body['ProjectID'] = projectId;
@ -82,7 +82,7 @@ class PatientReferralService extends LookupService {
); );
} }
Future getClinicsList(int projectId) async { Future getClinicsList(int? projectId) async {
hasError = false; hasError = false;
ClinicByProjectIdRequest _clinicByProjectIdRequest = ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest(); ClinicByProjectIdRequest();
@ -104,7 +104,7 @@ class PatientReferralService extends LookupService {
} }
Future getDoctorsList( Future getDoctorsList(
PatiantInformtion patient, int clinicId, int branchId) async { PatiantInformtion patient, int? clinicId, int? branchId) async {
hasError = false; hasError = false;
DoctorsByClinicIdRequest _doctorsByClinicIdRequest = DoctorsByClinicIdRequest _doctorsByClinicIdRequest =
DoctorsByClinicIdRequest(); DoctorsByClinicIdRequest();
@ -120,7 +120,7 @@ class PatientReferralService extends LookupService {
response['DoctorList'].forEach((v) { response['DoctorList'].forEach((v) {
doctorsList.add(ClinicDoctor.fromJson(v)); doctorsList.add(ClinicDoctor.fromJson(v));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: _doctorsByClinicIdRequest.toJson(), patient: patient); }, body: _doctorsByClinicIdRequest.toJson(), patient: patient);
@ -130,7 +130,7 @@ class PatientReferralService extends LookupService {
hasError = false; hasError = false;
RequestMyReferralPatientModel _requestMyReferralPatient = RequestMyReferralPatientModel _requestMyReferralPatient =
RequestMyReferralPatientModel(); RequestMyReferralPatientModel();
DoctorProfileModel doctorProfile = await getDoctorProfile(); DoctorProfileModel? doctorProfile = await getDoctorProfile();
await baseAppClient.post( await baseAppClient.post(
GET_MY_REFERRED_PATIENT, GET_MY_REFERRED_PATIENT,
@ -159,7 +159,7 @@ class PatientReferralService extends LookupService {
Future getPendingReferralList() async { Future getPendingReferralList() async {
hasError = false; hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile(); DoctorProfileModel doctorProfile = await (getDoctorProfile() as FutureOr<DoctorProfileModel>);
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
// body['ClinicID'] = 0; // body['ClinicID'] = 0;
body['DoctorID'] = doctorProfile.doctorID; body['DoctorID'] = doctorProfile.doctorID;
@ -214,7 +214,7 @@ class PatientReferralService extends LookupService {
Future responseReferral( Future responseReferral(
PendingReferral pendingReferral, bool isAccepted) async { PendingReferral pendingReferral, bool isAccepted) async {
hasError = false; hasError = false;
DoctorProfileModel doctorProfile = await getDoctorProfile(); DoctorProfileModel doctorProfile = await (getDoctorProfile() as FutureOr<DoctorProfileModel>);
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['PatientMRN'] = pendingReferral.patientID; body['PatientMRN'] = pendingReferral.patientID;
@ -240,7 +240,7 @@ class PatientReferralService extends LookupService {
} }
Future makeReferral(PatiantInformtion patient, String isoStringDate, Future makeReferral(PatiantInformtion patient, String isoStringDate,
int projectID, int clinicID, int doctorID, String remarks) async { int? projectID, int? clinicID, int? doctorID, String remarks) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();

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

@ -56,26 +56,26 @@ class PatientService extends BaseService {
List<NoteModel> get patientProgressNoteList => _patientProgressNoteList; List<NoteModel> get patientProgressNoteList => _patientProgressNoteList;
// TODO: replace var with model // TODO: replace var with model
var _insuranceApporvalsList = []; List<dynamic>? _insuranceApporvalsList = [];
get insuranceApporvalsList => _insuranceApporvalsList; get insuranceApporvalsList => _insuranceApporvalsList;
// TODO: replace var with model // TODO: replace var with model
var _doctorsList = []; List<dynamic>? _doctorsList = [];
var _arrivedList = []; List<dynamic>? _arrivedList = [];
get arrivedList => _arrivedList; get arrivedList => _arrivedList;
get doctorsList => _doctorsList; get doctorsList => _doctorsList;
// TODO: replace var with model // TODO: replace var with model
var _clinicsList = []; List<dynamic>? _clinicsList = [];
get clinicsList => _clinicsList; get clinicsList => _clinicsList;
// TODO: replace var with model // TODO: replace var with model
var _referalFrequancyList = []; List<dynamic>? _referalFrequancyList = [];
get referalFrequancyList => _referalFrequancyList; get referalFrequancyList => _referalFrequancyList;
@ -85,7 +85,7 @@ class PatientService extends BaseService {
STPReferralFrequencyRequest(); STPReferralFrequencyRequest();
ClinicByProjectIdRequest _clinicByProjectIdRequest = ClinicByProjectIdRequest _clinicByProjectIdRequest =
ClinicByProjectIdRequest(); ClinicByProjectIdRequest();
ReferToDoctorRequest _referToDoctorRequest; late ReferToDoctorRequest _referToDoctorRequest;
Future<dynamic> getPatientList(patient, patientType, {isView}) async { Future<dynamic> getPatientList(patient, patientType, {isView}) async {
hasError = false; hasError = false;
@ -375,25 +375,26 @@ class PatientService extends BaseService {
// TODO send the total model insted of each parameter // TODO send the total model insted of each parameter
Future referToDoctor( Future referToDoctor(
{String selectedDoctorID, {String? selectedDoctorID,
String selectedClinicID, String? selectedClinicID,
int admissionNo, int? admissionNo,
String extension, String? extension,
String priority, String? priority,
String frequency, String? frequency,
String referringDoctorRemarks, String? referringDoctorRemarks,
int patientID, int? patientID,
int patientTypeID, int? patientTypeID,
String roomID, String? roomID,
int projectID}) async { int? projectID}) async {
hasError = false; hasError = false;
// TODO Change it to use it when we implement authentication user // TODO Change it to use it when we implement authentication user
Map profile = await sharedPref.getObj(DOCTOR_PROFILE); Map profile = await sharedPref.getObj(DOCTOR_PROFILE);
DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile); DoctorProfileModel doctorProfile = new DoctorProfileModel.fromJson(profile as Map<String, dynamic>);
int doctorID = doctorProfile.doctorID; int? doctorID = doctorProfile.doctorID;
int clinicId = doctorProfile.clinicID; int? clinicId = doctorProfile.clinicID;
_referToDoctorRequest = ReferToDoctorRequest( _referToDoctorRequest = ReferToDoctorRequest(
projectID: projectID, projectID: projectID,
tokenID: '',
admissionNo: admissionNo, admissionNo: admissionNo,
roomID: roomID, roomID: roomID,
referralClinic: selectedClinicID.toString(), referralClinic: selectedClinicID.toString(),

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/service/base/lookup-service.dart';
class AdmissionRequestService extends LookupService { class AdmissionRequestService extends LookupService {
List<dynamic> clinicList = []; List<dynamic> clinicList = [];
List<dynamic> doctorsList = []; List<dynamic>? doctorsList = [];
List<dynamic> specialityList = []; List<dynamic> specialityList = [];
List<dynamic> floorList = []; List<dynamic> floorList = [];
List<dynamic> wardList = []; List<dynamic> wardList = [];
@ -29,7 +29,7 @@ class AdmissionRequestService extends LookupService {
}); });
} }
Future getDoctorsList(int clinicId) async { Future getDoctorsList(int? clinicId) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -159,7 +159,7 @@ class AdmissionRequestService extends LookupService {
); );
} }
Future getDietTypesList(int patientMrn) async { Future getDietTypesList(int? patientMrn) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -185,7 +185,7 @@ class AdmissionRequestService extends LookupService {
); );
} }
Future getICDCodes(int patientMrn) async { Future getICDCodes(int? patientMrn) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();

@ -16,14 +16,14 @@ class InsuranceCardService extends BaseService {
_insuranceApprovalInPatientRequestModel = _insuranceApprovalInPatientRequestModel =
InsuranceApprovalInPatientRequestModel(); InsuranceApprovalInPatientRequestModel();
List<InsuranceApprovalModel> _insuranceApproval = List(); List<InsuranceApprovalModel> _insuranceApproval = [];
List<InsuranceApprovalModel> get insuranceApproval => _insuranceApproval; List<InsuranceApprovalModel> get insuranceApproval => _insuranceApproval;
List<InsuranceApprovalInPatientModel> _insuranceApprovalInPatient = List(); List<InsuranceApprovalInPatientModel> _insuranceApprovalInPatient = [];
List<InsuranceApprovalInPatientModel> get insuranceApprovalInPatient => List<InsuranceApprovalInPatientModel> get insuranceApprovalInPatient =>
_insuranceApprovalInPatient; _insuranceApprovalInPatient;
Future getInsuranceApprovalInPatient({int mrn}) async { Future getInsuranceApprovalInPatient({int? mrn}) async {
_insuranceApprovalInPatientRequestModel = _insuranceApprovalInPatientRequestModel =
InsuranceApprovalInPatientRequestModel( InsuranceApprovalInPatientRequestModel(
patientID: mrn, patientID: mrn,
@ -45,8 +45,8 @@ class InsuranceCardService extends BaseService {
}, body: _insuranceApprovalInPatientRequestModel.toJson()); }, body: _insuranceApprovalInPatientRequestModel.toJson());
} }
Future getInsuranceApproval(PatiantInformtion patient, Future getInsuranceApproval(PatiantInformtion? patient,
{int appointmentNo, int projectId}) async { {int? appointmentNo, int? projectId}) async {
hasError = false; hasError = false;
// _cardList.clear(); // _cardList.clear();
// if (appointmentNo != null) { // if (appointmentNo != null) {
@ -67,7 +67,7 @@ class InsuranceCardService extends BaseService {
response['HIS_Approval_List'].forEach((item) { response['HIS_Approval_List'].forEach((item) {
_insuranceApproval.add(InsuranceApprovalModel.fromJson(item)); _insuranceApproval.add(InsuranceApprovalModel.fromJson(item));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: _insuranceApprovalModel.toJson()); }, body: _insuranceApprovalModel.toJson());

@ -10,16 +10,16 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
import '../../base/base_service.dart'; import '../../base/base_service.dart';
class LabsService extends BaseService { class LabsService extends BaseService {
List<PatientLabOrders> patientLabOrdersList = List(); List<PatientLabOrders> patientLabOrdersList = [];
Future getPatientLabOrdersList( Future getPatientLabOrdersList(
PatiantInformtion patient, bool isInpatient) async { PatiantInformtion? patient, bool isInpatient) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
String url = ""; String url = "";
if (isInpatient) { if (isInpatient) {
await getDoctorProfile(); await getDoctorProfile();
body['ProjectID'] = doctorProfile.projectID; body['ProjectID'] = doctorProfile!.projectID;
url = GET_PATIENT_LAB_OREDERS; url = GET_PATIENT_LAB_OREDERS;
} else { } else {
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
@ -40,7 +40,7 @@ class LabsService extends BaseService {
patientLabOrdersList.add(PatientLabOrders.fromJson(hospital)); patientLabOrdersList.add(PatientLabOrders.fromJson(hospital));
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
@ -49,17 +49,17 @@ class LabsService extends BaseService {
RequestPatientLabSpecialResult _requestPatientLabSpecialResult = RequestPatientLabSpecialResult _requestPatientLabSpecialResult =
RequestPatientLabSpecialResult(); RequestPatientLabSpecialResult();
List<PatientLabSpecialResult> patientLabSpecialResult = List(); List<PatientLabSpecialResult> patientLabSpecialResult = [];
List<LabResult> labResultList = List(); List<LabResult> labResultList = [];
List<LabOrderResult> labOrdersResultsList = List(); List<LabOrderResult> labOrdersResultsList = [];
Future getLaboratoryResult( Future getLaboratoryResult(
{String projectID, {String? projectID,
int clinicID, int? clinicID,
String invoiceNo, String? invoiceNo,
String orderNo, String? orderNo,
PatiantInformtion patient, PatiantInformtion? patient,
bool isInpatient = false}) async { bool? isInpatient = false}) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
@ -76,16 +76,16 @@ class LabsService extends BaseService {
response['ListPLSR'].forEach((hospital) { response['ListPLSR'].forEach((hospital) {
patientLabSpecialResult.add(PatientLabSpecialResult.fromJson(hospital)); patientLabSpecialResult.add(PatientLabSpecialResult.fromJson(hospital));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
Future getPatientLabResult( Future getPatientLabResult(
{PatientLabOrders patientLabOrder, {required PatientLabOrders patientLabOrder,
PatiantInformtion patient, PatiantInformtion? patient,
bool isInpatient}) async { required bool isInpatient}) async {
hasError = false; hasError = false;
String url = ""; String url = "";
@ -117,16 +117,16 @@ class LabsService extends BaseService {
labResultList.add(LabResult.fromJson(lab)); labResultList.add(LabResult.fromJson(lab));
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
Future getPatientLabOrdersResults( Future getPatientLabOrdersResults(
{PatientLabOrders patientLabOrder, {PatientLabOrders? patientLabOrder,
String procedure, String? procedure,
PatiantInformtion patient}) async { PatiantInformtion? patient}) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
if (patientLabOrder != null) { if (patientLabOrder != null) {
@ -144,7 +144,7 @@ class LabsService extends BaseService {
response['ListPLR'].forEach((lab) { response['ListPLR'].forEach((lab) {
labOrdersResultsList.add(LabOrderResult.fromJson(lab)); labOrdersResultsList.add(LabOrderResult.fromJson(lab));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
@ -153,7 +153,7 @@ class LabsService extends BaseService {
RequestSendLabReportEmail _requestSendLabReportEmail = RequestSendLabReportEmail _requestSendLabReportEmail =
RequestSendLabReportEmail(); RequestSendLabReportEmail();
Future sendLabReportEmail({PatientLabOrders patientLabOrder}) async { Future sendLabReportEmail({PatientLabOrders? patientLabOrder}) async {
// _requestSendLabReportEmail.projectID = patientLabOrder.projectID; // _requestSendLabReportEmail.projectID = patientLabOrder.projectID;
// _requestSendLabReportEmail.invoiceNo = patientLabOrder.invoiceNo; // _requestSendLabReportEmail.invoiceNo = patientLabOrder.invoiceNo;
// _requestSendLabReportEmail.doctorName = patientLabOrder.doctorName; // _requestSendLabReportEmail.doctorName = patientLabOrder.doctorName;

@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/model/medical_report/medical_file_reques
import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class MedicalFileService extends BaseService { class MedicalFileService extends BaseService {
List<MedicalFileModel> _medicalFileList = List(); List<MedicalFileModel> _medicalFileList = [];
List<MedicalFileModel> get medicalFileList => _medicalFileList; List<MedicalFileModel> get medicalFileList => _medicalFileList;
MedicalFileRequestModel _fileRequestModel = MedicalFileRequestModel( MedicalFileRequestModel _fileRequestModel = MedicalFileRequestModel(
@ -13,7 +13,7 @@ class MedicalFileService extends BaseService {
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMDAyIiwianRpIjoiNDM1MGNjZTYtYzc3MS00YjBiLThiNDItMGZhY2IzYzgxMjQ4IiwiZW1haWwiOiIiLCJpZCI6IjEwMDIiLCJOYW1lIjoiVEVNUCAtIERPQ1RPUiIsIkVtcGxveWVlSWQiOiI0NzA5IiwiRmFjaWxpdHlHcm91cElkIjoiMDEwMjY2IiwiRmFjaWxpdHlJZCI6IjE1IiwiUGhhcmFtY3lGYWNpbGl0eUlkIjoiNTUiLCJJU19QSEFSTUFDWV9DT05ORUNURUQiOiJUcnVlIiwiRG9jdG9ySWQiOiI0NzA5IiwiU0VTU0lPTklEIjoiMjE1OTYwNTQiLCJDbGluaWNJZCI6IjEiLCJyb2xlIjpbIkRPQ1RPUlMiLCJIRUFEIERPQ1RPUlMiLCJBRE1JTklTVFJBVE9SUyIsIlJFQ0VQVElPTklTVCIsIkVSIE5VUlNFIiwiRVIgUkVDRVBUSU9OSVNUIiwiUEhBUk1BQ1kgQUNDT1VOVCBTVEFGRiIsIlBIQVJNQUNZIE5VUlNFIiwiSU5QQVRJRU5UIFBIQVJNQUNJU1QiLCJBRE1JU1NJT04gU1RBRkYiLCJBUFBST1ZBTCBTVEFGRiIsIkNPTlNFTlQgIiwiTUVESUNBTCBSRVBPUlQgLSBTSUNLIExFQVZFIE1BTkFHRVIiXSwibmJmIjoxNjA5MjI1MjMwLCJleHAiOjE2MTAwODkyMzAsImlhdCI6MTYwOTIyNTIzMH0.rs7lTBQ1ON4PbR11PBkOyjf818DdeMKuqz2IrCJMYQU",
); );
Future getMedicalFile({int mrn}) async { Future getMedicalFile({int? mrn}) async {
_fileRequestModel = MedicalFileRequestModel(patientMRN: mrn); _fileRequestModel = MedicalFileRequestModel(patientMRN: mrn);
_fileRequestModel.iPAdress = "9.9.9.9"; _fileRequestModel.iPAdress = "9.9.9.9";
hasError = false; hasError = false;

@ -5,8 +5,8 @@ import 'package:doctor_app_flutter/models/pharmacies/pharmacies_List_request_mod
import 'package:doctor_app_flutter/models/pharmacies/pharmacies_items_request_model.dart'; import 'package:doctor_app_flutter/models/pharmacies/pharmacies_items_request_model.dart';
class MedicineService extends BaseService { class MedicineService extends BaseService {
var _pharmacyItemsList = []; List<dynamic>? _pharmacyItemsList = [];
var _pharmaciesList = []; List<dynamic>? _pharmaciesList = [];
get pharmacyItemsList => _pharmacyItemsList; get pharmacyItemsList => _pharmacyItemsList;
get pharmaciesList => _pharmaciesList; get pharmaciesList => _pharmaciesList;
String searchText=''; String searchText='';
@ -22,7 +22,7 @@ class MedicineService extends BaseService {
await baseAppClient.post( await baseAppClient.post(
PHARMACY_ITEMS_URL, PHARMACY_ITEMS_URL,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_pharmacyItemsList.clear(); _pharmacyItemsList!.clear();
_pharmacyItemsList = response['ListPharmcy_Region_enh']; _pharmacyItemsList = response['ListPharmcy_Region_enh'];
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {
@ -33,12 +33,12 @@ class MedicineService extends BaseService {
); );
} }
Future getPharmaciesList(int itemId) async { Future getPharmaciesList(int? itemId) async {
_listRequestModel.itemID = itemId; _listRequestModel.itemID = itemId;
await baseAppClient.post( await baseAppClient.post(
PHARMACY_LIST_URL, PHARMACY_LIST_URL,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
_pharmaciesList.clear(); _pharmaciesList!.clear();
_pharmaciesList = response['PharmList']; _pharmaciesList = response['PharmList'];
}, },
onFailure: (String error, int statusCode) { onFailure: (String error, int statusCode) {

@ -16,18 +16,18 @@ import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-
import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/util/date-utils.dart';
class PrescriptionService extends LookupService { class PrescriptionService extends LookupService {
List<PrescriptionModel> _prescriptionList = List(); List<PrescriptionModel> _prescriptionList = [];
List<PrescriptionModel> get prescriptionList => _prescriptionList; List<PrescriptionModel> get prescriptionList => _prescriptionList;
List<SearchDrugModel> _drugsList = List(); List<SearchDrugModel> _drugsList = [];
List<SearchDrugModel> get drugsList => _drugsList; List<SearchDrugModel> get drugsList => _drugsList;
List<dynamic> doctorsList = []; List<dynamic>? doctorsList = [];
List<GetMedicationResponseModel> allMedicationList = []; List<GetMedicationResponseModel> allMedicationList = [];
List<dynamic> specialityList = []; List<dynamic> specialityList = [];
List<dynamic> drugToDrug = []; List<dynamic>? drugToDrug = [];
List<dynamic> get drugToDrugList => drugToDrug; List<dynamic>? get drugToDrugList => drugToDrug;
List<dynamic> itemMedicineList = []; List<dynamic>? itemMedicineList = [];
List<dynamic> itemMedicineListRoute = []; List<dynamic>? itemMedicineListRoute = [];
List<dynamic> itemMedicineListUnit = []; List<dynamic>? itemMedicineListUnit = [];
dynamic boxQuantity; dynamic boxQuantity;
PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel(); PrescriptionReqModel _prescriptionReqModel = PrescriptionReqModel();
@ -44,7 +44,7 @@ class PrescriptionService extends LookupService {
PostPrescriptionReqModel _postPrescriptionReqModel = PostPrescriptionReqModel _postPrescriptionReqModel =
PostPrescriptionReqModel(); PostPrescriptionReqModel();
Future getItem({int itemID}) async { Future getItem({int? itemID}) async {
_itemByMedicineRequestModel = _itemByMedicineRequestModel =
ItemByMedicineRequestModel(medicineCode: itemID); ItemByMedicineRequestModel(medicineCode: itemID);
@ -78,7 +78,7 @@ class PrescriptionService extends LookupService {
}, body: getAssessmentReqModel.toJson()); }, body: getAssessmentReqModel.toJson());
} }
Future getPrescription({int mrn}) async { Future getPrescription({int? mrn}) async {
_prescriptionReqModel = PrescriptionReqModel( _prescriptionReqModel = PrescriptionReqModel(
patientMRN: mrn, patientMRN: mrn,
); );
@ -94,7 +94,7 @@ class PrescriptionService extends LookupService {
}, body: _prescriptionReqModel.toJson()); }, body: _prescriptionReqModel.toJson());
} }
Future getDrugs({String drugName}) async { Future getDrugs({String? drugName}) async {
_drugRequestModel = SearchDrugRequestModel(search: [drugName]); _drugRequestModel = SearchDrugRequestModel(search: [drugName]);
hasError = false; hasError = false;
@ -109,7 +109,7 @@ class PrescriptionService extends LookupService {
}, body: _drugRequestModel.toJson()); }, body: _drugRequestModel.toJson());
} }
Future getMedicationList({String drug = ''}) async { Future getMedicationList({String? drug = ''}) async {
hasError = false; hasError = false;
_drugRequestModel.search = ["$drug"]; _drugRequestModel.search = ["$drug"];
await baseAppClient.post(SEARCH_DRUG, await baseAppClient.post(SEARCH_DRUG,
@ -159,7 +159,7 @@ class PrescriptionService extends LookupService {
} }
Future getDrugToDrug( Future getDrugToDrug(
VitalSignData vital, VitalSignData? vital,
List<GetAssessmentResModel> lstAssessments, List<GetAssessmentResModel> lstAssessments,
List<GetAllergiesResModel> allergy, List<GetAllergiesResModel> allergy,
PatiantInformtion patient, PatiantInformtion patient,
@ -243,7 +243,7 @@ class PrescriptionService extends LookupService {
} }
Future calculateBoxQuantity( Future calculateBoxQuantity(
{int freq, int duration, int itemCode, double strength}) async { {int? freq, int? duration, int? itemCode, double? strength}) async {
_boxQuantityRequestModel = CalculateBoxQuantityRequestModel( _boxQuantityRequestModel = CalculateBoxQuantityRequestModel(
frequency: freq, frequency: freq,
duration: duration, duration: duration,

@ -15,14 +15,14 @@ import 'package:flutter/cupertino.dart';
import '../../base/base_service.dart'; import '../../base/base_service.dart';
class PrescriptionsService extends BaseService { class PrescriptionsService extends BaseService {
List<Prescriptions> prescriptionsList = List(); List<Prescriptions> prescriptionsList = [];
List<PrescriptionsOrder> prescriptionsOrderList = List(); List<PrescriptionsOrder> prescriptionsOrderList = [];
List<PrescriotionInPatient> prescriptionInPatientList = List(); List<PrescriotionInPatient> prescriptionInPatientList = [];
InPatientPrescriptionRequestModel _inPatientPrescriptionRequestModel = InPatientPrescriptionRequestModel _inPatientPrescriptionRequestModel =
InPatientPrescriptionRequestModel(); InPatientPrescriptionRequestModel();
Future getPrescriptionInPatient({int mrn, String adn}) async { Future getPrescriptionInPatient({int? mrn, String? adn}) async {
_inPatientPrescriptionRequestModel = InPatientPrescriptionRequestModel( _inPatientPrescriptionRequestModel = InPatientPrescriptionRequestModel(
patientMRN: mrn, patientMRN: mrn,
admissionNo: adn, admissionNo: adn,
@ -43,7 +43,7 @@ class PrescriptionsService extends BaseService {
}, body: _inPatientPrescriptionRequestModel.toJson()); }, body: _inPatientPrescriptionRequestModel.toJson());
} }
Future getPrescriptions(PatiantInformtion patient) async { Future getPrescriptions(PatiantInformtion? patient) async {
hasError = false; hasError = false;
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
body['isDentalAllowedBackend'] = false; body['isDentalAllowedBackend'] = false;
@ -53,7 +53,7 @@ class PrescriptionsService extends BaseService {
response['PatientPrescriptionList'].forEach((prescriptions) { response['PatientPrescriptionList'].forEach((prescriptions) {
prescriptionsList.add(Prescriptions.fromJson(prescriptions)); prescriptionsList.add(Prescriptions.fromJson(prescriptions));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
@ -62,11 +62,11 @@ class PrescriptionsService extends BaseService {
RequestPrescriptionReport _requestPrescriptionReport = RequestPrescriptionReport _requestPrescriptionReport =
RequestPrescriptionReport( RequestPrescriptionReport(
appointmentNo: 0, isDentalAllowedBackend: false); appointmentNo: 0, isDentalAllowedBackend: false);
List<PrescriptionReport> prescriptionReportList = List(); List<PrescriptionReport> prescriptionReportList = [];
Future getPrescriptionReport( Future getPrescriptionReport(
{Prescriptions prescriptions, {required Prescriptions prescriptions,
@required PatiantInformtion patient}) async { required PatiantInformtion? patient}) async {
hasError = false; hasError = false;
_requestPrescriptionReport.dischargeNo = prescriptions.dischargeNo; _requestPrescriptionReport.dischargeNo = prescriptions.dischargeNo;
_requestPrescriptionReport.projectID = prescriptions.projectID; _requestPrescriptionReport.projectID = prescriptions.projectID;
@ -76,13 +76,13 @@ class PrescriptionsService extends BaseService {
_requestPrescriptionReport.appointmentNo = prescriptions.appointmentNo; _requestPrescriptionReport.appointmentNo = prescriptions.appointmentNo;
await baseAppClient.postPatient( await baseAppClient.postPatient(
prescriptions.isInOutPatient prescriptions.isInOutPatient!
? GET_PRESCRIPTION_REPORT_ENH ? GET_PRESCRIPTION_REPORT_ENH
: GET_PRESCRIPTION_REPORT_NEW, : GET_PRESCRIPTION_REPORT_NEW,
patient: patient, onSuccess: (dynamic response, int statusCode) { patient: patient, onSuccess: (dynamic response, int statusCode) {
prescriptionReportList.clear(); prescriptionReportList.clear();
prescriptionReportEnhList.clear(); prescriptionReportEnhList.clear();
if (prescriptions.isInOutPatient) { if (prescriptions.isInOutPatient!) {
response['ListPRM'].forEach((prescriptions) { response['ListPRM'].forEach((prescriptions) {
prescriptionReportList prescriptionReportList
.add(PrescriptionReport.fromJson(prescriptions)); .add(PrescriptionReport.fromJson(prescriptions));
@ -95,7 +95,7 @@ class PrescriptionsService extends BaseService {
.add(PrescriptionReport.fromJson(prescriptions)); .add(PrescriptionReport.fromJson(prescriptions));
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: _requestPrescriptionReport.toJson()); }, body: _requestPrescriptionReport.toJson());
@ -108,10 +108,10 @@ class PrescriptionsService extends BaseService {
longitude: 0, longitude: 0,
isDentalAllowedBackend: false, isDentalAllowedBackend: false,
); );
List<PharmacyPrescriptions> pharmacyPrescriptionsList = List(); List<PharmacyPrescriptions> pharmacyPrescriptionsList = [];
Future getListPharmacyForPrescriptions( Future getListPharmacyForPrescriptions(
{int itemId, @required PatiantInformtion patient}) async { {int? itemId, required PatiantInformtion patient}) async {
hasError = false; hasError = false;
requestGetListPharmacyForPrescriptions.itemID = itemId; requestGetListPharmacyForPrescriptions.itemID = itemId;
await baseAppClient.postPatient(GET_PHARMACY_LIST, patient: patient, await baseAppClient.postPatient(GET_PHARMACY_LIST, patient: patient,
@ -121,7 +121,7 @@ class PrescriptionsService extends BaseService {
pharmacyPrescriptionsList pharmacyPrescriptionsList
.add(PharmacyPrescriptions.fromJson(prescriptions)); .add(PharmacyPrescriptions.fromJson(prescriptions));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: requestGetListPharmacyForPrescriptions.toJson()); }, body: requestGetListPharmacyForPrescriptions.toJson());
@ -132,15 +132,15 @@ class PrescriptionsService extends BaseService {
isDentalAllowedBackend: false, isDentalAllowedBackend: false,
); );
List<PrescriptionReportEnh> prescriptionReportEnhList = List(); List<PrescriptionReportEnh> prescriptionReportEnhList = [];
Future getPrescriptionReportEnh( Future getPrescriptionReportEnh(
{PrescriptionsOrder prescriptionsOrder, {PrescriptionsOrder? prescriptionsOrder,
@required PatiantInformtion patient}) async { required PatiantInformtion patient}) async {
///This logic copy from the old app from class [order-history.component.ts] in line 45 ///This logic copy from the old app from class [order-history.component.ts] in line 45
bool isInPatient = false; bool? isInPatient = false;
prescriptionsList.forEach((element) { prescriptionsList.forEach((element) {
if (prescriptionsOrder.appointmentNo == "0") { if (prescriptionsOrder!.appointmentNo == "0") {
if (element.dischargeNo == int.parse(prescriptionsOrder.dischargeID)) { if (element.dischargeNo == int.parse(prescriptionsOrder.dischargeID)) {
_requestPrescriptionReportEnh.appointmentNo = element.appointmentNo; _requestPrescriptionReportEnh.appointmentNo = element.appointmentNo;
_requestPrescriptionReportEnh.clinicID = element.clinicID; _requestPrescriptionReportEnh.clinicID = element.clinicID;
@ -169,11 +169,11 @@ class PrescriptionsService extends BaseService {
hasError = false; hasError = false;
await baseAppClient.postPatient( await baseAppClient.postPatient(
isInPatient ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW, isInPatient! ? GET_PRESCRIPTION_REPORT_ENH : GET_PRESCRIPTION_REPORT_NEW,
patient: patient, onSuccess: (dynamic response, int statusCode) { patient: patient, onSuccess: (dynamic response, int statusCode) {
prescriptionReportEnhList.clear(); prescriptionReportEnhList.clear();
if (isInPatient) { if (isInPatient!) {
response['ListPRM'].forEach((prescriptions) { response['ListPRM'].forEach((prescriptions) {
prescriptionReportEnhList prescriptionReportEnhList
.add(PrescriptionReportEnh.fromJson(prescriptions)); .add(PrescriptionReportEnh.fromJson(prescriptions));
@ -186,7 +186,7 @@ class PrescriptionsService extends BaseService {
prescriptionReportEnhList.add(reportEnh); prescriptionReportEnhList.add(reportEnh);
}); });
} }
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: _requestPrescriptionReportEnh.toJson()); }, body: _requestPrescriptionReportEnh.toJson());

@ -10,14 +10,14 @@ import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request
import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart';
class ProcedureService extends BaseService { class ProcedureService extends BaseService {
List<GetOrderedProcedureModel> _procedureList = List(); List<GetOrderedProcedureModel> _procedureList = [];
List<GetOrderedProcedureModel> get procedureList => _procedureList; List<GetOrderedProcedureModel> get procedureList => _procedureList;
List<ProcedureValadteModel> _valadteProcedureList = List(); List<ProcedureValadteModel> _valadteProcedureList = [];
List<ProcedureValadteModel> get valadteProcedureList => _valadteProcedureList; List<ProcedureValadteModel> get valadteProcedureList => _valadteProcedureList;
List<CategoriseProcedureModel> _categoriesList = List(); List<CategoriseProcedureModel> _categoriesList = [];
List<CategoriseProcedureModel> get categoriesList => _categoriesList; List<CategoriseProcedureModel> get categoriesList => _categoriesList;
List<Procedures> procedureslist = List(); List<Procedures> procedureslist = [];
List<dynamic> categoryList = []; List<dynamic>? categoryList = [];
GetOrderedProcedureRequestModel _getOrderedProcedureRequestModel = GetOrderedProcedureRequestModel _getOrderedProcedureRequestModel =
GetOrderedProcedureRequestModel(); GetOrderedProcedureRequestModel();
@ -46,7 +46,7 @@ class ProcedureService extends BaseService {
//search: ["DENTAL"], //search: ["DENTAL"],
); );
Future getProcedure({int mrn}) async { Future getProcedure({int? mrn}) async {
_getOrderedProcedureRequestModel = _getOrderedProcedureRequestModel =
GetOrderedProcedureRequestModel(patientMRN: mrn); GetOrderedProcedureRequestModel(patientMRN: mrn);
hasError = false; hasError = false;
@ -74,7 +74,7 @@ class ProcedureService extends BaseService {
}, body: Map()); }, body: Map());
} }
Future getProcedureCategory({String categoryName, String categoryID}) async { Future getProcedureCategory({String? categoryName, String? categoryID}) async {
_getProcedureCategoriseReqModel = GetProcedureReqModel( _getProcedureCategoriseReqModel = GetProcedureReqModel(
search: ["$categoryName"], search: ["$categoryName"],
patientMRN: 0, patientMRN: 0,

@ -6,14 +6,14 @@ import 'package:flutter/cupertino.dart';
import '../../base/base_service.dart'; import '../../base/base_service.dart';
class RadiologyService extends BaseService { class RadiologyService extends BaseService {
List<FinalRadiology> finalRadiologyList = List(); List<FinalRadiology> finalRadiologyList = [];
String url = ''; String? url = '';
Future getRadImageURL( Future getRadImageURL(
{int invoiceNo, {int? invoiceNo,
int lineItem, int? lineItem,
int projectId, int? projectId,
@required PatiantInformtion patient}) async { required PatiantInformtion? patient}) async {
hasError = false; hasError = false;
final Map<String, dynamic> body = new Map<String, dynamic>(); final Map<String, dynamic> body = new Map<String, dynamic>();
body['InvoiceNo'] = invoiceNo; body['InvoiceNo'] = invoiceNo;
@ -23,19 +23,19 @@ class RadiologyService extends BaseService {
await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient, await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
url = response['Data']; url = response['Data'];
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
Future getPatientRadOrders(PatiantInformtion patient, Future getPatientRadOrders(PatiantInformtion? patient,
{isInPatient = false}) async { {isInPatient = false}) async {
String url = GET_PATIENT_ORDERS; String url = GET_PATIENT_ORDERS;
final Map<String, dynamic> body = new Map<String, dynamic>(); final Map<String, dynamic> body = new Map<String, dynamic>();
if (isInPatient) { if (isInPatient) {
url = GET_IN_PATIENT_ORDERS; url = GET_IN_PATIENT_ORDERS;
body['ProjectID'] = patient.projectId; body['ProjectID'] = patient!.projectId;
} }
hasError = false; hasError = false;
@ -49,7 +49,7 @@ class RadiologyService extends BaseService {
response[label].forEach((radiology) { response[label].forEach((radiology) {
finalRadiologyList.add(FinalRadiology.fromJson(radiology)); finalRadiologyList.add(FinalRadiology.fromJson(radiology));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, body: body); }, body: body);

@ -9,17 +9,17 @@ import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.d
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
class SickLeaveService extends BaseService { class SickLeaveService extends BaseService {
Map get sickLeavestatisitics => _statistics; Map? get sickLeavestatisitics => _statistics;
Map _statistics = {}; Map? _statistics = {};
List get getOffTimeList => offTime; List get getOffTimeList => offTime;
List offTime = []; List offTime = [];
List get getReasons => reasonse; List? get getReasons => reasonse;
List reasonse = []; List? reasonse = [];
List<GetAllSickLeaveResponse> get getAllSickLeave => _getAllsickLeave; List<GetAllSickLeaveResponse> get getAllSickLeave => _getAllsickLeave;
List<GetAllSickLeaveResponse> _getAllsickLeave = List(); List<GetAllSickLeaveResponse> _getAllsickLeave = [];
List get coveringDoctorsList => _coveringDoctors; List? get coveringDoctorsList => _coveringDoctors;
List _coveringDoctors = []; List? _coveringDoctors = [];
List<GetRescheduleLeavesResponse> get getAllRescheduleLeave => List<GetRescheduleLeavesResponse> get getAllRescheduleLeave =>
_getReScheduleLeave; _getReScheduleLeave;
@ -30,7 +30,7 @@ class SickLeaveService extends BaseService {
dynamic get sickLeaveResponse => _sickLeaveResponse; dynamic get sickLeaveResponse => _sickLeaveResponse;
dynamic _sickLeaveResponse; dynamic _sickLeaveResponse;
List<SickLeavePatientModel> getAllSickLeavePatient = List(); List<SickLeavePatientModel> getAllSickLeavePatient = [];
SickLeavePatientRequestModel _sickLeavePatientRequestModel = SickLeavePatientRequestModel _sickLeavePatientRequestModel =
SickLeavePatientRequestModel(); SickLeavePatientRequestModel();
@ -97,6 +97,7 @@ class SickLeaveService extends BaseService {
hasError = false; hasError = false;
getAllSickLeavePatient = []; getAllSickLeavePatient = [];
await baseAppClient.postPatient( await baseAppClient.postPatient(
GET_SICK_LEAVE, GET_SICK_LEAVE,
onSuccess: (dynamic response, int statusCode) { onSuccess: (dynamic response, int statusCode) {
// Future.value(response); // Future.value(response);
@ -105,11 +106,12 @@ class SickLeaveService extends BaseService {
getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v)); getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, },
body: {'PatientMRN': patientMRN, "Status": 0}, body: {'PatientMRN': patientMRN, "Status": 0},
patient:null
); );
} }
@ -128,11 +130,12 @@ class SickLeaveService extends BaseService {
getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v)); getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v));
}); });
}, },
onFailure: (String error, int statusCode) { onFailure: (String? error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
}, },
body: _sickLeavePatientRequestModel.toJson(), body: _sickLeavePatientRequestModel.toJson(),
patient:null
); );
} }
@ -147,8 +150,8 @@ class SickLeaveService extends BaseService {
_getReScheduleLeave.add(GetRescheduleLeavesResponse.fromJson(v)); _getReScheduleLeave.add(GetRescheduleLeavesResponse.fromJson(v));
}); });
_getReScheduleLeave.sort((a, b) { _getReScheduleLeave.sort((a, b) {
var adate = a.dateTimeFrom; //before -> var adate = a.date; var adate = a.dateTimeFrom!; //before -> var adate = a.date;
var bdate = b.dateTimeFrom; //var bdate = b.date; var bdate = b.dateTimeFrom!; //var bdate = b.date;
return -adate.compareTo(bdate); return -adate.compareTo(bdate);
}); });
}, },

@ -32,7 +32,7 @@ class SOAPService extends LookupService {
List<GetPatientProgressNoteResModel> patientProgressNoteList = []; List<GetPatientProgressNoteResModel> patientProgressNoteList = [];
List<GetAssessmentResModel> patientAssessmentList = []; List<GetAssessmentResModel> patientAssessmentList = [];
int episodeID; int? episodeID;
Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
await baseAppClient.post( await baseAppClient.post(
GET_ALLERGIES, GET_ALLERGIES,

@ -12,7 +12,7 @@ class UcafService extends LookupService {
List<VitalSignHistory> patientVitalSignsHistory = []; List<VitalSignHistory> patientVitalSignsHistory = [];
List<GetAssessmentResModel> patientAssessmentList = []; List<GetAssessmentResModel> patientAssessmentList = [];
List<OrderProcedure> orderProcedureList = []; List<OrderProcedure> orderProcedureList = [];
PrescriptionModel prescriptionList; PrescriptionModel? prescriptionList;
Future getPatientChiefComplaint(PatiantInformtion patient) async { Future getPatientChiefComplaint(PatiantInformtion patient) async {
hasError = false; hasError = false;

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

Loading…
Cancel
Save