diff --git a/lib/core/viewModel/DischargedPatientViewModel.dart b/lib/core/viewModel/DischargedPatientViewModel.dart index 9df347e2..f8e30851 100644 --- a/lib/core/viewModel/DischargedPatientViewModel.dart +++ b/lib/core/viewModel/DischargedPatientViewModel.dart @@ -42,7 +42,7 @@ class DischargedPatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _dischargedPatientService.getDischargedPatient(); if (_dischargedPatientService.hasError) { - error = _dischargedPatientService.error; + error = _dischargedPatientService.error!; setState(ViewState.Error); } else { filterData = myDischargedPatient; @@ -54,7 +54,7 @@ class DischargedPatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _dischargedPatientService.gtMyDischargeReferralPatient(); if (_dischargedPatientService.hasError) { - error = _dischargedPatientService.error; + error = _dischargedPatientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/InsuranceViewModel.dart b/lib/core/viewModel/InsuranceViewModel.dart index 46f48d35..edc57abd 100644 --- a/lib/core/viewModel/InsuranceViewModel.dart +++ b/lib/core/viewModel/InsuranceViewModel.dart @@ -16,12 +16,12 @@ class InsuranceViewModel extends BaseViewModel { _insuranceCardService.insuranceApprovalInPatient; Future getInsuranceApproval(PatiantInformtion patient, - {int appointmentNo, int projectId}) async { + {int ? appointmentNo, int? projectId}) async { error = ""; setState(ViewState.Busy); if (appointmentNo != null) await _insuranceCardService.getInsuranceApproval(patient, - appointmentNo: appointmentNo, projectId: projectId); + appointmentNo: appointmentNo, projectId: projectId!); else await _insuranceCardService.getInsuranceApproval(patient); if (_insuranceCardService.hasError) { @@ -31,13 +31,13 @@ class InsuranceViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getInsuranceInPatient({int mrn}) async { + Future getInsuranceInPatient({required int mrn}) async { //hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _insuranceCardService.getInsuranceApprovalInPatient(mrn: mrn); if (_insuranceCardService.hasError) { - error = _insuranceCardService.error; + error = _insuranceCardService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/LiveCarePatientViewModel.dart b/lib/core/viewModel/LiveCarePatientViewModel.dart index 844ebf55..1899028a 100644 --- a/lib/core/viewModel/LiveCarePatientViewModel.dart +++ b/lib/core/viewModel/LiveCarePatientViewModel.dart @@ -35,7 +35,7 @@ class LiveCarePatientViewModel extends BaseViewModel { await _liveCarePatientServices.getPendingPatientERForDoctorApp( pendingPatientERForDoctorAppRequestModel); if (_liveCarePatientServices.hasError) { - error = _liveCarePatientServices.error; + error = _liveCarePatientServices.error!; setState(ViewState.ErrorLocal); } else { @@ -47,7 +47,7 @@ class LiveCarePatientViewModel extends BaseViewModel { Future endCall(int vCID, bool isPatient) async { await getDoctorProfile(isGetProfile: true); EndCallReq endCallReq = new EndCallReq(); - endCallReq.doctorId = doctorProfile.doctorID; + endCallReq.doctorId = doctorProfile!.doctorID; endCallReq.generalid = 'Cs2020@2016\$2958'; endCallReq.vCID = vCID; endCallReq.isDestroy = isPatient; @@ -55,7 +55,7 @@ class LiveCarePatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _liveCarePatientServices.endCall(endCallReq); if (_liveCarePatientServices.hasError) { - error = _liveCarePatientServices.error; + error = _liveCarePatientServices.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -67,24 +67,24 @@ class LiveCarePatientViewModel extends BaseViewModel { return token; } - Future startCall({int vCID, bool isReCall}) async { + Future startCall({required int vCID, required bool isReCall}) async { StartCallReq startCallReq = new StartCallReq(); await getDoctorProfile(); - startCallReq.clinicId = super.doctorProfile.clinicID; + startCallReq.clinicId = super.doctorProfile!.clinicID; startCallReq.vCID = vCID; //["VC_ID"]; startCallReq.isrecall = isReCall; - startCallReq.doctorId = doctorProfile.doctorID; + startCallReq.doctorId = doctorProfile!.doctorID; startCallReq.isOutKsa = false; //["IsOutKSA"]; - startCallReq.projectName = doctorProfile.projectName; - startCallReq.docotrName = doctorProfile.doctorName; - startCallReq.clincName = doctorProfile.clinicDescription; - startCallReq.docSpec = doctorProfile.doctorTitleForProfile; + startCallReq.projectName = doctorProfile!.projectName; + startCallReq.docotrName = doctorProfile!.doctorName; + startCallReq.clincName = doctorProfile!.clinicDescription; + startCallReq.docSpec = doctorProfile!.doctorTitleForProfile; startCallReq.generalid = 'Cs2020@2016\$2958'; setState(ViewState.BusyLocal); await _liveCarePatientServices.startCall(startCallReq); if (_liveCarePatientServices.hasError) { - error = _liveCarePatientServices.error; + error = _liveCarePatientServices.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -95,7 +95,7 @@ class LiveCarePatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _liveCarePatientServices.endCallWithCharge(vcID); if (_liveCarePatientServices.hasError) { - error = _liveCarePatientServices.error; + error = _liveCarePatientServices.error!; setState(ViewState.ErrorLocal); } else { await getPendingPatientERForDoctorApp(); @@ -107,7 +107,7 @@ class LiveCarePatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _liveCarePatientServices.transferToAdmin(vcID, notes); if (_liveCarePatientServices.hasError) { - error = _liveCarePatientServices.error; + error = _liveCarePatientServices.error!; setState(ViewState.ErrorLocal); } else { await getPendingPatientERForDoctorApp(); diff --git a/lib/core/viewModel/PatientMedicalReportViewModel.dart b/lib/core/viewModel/PatientMedicalReportViewModel.dart index 999a0530..4a9045be 100644 --- a/lib/core/viewModel/PatientMedicalReportViewModel.dart +++ b/lib/core/viewModel/PatientMedicalReportViewModel.dart @@ -19,7 +19,7 @@ class PatientMedicalReportViewModel extends BaseViewModel { setState(ViewState.Busy); await _service.getMedicalReportList(patient); if (_service.hasError) { - error = _service.error; + error = _service.error!; setState(ViewState.ErrorLocal); // ViewState.Error } else setState(ViewState.Idle); @@ -29,7 +29,7 @@ class PatientMedicalReportViewModel extends BaseViewModel { setState(ViewState.Busy); await _service.getMedicalReportTemplate(); if (_service.hasError) { - error = _service.error; + error = _service.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -39,7 +39,7 @@ class PatientMedicalReportViewModel extends BaseViewModel { setState(ViewState.Busy); await _service.insertMedicalReport(patient, htmlText); if (_service.hasError) { - error = _service.error; + error = _service.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -50,7 +50,7 @@ class PatientMedicalReportViewModel extends BaseViewModel { setState(ViewState.Busy); await _service.verifyMedicalReport(patient, medicalReport); if (_service.hasError) { - error = _service.error; + error = _service.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart index a5028266..c547b150 100644 --- a/lib/core/viewModel/authentication_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -59,12 +59,12 @@ class AuthenticationViewModel extends BaseViewModel { get checkActivationCodeForDoctorAppRes => _authService.checkActivationCodeForDoctorAppRes; - NewLoginInformationModel loggedUser; - GetIMEIDetailsModel user; + late NewLoginInformationModel loggedUser; + late GetIMEIDetailsModel ? user; UserModel userInfo = UserModel(); final LocalAuthentication auth = LocalAuthentication(); - List _availableBiometrics; + late List _availableBiometrics; final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance; bool isLogin = false; @@ -72,7 +72,7 @@ class AuthenticationViewModel extends BaseViewModel { bool isFromLogin = false; APP_STATUS app_status = APP_STATUS.LOADING; - AuthenticationViewModel({bool checkDeviceInfo = false}) { + AuthenticationViewModel() { getDeviceInfoFromFirebase(); getDoctorProfile(); } @@ -82,7 +82,7 @@ class AuthenticationViewModel extends BaseViewModel { setState(ViewState.Busy); await _authService.selectDeviceImei(imei); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -121,7 +121,7 @@ class AuthenticationViewModel extends BaseViewModel { await _authService.insertDeviceImei(insertIMEIDetailsModel); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -133,14 +133,14 @@ class AuthenticationViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _authService.login(userInfo); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else { sharedPref.setInt(PROJECT_ID, userInfo.projectID); loggedUser = loginInfo; saveObjToString(LOGGED_IN_USER, loginInfo); sharedPref.remove(LAST_LOGIN_USER); - sharedPref.setString(TOKEN, loginInfo.logInTokenID); + sharedPref.setString(TOKEN, loginInfo.logInTokenID!); setState(ViewState.Idle); } } @@ -150,37 +150,37 @@ class AuthenticationViewModel extends BaseViewModel { setState(ViewState.BusyLocal); ActivationCodeForVerificationScreenModel activationCodeModel = ActivationCodeForVerificationScreenModel( - iMEI: user.iMEI, - facilityId: user.projectID, - memberID: user.doctorID, - zipCode: user.outSA == true ? '971' : '966', - mobileNumber: user.mobile, + iMEI: user!.iMEI, + facilityId: user!.projectID, + memberID: user!.doctorID, + zipCode: user!.outSA == true ? '971' : '966', + mobileNumber: user!.mobile, oTPSendType: authMethodType.getTypeIdService(), isMobileFingerPrint: 1, - vidaAuthTokenID: user.vidaAuthTokenID, - vidaRefreshTokenID: user.vidaRefreshTokenID); + vidaAuthTokenID: user!.vidaAuthTokenID, + vidaRefreshTokenID: user!.vidaRefreshTokenID); await _authService.sendActivationCodeVerificationScreen(activationCodeModel); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); } /// send activation code for silent login - Future sendActivationCodeForDoctorApp({AuthMethodTypes authMethodType, String password }) async { + Future sendActivationCodeForDoctorApp({required AuthMethodTypes authMethodType, required String password }) async { setState(ViewState.BusyLocal); int projectID = await sharedPref.getInt(PROJECT_ID); ActivationCodeModel activationCodeModel = ActivationCodeModel( facilityId: projectID, - memberID: loggedUser.listMemberInformation[0].memberID, + memberID: loggedUser.listMemberInformation![0].memberID, zipCode: loggedUser.zipCode, mobileNumber: loggedUser.mobileNumber, otpSendType: authMethodType.getTypeIdService().toString(), password: password); await _authService.sendActivationCodeForDoctorApp(activationCodeModel); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -188,24 +188,24 @@ class AuthenticationViewModel extends BaseViewModel { /// check activation code for sms and whats app - Future checkActivationCodeForDoctorApp({String activationCode}) async { + Future checkActivationCodeForDoctorApp({required String activationCode}) async { setState(ViewState.BusyLocal); CheckActivationCodeRequestModel checkActivationCodeForDoctorApp = new CheckActivationCodeRequestModel( zipCode: - loggedUser != null ? loggedUser.zipCode :user.zipCode, + loggedUser != null ? loggedUser.zipCode :user!.zipCode, mobileNumber: - loggedUser != null ? loggedUser.mobileNumber : user.mobile, + loggedUser != null ? loggedUser.mobileNumber : user!.mobile, projectID: await sharedPref.getInt(PROJECT_ID) != null ? await sharedPref.getInt(PROJECT_ID) - : user.projectID, + : user!.projectID, logInTokenID: await sharedPref.getString(LOGIN_TOKEN_ID), activationCode: activationCode ?? '0000', oTPSendType: await sharedPref.getInt(OTP_TYPE), generalid: "Cs2020@2016\$2958"); await _authService.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -218,7 +218,7 @@ class AuthenticationViewModel extends BaseViewModel { getHospitalsRequestModel.memberID = memberID; await _hospitalsService.getHospitals(getHospitalsRequestModel); if (_hospitalsService.hasError) { - error = _hospitalsService.error; + error = _hospitalsService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -255,13 +255,13 @@ class AuthenticationViewModel extends BaseViewModel { /// add  token to shared preferences in case of send activation code is success setDataAfterSendActivationSuccess(SendActivationCodeForDoctorAppResponseModel sendActivationCodeForDoctorAppResponseModel) { print("VerificationCode : " + - sendActivationCodeForDoctorAppResponseModel.verificationCode); + sendActivationCodeForDoctorAppResponseModel.verificationCode!); sharedPref.setString(VIDA_AUTH_TOKEN_ID, - sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID); + sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID!); sharedPref.setString(VIDA_REFRESH_TOKEN_ID, - sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID); + sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID!); sharedPref.setString(LOGIN_TOKEN_ID, - sendActivationCodeForDoctorAppResponseModel.logInTokenID); + sendActivationCodeForDoctorAppResponseModel.logInTokenID!); } saveObjToString(String key, value) async { @@ -303,7 +303,7 @@ class AuthenticationViewModel extends BaseViewModel { languageID: 2);//TODO change the lan await _authService.getDoctorProfileBasedOnClinic(docInfo); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else { localSetDoctorProfile(doctorProfilesList.first); @@ -315,18 +315,18 @@ class AuthenticationViewModel extends BaseViewModel { onCheckActivationCodeSuccess() async { sharedPref.setString( TOKEN, - checkActivationCodeForDoctorAppRes.authenticationTokenID); + checkActivationCodeForDoctorAppRes.authenticationTokenID!); if (checkActivationCodeForDoctorAppRes.listDoctorProfile != null && - checkActivationCodeForDoctorAppRes.listDoctorProfile + checkActivationCodeForDoctorAppRes.listDoctorProfile! .isNotEmpty) { localSetDoctorProfile( - checkActivationCodeForDoctorAppRes.listDoctorProfile[0]); + checkActivationCodeForDoctorAppRes.listDoctorProfile![0]); } else { sharedPref.setObj( CLINIC_NAME, checkActivationCodeForDoctorAppRes.listDoctorsClinic); ClinicModel clinic = ClinicModel.fromJson( - checkActivationCodeForDoctorAppRes.listDoctorsClinic[0] + checkActivationCodeForDoctorAppRes.listDoctorsClinic![0] .toJson()); await getDoctorProfileBasedOnClinic(clinic); } @@ -336,10 +336,8 @@ class AuthenticationViewModel extends BaseViewModel { Future checkIfBiometricAvailable(BiometricType biometricType) async { bool isAvailable = false; await _getAvailableBiometrics(); - if (_availableBiometrics != null) { - for (var i = 0; i < _availableBiometrics.length; i++) { - if (biometricType == _availableBiometrics[i]) isAvailable = true; - } + for (var i = 0; i < _availableBiometrics.length; i++) { + if (biometricType == _availableBiometrics[i]) isAvailable = true; } return isAvailable; } @@ -367,11 +365,11 @@ class AuthenticationViewModel extends BaseViewModel { } var token = await _firebaseMessaging.getToken(); if (DEVICE_TOKEN == "") { - DEVICE_TOKEN = token; + DEVICE_TOKEN = token!; await _authService.selectDeviceImei(DEVICE_TOKEN); if (_authService.hasError) { - error = _authService.error; + error = _authService.error!; setState(ViewState.ErrorLocal); } else { if (_authService.dashboardItemsList.length > 0) { diff --git a/lib/core/viewModel/base_view_model.dart b/lib/core/viewModel/base_view_model.dart index 9d7032aa..cdc0f3d9 100644 --- a/lib/core/viewModel/base_view_model.dart +++ b/lib/core/viewModel/base_view_model.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; class BaseViewModel extends ChangeNotifier { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); - DoctorProfileModel doctorProfile; + DoctorProfileModel ? doctorProfile; ViewState _state = ViewState.Idle; bool isInternetConnection = true; @@ -22,24 +22,20 @@ class BaseViewModel extends ChangeNotifier { notifyListeners(); } - Future getDoctorProfile({bool isGetProfile = false}) async { + Future ?getDoctorProfile({bool isGetProfile = false}) async { if(isGetProfile) { - Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - if (profile != null) { - doctorProfile = DoctorProfileModel.fromJson(profile); - if (doctorProfile != null) { - return doctorProfile; - } + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + doctorProfile = DoctorProfileModel.fromJson(profile); + if (doctorProfile != null) { + return doctorProfile; } } if (doctorProfile == null) { - Map profile = await sharedPref.getObj(DOCTOR_PROFILE); - if (profile != null) { - doctorProfile = DoctorProfileModel.fromJson(profile); - if (doctorProfile != null) { - return doctorProfile; - } + Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + doctorProfile = DoctorProfileModel.fromJson(profile); + if (doctorProfile != null) { + return doctorProfile; } return null; } else { diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index 6f34f034..706b828e 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -20,7 +20,7 @@ class DashboardViewModel extends BaseViewModel { bool get hasVirtualClinic => _dashboardService.hasVirtualClinic; - String get sServiceID => _dashboardService.sServiceID; + String? get sServiceID => _dashboardService.sServiceID; Future setFirebaseNotification(ProjectViewModel projectsProvider, AuthenticationViewModel authProvider) async { @@ -31,9 +31,9 @@ class DashboardViewModel extends BaseViewModel { _firebaseMessaging.requestPermission(sound: true, badge: true, alert: true, provisional: true); - _firebaseMessaging.getToken().then((String token) async { + _firebaseMessaging.getToken().then((String ?token) async { if (token != '') { - DEVICE_TOKEN = token; + DEVICE_TOKEN = token!; authProvider.insertDeviceImei(); } }); @@ -43,7 +43,7 @@ class DashboardViewModel extends BaseViewModel { setState(ViewState.Busy); await _dashboardService.getDashboard(); if (_dashboardService.hasError) { - error = _dashboardService.error; + error = _dashboardService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -53,7 +53,7 @@ class DashboardViewModel extends BaseViewModel { setState(ViewState.Busy); await _dashboardService.checkDoctorHasLiveCare(); if (_dashboardService.hasError) { - error = _dashboardService.error; + error = _dashboardService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -64,9 +64,9 @@ class DashboardViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await getDoctorProfile(); ClinicModel clinicModel = ClinicModel( - doctorID: doctorProfile.doctorID, + doctorID: doctorProfile!.doctorID, clinicID: clinicId, - projectID: doctorProfile.projectID, + projectID: doctorProfile!.projectID, ); await authProvider.getDoctorProfileBasedOnClinic(clinicModel); if (authProvider.state == ViewState.ErrorLocal) { diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index 18f1a9f5..37a61afe 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -15,7 +15,7 @@ class DoctorReplayViewModel extends BaseViewModel { setState(ViewState.Busy); await _doctorReplyService.getDoctorReply(); if (_doctorReplyService.hasError) { - error = _doctorReplyService.error; + error = _doctorReplyService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -26,7 +26,7 @@ class DoctorReplayViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _doctorReplyService.replay(referredDoctorRemarks, model); if (_doctorReplyService.hasError) { - error = _doctorReplyService.error; + error = _doctorReplyService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/hospitals_view_model.dart b/lib/core/viewModel/hospitals_view_model.dart index c0ce1bc4..f2b2abe9 100644 --- a/lib/core/viewModel/hospitals_view_model.dart +++ b/lib/core/viewModel/hospitals_view_model.dart @@ -1,25 +1,21 @@ -import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_request_model.dart'; import 'package:doctor_app_flutter/core/service/hospitals/hospitals_service.dart'; -import 'package:flutter/cupertino.dart'; import '../../locator.dart'; import 'base_view_model.dart'; - class HospitalViewModel extends BaseViewModel { HospitalsService _hospitalsService = locator(); - // List get imeiDetails => _authService.dashboardItemsList; - // get loginInfo => _authService.loginInfo; + Future getHospitalsList(memberID) async { - GetHospitalsRequestModel getHospitalsRequestModel =GetHospitalsRequestModel(); + GetHospitalsRequestModel getHospitalsRequestModel = + GetHospitalsRequestModel(); getHospitalsRequestModel.memberID = memberID; setState(ViewState.Busy); await _hospitalsService.getHospitals(getHospitalsRequestModel); if (_hospitalsService.hasError) { - error = _hospitalsService.error; + error = _hospitalsService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 5b4b7e4c..674dddd5 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -18,8 +18,8 @@ class LabsViewModel extends BaseViewModel { List get labOrdersResultsList => _labsService.labOrdersResultsList; - List _patientLabOrdersListClinic = List(); - List _patientLabOrdersListHospital = List(); + List _patientLabOrdersListClinic = []; + List _patientLabOrdersListHospital = []; List get patientLabOrdersList => filterType == FilterType.Clinic @@ -30,7 +30,7 @@ class LabsViewModel extends BaseViewModel { setState(ViewState.Busy); await _labsService.getPatientLabOrdersList(patient, true); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { _labsService.patientLabOrdersList.forEach((element) { @@ -47,7 +47,7 @@ class LabsViewModel extends BaseViewModel { .add(element); } else { _patientLabOrdersListClinic.add(PatientLabOrdersList( - filterName: element.clinicDescription, + filterName: element.clinicDescription!, patientDoctorAppointment: element)); } @@ -67,7 +67,7 @@ class LabsViewModel extends BaseViewModel { .add(element); } else { _patientLabOrdersListHospital.add(PatientLabOrdersList( - filterName: element.projectName, + filterName: element.projectName!, patientDoctorAppointment: element)); } }); @@ -86,19 +86,19 @@ class LabsViewModel extends BaseViewModel { List get labResultList => _labsService.labResultList; - List labResultLists = List(); + List labResultLists = []; List get labResultListsCoustom { return labResultLists; } getLaboratoryResult( - {String projectID, - int clinicID, - String invoiceNo, - String orderNo, - PatiantInformtion patient, - bool isInpatient}) async { + {required String projectID, + required int clinicID, + required String invoiceNo, + required String orderNo, + required PatiantInformtion patient, + required bool isInpatient}) async { setState(ViewState.Busy); await _labsService.getLaboratoryResult( invoiceNo: invoiceNo, @@ -108,7 +108,7 @@ class LabsViewModel extends BaseViewModel { patient: patient, isInpatient: isInpatient); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -116,16 +116,16 @@ class LabsViewModel extends BaseViewModel { } getPatientLabResult( - {PatientLabOrders patientLabOrder, - PatiantInformtion patient, - bool isInpatient}) async { + {required PatientLabOrders patientLabOrder, + required PatiantInformtion patient, + required bool isInpatient}) async { setState(ViewState.Busy); await _labsService.getPatientLabResult( patientLabOrder: patientLabOrder, patient: patient, isInpatient: isInpatient); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -145,30 +145,30 @@ class LabsViewModel extends BaseViewModel { .add(element); } else { labResultLists - .add(LabResultList(filterName: element.testCode, lab: element)); + .add(LabResultList(filterName: element.testCode!, lab: element)); } }); } getPatientLabOrdersResults( - {PatientLabOrders patientLabOrder, - String procedure, - PatiantInformtion patient}) async { + {required PatientLabOrders patientLabOrder, + required String procedure, + required PatiantInformtion patient}) async { setState(ViewState.Busy); await _labsService.getPatientLabOrdersResults( patientLabOrder: patientLabOrder, procedure: procedure, patient: patient); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; setState(ViewState.Error); } else { bool isShouldClear = false; if (_labsService.labOrdersResultsList.length == 1) { labOrdersResultsList.forEach((element) { - if (element.resultValue.contains('/') || - element.resultValue.contains('*') || - element.resultValue.isEmpty) isShouldClear = true; + if (element.resultValue!.contains('/') || + element.resultValue!.contains('*') || + element.resultValue!.isEmpty) isShouldClear = true; }); } if (isShouldClear) _labsService.labOrdersResultsList.clear(); @@ -176,10 +176,10 @@ class LabsViewModel extends BaseViewModel { } } - sendLabReportEmail({PatientLabOrders patientLabOrder, String mes}) async { + sendLabReportEmail({required PatientLabOrders patientLabOrder, required String mes}) async { await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder); if (_labsService.hasError) { - error = _labsService.error; + error = _labsService.error!; } else DrAppToastMsg.showSuccesToast(mes); } diff --git a/lib/core/viewModel/leave_rechdule_response.dart b/lib/core/viewModel/leave_rechdule_response.dart index 555e19cf..cb734073 100644 --- a/lib/core/viewModel/leave_rechdule_response.dart +++ b/lib/core/viewModel/leave_rechdule_response.dart @@ -1,16 +1,16 @@ class GetRescheduleLeavesResponse { - int clinicId; + int? clinicId; var coveringDoctorId; - String date; - String dateTimeFrom; - String dateTimeTo; - int doctorId; - int reasonId; - int requisitionNo; - int requisitionType; - int status; - String createdOn; - String statusDescription; + String? date; + String? dateTimeFrom; + String? dateTimeTo; + int? doctorId; + int? reasonId; + int? requisitionNo; + int? requisitionType; + int? status; + String? createdOn; + String? statusDescription; GetRescheduleLeavesResponse( {this.clinicId, this.coveringDoctorId, @@ -25,7 +25,7 @@ class GetRescheduleLeavesResponse { this.createdOn, this.statusDescription}); - GetRescheduleLeavesResponse.fromJson(Map json) { + GetRescheduleLeavesResponse.fromJson(Map json) { clinicId = json['clinicId']; coveringDoctorId = json['coveringDoctorId']; date = json['date']; @@ -40,8 +40,8 @@ class GetRescheduleLeavesResponse { statusDescription = json['statusDescription']; } - Map toJson() { - final Map data = new Map(); + Map toJson() { + final Map data = new Map(); data['clinicId'] = this.clinicId; data['coveringDoctorId'] = this.coveringDoctorId; data['date'] = this.date; diff --git a/lib/core/viewModel/livecare_view_model.dart b/lib/core/viewModel/livecare_view_model.dart index de586e1e..eb96e687 100644 --- a/lib/core/viewModel/livecare_view_model.dart +++ b/lib/core/viewModel/livecare_view_model.dart @@ -16,7 +16,7 @@ class LiveCareViewModel with ChangeNotifier { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); List liveCarePendingList = []; - StartCallRes inCallResponse; + late StartCallRes inCallResponse; var transferToAdmin = {}; var endCallResponse = {}; bool isFinished = true; diff --git a/lib/core/viewModel/medical_file_view_model.dart b/lib/core/viewModel/medical_file_view_model.dart index 08e8ce90..406a4617 100644 --- a/lib/core/viewModel/medical_file_view_model.dart +++ b/lib/core/viewModel/medical_file_view_model.dart @@ -11,13 +11,13 @@ class MedicalFileViewModel extends BaseViewModel { List get medicalFileList => _medicalFileService.medicalFileList; - Future getMedicalFile({int mrn}) async { + Future getMedicalFile({required int mrn}) async { hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _medicalFileService.getMedicalFile(mrn: mrn); if (_medicalFileService.hasError) { - error = _medicalFileService.error; + error = _medicalFileService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index 8ccf1a70..8fa484ea 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -18,7 +18,7 @@ class MedicineViewModel extends BaseViewModel { ProcedureService _procedureService = locator(); PrescriptionService _prescriptionService = locator(); List get procedureTemplate => _procedureService.templateList; - List templateList = List(); + List templateList = []; get pharmacyItemsList => _medicineService.pharmacyItemsList; get searchText => _medicineService.searchText; get pharmaciesList => _medicineService.pharmaciesList; @@ -42,13 +42,13 @@ class MedicineViewModel extends BaseViewModel { List get itemMedicineListRoute => _prescriptionService.itemMedicineListRoute; List get itemMedicineListUnit => _prescriptionService.itemMedicineListUnit; - Future getItem({int itemID}) async { + Future getItem({required int itemID}) async { //hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _prescriptionService.getItem(itemID: itemID); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -70,12 +70,12 @@ class MedicineViewModel extends BaseViewModel { print(templateList.length.toString()); } - Future getProcedureTemplate({String categoryID}) async { + Future getProcedureTemplate({required String categoryID}) async { hasError = false; setState(ViewState.Busy); await _procedureService.getProcedureTemplate(categoryID: categoryID); if (_procedureService.hasError) { - error = _procedureService.error; + error = _procedureService.error!; setState(ViewState.ErrorLocal); } else { setTemplateListDependOnId(); @@ -83,13 +83,13 @@ class MedicineViewModel extends BaseViewModel { } } - Future getPrescription({int mrn}) async { + Future getPrescription({required int mrn}) async { //hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _prescriptionService.getPrescription(mrn: mrn); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -99,17 +99,17 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _medicineService.getMedicineItem(itemName); if (_medicineService.hasError) { - error = _medicineService.error; + error = _medicineService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - Future getMedicationList({String drug}) async { + Future getMedicationList({required String drug}) async { setState(ViewState.Busy); await _prescriptionService.getMedicationList(drug: drug); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -119,7 +119,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getPatientAssessment(getAssessmentReqModel); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -129,7 +129,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationStrength); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -139,7 +139,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationRoute); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -149,7 +149,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationIndications); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -159,7 +159,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationDoseTime); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -169,7 +169,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationFrequency); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -179,18 +179,18 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _prescriptionService.getMasterLookup(MasterKeysService.MedicationDuration); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); } - Future getBoxQuantity({int itemCode, int duration, double strength, int freq}) async { + Future getBoxQuantity({required int itemCode, required int duration, required double strength, required int freq}) async { setState(ViewState.Busy); await _prescriptionService.calculateBoxQuantity( strength: strength, itemCode: itemCode, duration: duration, freq: freq); if (_prescriptionService.hasError) { - error = _prescriptionService.error; + error = _prescriptionService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -200,7 +200,7 @@ class MedicineViewModel extends BaseViewModel { setState(ViewState.Busy); await _medicineService.getPharmaciesList(itemId); if (_medicineService.hasError) { - error = _medicineService.error; + error = _medicineService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); diff --git a/lib/core/viewModel/patient-admission-request-viewmodel.dart b/lib/core/viewModel/patient-admission-request-viewmodel.dart index 0868b601..8e1cbca0 100644 --- a/lib/core/viewModel/patient-admission-request-viewmodel.dart +++ b/lib/core/viewModel/patient-admission-request-viewmodel.dart @@ -39,7 +39,7 @@ class AdmissionRequestViewModel extends BaseViewModel { List get listOfDiagnosisSelectionTypes => _admissionRequestService.listOfDiagnosisSelectionTypes; - AdmissionRequest admissionRequestData; + late AdmissionRequest admissionRequestData; Future getSpecialityList() async { await getMasterLookup(MasterKeysService.Speciality); @@ -53,7 +53,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getClinics(); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -63,7 +63,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getDoctorsList(clinicId); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -73,7 +73,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getFloors(); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -83,7 +83,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getWardList(); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -93,7 +93,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getRoomCategories(); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -103,7 +103,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getDiagnosisTypesList(); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -120,7 +120,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getDietTypesList(patientMrn); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -130,7 +130,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getICDCodes(patientMrn); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -140,7 +140,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.Busy); await _admissionRequestService.makeAdmissionRequest(admissionRequestData); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -150,7 +150,7 @@ class AdmissionRequestViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _admissionRequestService.getMasterLookup(keysService); if (_admissionRequestService.hasError) { - error = _admissionRequestService.error; + error = _admissionRequestService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index a414c200..f93b057e 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -62,7 +62,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.getPatientReferral(patient); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else { if (patientReferral.length == 0) { @@ -77,7 +77,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.getMasterLookup(masterKeys); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else await getBranches(); @@ -87,7 +87,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _referralPatientService.getReferralFacilities(); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -99,7 +99,7 @@ class PatientReferralViewModel extends BaseViewModel { await _referralPatientService.getClinicsList(projectId); await _referralPatientService.getProjectInfo(projectId); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -110,7 +110,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _referralPatientService.getDoctorsList(patient, clinicId, branchId); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.ErrorLocal); } else { doctorsList.clear(); @@ -122,7 +122,7 @@ class PatientReferralViewModel extends BaseViewModel { } Future getDoctorBranch() async { - DoctorProfileModel doctorProfile = await getDoctorProfile(); + DoctorProfileModel? doctorProfile = await getDoctorProfile(); if (doctorProfile != null) { dynamic _selectedBranch = { "facilityId": doctorProfile.projectID, @@ -137,7 +137,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.getMyReferredPatient(); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -151,7 +151,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.getPendingReferralList(); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -161,7 +161,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _myReferralService.getMyReferralPatientService(); if (_myReferralService.hasError) { - error = _myReferralService.error; + error = _myReferralService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -172,7 +172,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _myReferralService.replay(referredDoctorRemarks, referral); if (_myReferralService.hasError) { - error = _myReferralService.error; + error = _myReferralService.error!; setState(ViewState.ErrorLocal); } else getMyReferralPatientService(); @@ -183,7 +183,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.responseReferral(pendingReferral, isAccepted); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -195,7 +195,7 @@ class PatientReferralViewModel extends BaseViewModel { await _referralPatientService.makeReferral( patient, isoStringDate, projectID, clinicID, doctorID, remarks); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -203,15 +203,15 @@ class PatientReferralViewModel extends BaseViewModel { } Future makeInPatientReferral( - {PatiantInformtion patient, - int projectID, - int clinicID, - int doctorID, - int frequencyCode, - int priority, - String referralDate, - String remarks, - String ext}) async { + {required PatiantInformtion patient, + required int projectID, + required int clinicID, + required int doctorID, + required int frequencyCode, + required int priority, + required String referralDate, + required String remarks, + required String ext}) async { setState(ViewState.Busy); await _referralService.referralPatient( patientID: patient.patientId, @@ -226,7 +226,7 @@ class PatientReferralViewModel extends BaseViewModel { extension: ext, ); if (_referralService.hasError) { - error = _referralService.error; + error = _referralService.error!; setState(ViewState.ErrorLocal); } else { setState(ViewState.Idle); @@ -240,7 +240,7 @@ class PatientReferralViewModel extends BaseViewModel { await _referralPatientService.getPatientArrivalList(toDate, fromDate: fromDate, patientMrn: patientMrn); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -251,7 +251,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.getReferralFrequencyList(); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -262,7 +262,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _referralPatientService.verifyReferralDoctorRemarks(referredPatient); if (_referralPatientService.hasError) { - error = _referralPatientService.error; + error = _referralPatientService.error!; setState(ViewState.ErrorLocal); } else { getMyReferredPatient(); @@ -274,7 +274,7 @@ class PatientReferralViewModel extends BaseViewModel { setState(ViewState.Busy); await _dischargedPatientService.gtMyDischargeReferralPatient(); if (_dischargedPatientService.hasError) { - error = _dischargedPatientService.error; + error = _dischargedPatientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -326,53 +326,53 @@ class PatientReferralViewModel extends BaseViewModel { PatiantInformtion getPatientFromReferralO( MyReferralPatientModel referredPatient) { PatiantInformtion patient = PatiantInformtion(); - patient.doctorId = referredPatient.doctorID; - patient.doctorName = referredPatient.doctorName; + patient.doctorId = referredPatient.doctorID!; + patient.doctorName = referredPatient.doctorName!; patient.patientId = referredPatient.patientID; - patient.firstName = referredPatient.firstName; - patient.middleName = referredPatient.middleName; - patient.lastName = referredPatient.lastName; - patient.gender = referredPatient.gender; - patient.dateofBirth = referredPatient.dateofBirth; - patient.mobileNumber = referredPatient.mobileNumber; - patient.emailAddress = referredPatient.emailAddress; - patient.patientIdentificationNo = referredPatient.patientIdentificationNo; - patient.patientType = referredPatient.patientType; - patient.admissionNo = referredPatient.admissionNo; - patient.admissionDate = referredPatient.admissionDate; - patient.roomId = referredPatient.roomID; - patient.bedId = referredPatient.bedID; - patient.nationalityName = referredPatient.nationalityName; - patient.nationalityFlagURL = referredPatient.nationalityFlagURL; + patient.firstName = referredPatient.firstName!; + patient.middleName = referredPatient.middleName!; + patient.lastName = referredPatient.lastName!; + patient.gender = referredPatient.gender!; + patient.dateofBirth = referredPatient.dateofBirth!; + patient.mobileNumber = referredPatient.mobileNumber!; + patient.emailAddress = referredPatient.emailAddress!; + patient.patientIdentificationNo = referredPatient.patientIdentificationNo!; + patient.patientType = referredPatient.patientType!; + patient.admissionNo = referredPatient.admissionNo!; + patient.admissionDate = referredPatient.admissionDate!; + patient.roomId = referredPatient.roomID!; + patient.bedId = referredPatient.bedID!; + patient.nationalityName = referredPatient.nationalityName!; + patient.nationalityFlagURL = referredPatient.nationalityFlagURL!; patient.age = referredPatient.age; - patient.clinicDescription = referredPatient.clinicDescription; + patient.clinicDescription = referredPatient.clinicDescription!; return patient; } PatiantInformtion getPatientFromDischargeReferralPatient( DischargeReferralPatient referredPatient) { PatiantInformtion patient = PatiantInformtion(); - patient.doctorId = referredPatient.doctorID; - patient.doctorName = referredPatient.doctorName; + patient.doctorId = referredPatient.doctorID!; + patient.doctorName = referredPatient.doctorName!; patient.patientId = referredPatient.patientID; - patient.firstName = referredPatient.firstName; - patient.middleName = referredPatient.middleName; - patient.lastName = referredPatient.lastName; - patient.gender = referredPatient.gender; - patient.dateofBirth = referredPatient.dateofBirth; - patient.mobileNumber = referredPatient.mobileNumber; - patient.emailAddress = referredPatient.emailAddress; - patient.patientIdentificationNo = referredPatient.patientIdentificationNo; - patient.patientType = referredPatient.patientType; - patient.admissionNo = referredPatient.admissionNo; - patient.admissionDate = referredPatient.admissionDate; - patient.roomId = referredPatient.roomID; - patient.bedId = referredPatient.bedID; - patient.nationalityName = referredPatient.nationalityName; + patient.firstName = referredPatient.firstName!; + patient.middleName = referredPatient.middleName!; + patient.lastName = referredPatient.lastName!; + patient.gender = referredPatient.gender!; + patient.dateofBirth = referredPatient.dateofBirth!; + patient.mobileNumber = referredPatient.mobileNumber!; + patient.emailAddress = referredPatient.emailAddress!; + patient.patientIdentificationNo = referredPatient.patientIdentificationNo!; + patient.patientType = referredPatient.patientType!; + patient.admissionNo = referredPatient.admissionNo!; + patient.admissionDate = referredPatient.admissionDate!; + patient.roomId = referredPatient.roomID!; + patient.bedId = referredPatient.bedID!; + patient.nationalityName = referredPatient.nationalityName!; patient.nationalityFlagURL = ''; // TODO from backend referredPatient.nationalityFlagURL; patient.age = referredPatient.age; - patient.clinicDescription = referredPatient.clinicDescription; + patient.clinicDescription = referredPatient.clinicDescription!; return patient; } } diff --git a/lib/core/viewModel/patient-ucaf-viewmodel.dart b/lib/core/viewModel/patient-ucaf-viewmodel.dart index b6887061..b665a385 100644 --- a/lib/core/viewModel/patient-ucaf-viewmodel.dart +++ b/lib/core/viewModel/patient-ucaf-viewmodel.dart @@ -36,7 +36,7 @@ class UcafViewModel extends BaseViewModel { List get orderProcedures => _ucafService.orderProcedureList; - String selectedLanguage; + late String selectedLanguage; String heightCm = "0"; String weightKg = "0"; String bodyMax = "0"; @@ -60,33 +60,32 @@ class UcafViewModel extends BaseViewModel { String from; String to; - if (from == null || from == "0") { + from = AppDateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); - } - if (to == null || to == "0") { + + to = AppDateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); - } + // await _ucafService.getPatientVitalSignsHistory(patient, from, to); await _ucafService.getInPatientVitalSignHistory(patient, false); await _ucafService.getPatientChiefComplaint(patient); if (_ucafService.hasError) { - error = _ucafService.error; + error = _ucafService.error!; setState(ViewState.Error); } else { patientVitalSignsHistory.forEach((element) { - if (heightCm == "0" || heightCm == null || heightCm == 'null') { + if (heightCm == "0" || heightCm == 'null') { heightCm = element.heightCm.toString(); } - if (weightKg == "0" || weightKg == null || weightKg == 'null') { + if (weightKg == "0" || weightKg == 'null') { weightKg = element.weightKg.toString(); } - if (bodyMax == "0" || bodyMax == null || bodyMax == 'null') { + if (bodyMax == "0" || bodyMax == 'null') { bodyMax = element.bodyMassIndex.toString(); } if (temperatureCelcius == "0" || - temperatureCelcius == null || temperatureCelcius == 'null') { temperatureCelcius = element.temperatureCelcius.toString(); } @@ -115,7 +114,7 @@ class UcafViewModel extends BaseViewModel { setState(ViewState.Busy); await _ucafService.getPatientAssessment(patient); if (_ucafService.hasError) { - error = _ucafService.error; + error = _ucafService.error!; setState(ViewState.Error); } else { if (patientAssessmentList.isNotEmpty) { @@ -127,7 +126,7 @@ class UcafViewModel extends BaseViewModel { await _ucafService.getMasterLookup(MasterKeysService.DiagnosisType); } if (_ucafService.hasError) { - error = _ucafService.error; + error = _ucafService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -142,7 +141,7 @@ class UcafViewModel extends BaseViewModel { setState(ViewState.Busy); await _ucafService.getOrderProcedures(patient); if (_ucafService.hasError) { - error = _ucafService.error; + error = _ucafService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -155,7 +154,7 @@ class UcafViewModel extends BaseViewModel { setState(ViewState.Busy); await _ucafService.getPrescription(patient); if (_ucafService.hasError) { - error = _ucafService.error; + error = _ucafService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -163,8 +162,8 @@ class UcafViewModel extends BaseViewModel { } } - MasterKeyModel findMasterDataById( - {@required MasterKeysService masterKeys, dynamic id}) { + MasterKeyModel ? findMasterDataById( + {required MasterKeysService masterKeys, dynamic id}) { switch (masterKeys) { case MasterKeysService.DiagnosisCondition: List result = diagnosisConditions.where((element) { diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index bab2ff9f..4f22d9e3 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -35,7 +35,7 @@ class VitalSignsViewModel extends BaseViewModel { setState(ViewState.Busy); await _vitalSignService.getPatientVitalSign(patient); if (_vitalSignService.hasError) { - error = _vitalSignService.error; + error = _vitalSignService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -59,7 +59,7 @@ class VitalSignsViewModel extends BaseViewModel { } if (_vitalSignService.hasError) { - error = _vitalSignService.error; + error = _vitalSignService.error!; setState(ViewState.Error); } else { patientVitalSignsHistory.forEach((element) { @@ -163,5 +163,6 @@ class VitalSignsViewModel extends BaseViewModel { } else if (temperatureCelciusMethod == 5) { return "Temporal"; } + return ""; } } diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index de40afde..547dbdec 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -64,7 +64,7 @@ class PatientViewModel extends BaseViewModel { isView: isView); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else { setState(ViewState.Idle); @@ -76,7 +76,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getLabResultOrders(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -86,7 +86,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getOutPatientPrescriptions(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -96,7 +96,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getInPatientPrescriptions(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -106,7 +106,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getPrescriptionReport(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -116,7 +116,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getPatientRadiology(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -126,7 +126,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getLabResult(labOrdersResModel); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -136,7 +136,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getPatientInsuranceApprovals(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -151,7 +151,7 @@ class PatientViewModel extends BaseViewModel { await _patientService.getPatientProgressNote(patient); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; if (isLocalBusy) { setState(ViewState.ErrorLocal); } else { @@ -165,7 +165,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _patientService.updatePatientProgressNote(req); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -175,7 +175,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _patientService.createPatientProgressNote(req); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -185,7 +185,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getClinicsList(); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else { { @@ -199,7 +199,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await _patientService.getDoctorsList(clinicId); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.ErrorLocal); } else { { @@ -227,7 +227,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getReferralFrequancyList(); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle); @@ -241,17 +241,17 @@ class PatientViewModel extends BaseViewModel { } Future referToDoctor( - {String selectedDoctorID, - String selectedClinicID, - int admissionNo, - String extension, - String priority, - String frequency, - String referringDoctorRemarks, - int patientID, - int patientTypeID, - String roomID, - int projectID}) async { + {required String selectedDoctorID, + required String selectedClinicID, + required int admissionNo, + required String extension, + required String priority, + required String frequency, + required String referringDoctorRemarks, + required int patientID, + required int patientTypeID, + required String roomID, + required int projectID}) async { setState(ViewState.BusyLocal); await _patientService.referToDoctor( selectedClinicID: selectedClinicID, @@ -266,7 +266,7 @@ class PatientViewModel extends BaseViewModel { roomID: roomID, projectID: projectID); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.ErrorLocal); } else setState(ViewState.Idle); @@ -276,7 +276,7 @@ class PatientViewModel extends BaseViewModel { setState(ViewState.Busy); await _patientService.getArrivedList(); if (_patientService.hasError) { - error = _patientService.error; + error = _patientService.error!; setState(ViewState.Error); } else setState(ViewState.Idle);