reverting manully step 3

lib/core/insurance_approval_request_model.dart

@@ -1,17 +1,17 @@
 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(
       {this.patientID,

lib/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart

@@ -10,13 +10,13 @@ class GetDiabeticChartValuesRequestModel {
 
   GetDiabeticChartValuesRequestModel(
       {this.deviceTypeID,
-        this.patientID,
+      this.patientID,
-        this.resultType,
+      this.resultType,
-        this.admissionNo,
+      this.admissionNo,
-        this.setupID,
+      this.setupID,
-        this.patientOutSA,
+      this.patientOutSA,
-        this.patientType,
+      this.patientType,
-        this.patientTypeID});
+      this.patientTypeID});
 
   GetDiabeticChartValuesRequestModel.fromJson(Map<String, dynamic> json) {
     deviceTypeID = json['DeviceTypeID'];

lib/core/service/VideoCallService.dart

@@ -36,7 +36,7 @@ class VideoCallService extends BaseService{
         // kToken: "T1==cGFydG5lcl9pZD00NzI0Nzk1NCZzaWc9NGUyZjgxMjFlYTFkNzU5NjcxNDY2ZTM2ZjM3YTVhNTI2NGY0NTI2NzpzZXNzaW9uX2lkPTJfTVg0ME56STBOemsxTkg1LU1UWXlOVGN5TmpnMk5qZzNOMzQ1YUhCcGRtcDFXbVpDTDFkNE1qbDRkWFY2TTA4cmIySi1mZyZjcmVhdGVfdGltZT0xNjI1NzI2ODg5Jm5vbmNlPTAuNjc2Nzc4OTQxNjA1MTMxNSZyb2xlPXB1Ymxpc2hlciZleHBpcmVfdGltZT0xNjI4MzE4ODg4JmluaXRpYWxfbGF5b3V0X2NsYXNzX2xpc3Q9",
         // kSessionId: "2_MX40NzI0Nzk1NH5-MTYyNTcyNjg2Njg3N345aHBpdmp1WmZCL1d4Mjl4dXV6M08rb2J-fg",
         // kApiKey:'47247954',
-        vcId: patient.vcId,
+        vcId: patient.vcId!,
         isRecording: isRecording,
         patientName: patient.fullName ??
             (patient.firstName != null
@@ -44,7 +44,7 @@ class VideoCallService extends BaseService{
                 : "-"),
         tokenID: await sharedPref.getString(TOKEN),
         generalId: GENERAL_ID,
-        doctorId: doctorProfile!.doctorID,
+        doctorId: doctorProfile!.doctorID!,
         onFailure: (String error) {
           DrAppToastMsg.showErrorToast(error);
         },

lib/core/service/authentication_service.dart

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

lib/core/service/base/base_service.dart

@@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
 
 class BaseService {
-  String ?error;
+  String error ='';
   bool hasError = false;
   BaseAppClient baseAppClient = BaseAppClient();
   DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();

lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart

@@ -94,7 +94,7 @@ class PatientMedicalReportService extends BaseService {
             ? body['SetupID']
             : SETUP_ID
         : SETUP_ID;
-    body['AdmissionNo'] = int.parse(patient.admissionNo);
+    body['AdmissionNo'] = int.parse(patient.admissionNo!);
     body['MedicalReportHTML'] = htmlText;
     if (body['ProjectID'] == null) {
       body['ProjectID'] = doctorProfile?.projectID;

lib/core/service/patient_medical_file/prescription/prescription_service.dart

@@ -218,7 +218,7 @@ class PrescriptionService extends LookupService {
         "objPatientInfo": {
           "Gender": patient.gender == 1 ? 'Male' : 'Female',
           "Age": AppDateUtils.convertDateFromServerFormat(
-              patient.dateofBirth, 'dd/MM/yyyy')
+              patient.dateofBirth!, 'dd/MM/yyyy')
         },
         "objVitalSign": {"Height": vital?.heightCm, "Weight": vital?.weightKg},
         "objPrescriptionItems": prescription,

lib/core/viewModel/DischargedPatientViewModel.dart

@@ -6,11 +6,9 @@ import '../../locator.dart';
 import 'base_view_model.dart';
 
 class DischargedPatientViewModel extends BaseViewModel {
-  DischargedPatientService _dischargedPatientService =
+  DischargedPatientService _dischargedPatientService = locator<DischargedPatientService>();
-      locator<DischargedPatientService>();
 
-  List<PatiantInformtion> get myDischargedPatient =>
+  List<PatiantInformtion> get myDischargedPatient => _dischargedPatientService.myDischargedPatients;
-      _dischargedPatientService.myDischargedPatients;
 
   List<PatiantInformtion> filterData = [];
 
@@ -19,9 +17,9 @@ class DischargedPatientViewModel extends BaseViewModel {
     if (strExist) {
       filterData = [];
       for (var i = 0; i < myDischargedPatient.length; i++) {
-        String firstName = myDischargedPatient[i].firstName.toUpperCase();
+        String firstName = myDischargedPatient[i].firstName!.toUpperCase();
-        String lastName = myDischargedPatient[i].lastName.toUpperCase();
+        String lastName = myDischargedPatient[i].lastName!.toUpperCase();
-        String mobile = myDischargedPatient[i].mobileNumber.toUpperCase();
+        String mobile = myDischargedPatient[i].mobileNumber!.toUpperCase();
         String patientID = myDischargedPatient[i].patientId.toString();
 
         if (firstName.contains(str.toUpperCase()) ||
@@ -42,7 +40,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 +52,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);

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);

lib/core/viewModel/LiveCarePatientViewModel.dart

@@ -35,7 +35,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
         PendingPatientERForDoctorAppRequestModel(sErServiceID: _dashboardService.sServiceID, outSA: false);
     await _liveCarePatientServices.getPendingPatientERForDoctorApp(pendingPatientERForDoctorAppRequestModel);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
 
       setState(ViewState.ErrorLocal);
     } else {
@@ -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.projectName = doctorProfile!.projectName!;
-    startCallReq.docotrName = doctorProfile!.doctorName;
+    startCallReq.docotrName = doctorProfile!.doctorName!;
-    startCallReq.clincName = doctorProfile!.clinicDescription;
+    startCallReq.clincName = doctorProfile!.clinicDescription!;
-    startCallReq.docSpec = doctorProfile!.doctorTitleForProfile;
+    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);
@@ -107,7 +107,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
 
     await _liveCarePatientServices.endCallWithCharge(vcID, selectedServices);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       await getPendingPatientERForDoctorApp();
@@ -118,8 +118,8 @@ class LiveCarePatientViewModel extends BaseViewModel {
   List<int> getSelectedAlternativeServices() {
     List<int> selectedServices = [];
     for (AlternativeService service in alternativeServicesList) {
-      if (service.isSelected) {
+      if (service.isSelected!) {
-        selectedServices.add(service.serviceID);
+        selectedServices.add(service.serviceID!);
       }
     }
     return selectedServices;
@@ -129,7 +129,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _liveCarePatientServices.getAlternativeServices(vcID);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -140,7 +140,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();
@@ -152,7 +152,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _liveCarePatientServices.sendSMSInstruction(vcID);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       await getPendingPatientERForDoctorApp();
@@ -165,9 +165,9 @@ class LiveCarePatientViewModel extends BaseViewModel {
     if (strExist) {
       filterData = [];
       for (var i = 0; i < _liveCarePatientServices.patientList.length; i++) {
-        String fullName = _liveCarePatientServices.patientList[i].fullName.toUpperCase();
+        String fullName = _liveCarePatientServices.patientList[i].fullName!.toUpperCase();
         String patientID = _liveCarePatientServices.patientList[i].patientId.toString();
-        String mobile = _liveCarePatientServices.patientList[i].mobileNumber.toUpperCase();
+        String mobile = _liveCarePatientServices.patientList[i].mobileNumber!.toUpperCase();
 
         if (fullName.contains(str.toUpperCase()) || patientID.contains(str) || mobile.contains(str)) {
           filterData.add(_liveCarePatientServices.patientList[i]);
@@ -184,14 +184,14 @@ class LiveCarePatientViewModel extends BaseViewModel {
     await getDoctorProfile(isGetProfile: true);
 
     LiveCareUserLoginRequestModel userLoginRequestModel = new LiveCareUserLoginRequestModel();
-    userLoginRequestModel.isOutKsa = (doctorProfile!.projectID == 2 || doctorProfile!.projectID == 3) ? 1 : 0;
+    userLoginRequestModel.isOutKsa = (doctorProfile!.projectID! == 2 || doctorProfile!.projectID! == 3) ? 1 : 0;
     userLoginRequestModel.isLogin = loginStatus;
     userLoginRequestModel.generalid = "Cs2020@2016\$2958";
 
     setState(ViewState.BusyLocal);
     await _liveCarePatientServices.isLogin(loginStatus: loginStatus, isLoginRequestModel: userLoginRequestModel);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -235,7 +235,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
     );
   }
 
-  updateInCallPatient({PatiantInformtion patient, appointmentNo}) {
+  updateInCallPatient({required PatiantInformtion patient, appointmentNo}) {
     _liveCarePatientServices.patientList.forEach((e) {
       if (e.patientId == patient.patientId) {
         e.episodeNo = 0;
@@ -252,7 +252,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _liveCarePatientServices.addPatientToDoctorList(vcID: vcID);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -264,7 +264,7 @@ class LiveCarePatientViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _liveCarePatientServices.removePatientFromDoctorList(vcID: vcID);
     if (_liveCarePatientServices.hasError) {
-      error = _liveCarePatientServices.error;
+      error = _liveCarePatientServices.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/PatientMedicalReportViewModel.dart

@@ -18,7 +18,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);
@@ -28,7 +28,7 @@ class PatientMedicalReportViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _service.getMedicalReportTemplate();
     if (_service.hasError) {
-      error = _service.error;
+      error = _service.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -38,7 +38,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);
@@ -48,7 +48,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
       await getMedicalReportList(patient);
@@ -59,7 +59,7 @@ class PatientMedicalReportViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _service.addMedicalReport(patient, htmlText);
     if (_service.hasError) {
-      error = _service.error;
+      error = _service.error!;
       await getMedicalReportList(patient);
       setState(ViewState.ErrorLocal);
     } else
@@ -72,7 +72,7 @@ class PatientMedicalReportViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _service.updateMedicalReport(patient, htmlText, limitNumber, invoiceNumber);
     if (_service.hasError) {
-      error = _service.error;
+      error = _service.error!;
       await getMedicalReportList(patient);
       setState(ViewState.ErrorLocal);
     } else

lib/core/viewModel/PatientMuseViewModel.dart

@@ -11,14 +11,14 @@ class PatientMuseViewModel extends BaseViewModel {
   List<PatientMuseResultsModel> get patientMuseResultsModelList =>
       _patientMuseService.patientMuseResultsModelList;
 
-  getECGPatient({int patientType, int patientOutSA, int patientID}) async {
+  getECGPatient({int? patientType, int? patientOutSA, int? patientID}) async {
     setState(ViewState.Busy);
     await _patientMuseService.getECGPatient(
         patientID: patientID,
         patientOutSA: patientOutSA,
         patientType: patientType);
     if (_patientMuseService.hasError) {
-      error = _patientMuseService.error;
+      error = _patientMuseService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/PatientSearchViewModel.dart

@@ -25,8 +25,8 @@ class PatientSearchViewModel extends BaseViewModel {
 
   List<PatiantInformtion> filterData = [];
 
-  DateTime selectedFromDate;
+  DateTime? selectedFromDate;
-  DateTime selectedToDate;
+  DateTime? selectedToDate;
 
   int firstSubsetIndex = 0;
   int inPatientPageSize = 20;
@@ -40,11 +40,11 @@ class PatientSearchViewModel extends BaseViewModel {
       filterData = [];
       for (var i = 0; i < _outPatientService.patientList.length; i++) {
         String firstName =
-            _outPatientService.patientList[i].firstName.toUpperCase();
+            _outPatientService.patientList[i].firstName!.toUpperCase();
         String lastName =
-            _outPatientService.patientList[i].lastName.toUpperCase();
+            _outPatientService.patientList[i].lastName!.toUpperCase();
         String mobile =
-            _outPatientService.patientList[i].mobileNumber.toUpperCase();
+            _outPatientService.patientList[i].mobileNumber!.toUpperCase();
         String patientID =
             _outPatientService.patientList[i].patientId.toString();
 
@@ -73,7 +73,7 @@ class PatientSearchViewModel extends BaseViewModel {
     patientSearchRequestModel.doctorID = doctorProfile!.doctorID;
     await _outPatientService.getOutPatient(patientSearchRequestModel);
     if (_outPatientService.hasError) {
-      error = _outPatientService.error;
+      error = _outPatientService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else {
@@ -99,7 +99,7 @@ class PatientSearchViewModel extends BaseViewModel {
     await _outPatientService
         .getPatientFileInformation(patientSearchRequestModel);
     if (_outPatientService.hasError) {
-      error = _outPatientService.error;
+      error = _outPatientService.error!;
       setState(ViewState.Error);
     } else {
       filterData = _outPatientService.patientList;
@@ -109,10 +109,10 @@ class PatientSearchViewModel extends BaseViewModel {
 
   getPatientBasedOnDate(
       {item,
-      PatientSearchRequestModel patientSearchRequestModel,
+      PatientSearchRequestModel? patientSearchRequestModel,
-      PatientType selectedPatientType,
+      PatientType? selectedPatientType,
-      bool isSearchWithKeyInfo,
+      bool? isSearchWithKeyInfo,
-      OutPatientFilterType outPatientFilterType}) async {
+      OutPatientFilterType? outPatientFilterType}) async {
     String dateTo;
     String dateFrom;
     if (OutPatientFilterType.Previous == outPatientFilterType) {
@@ -120,9 +120,9 @@ class PatientSearchViewModel extends BaseViewModel {
           DateTime.now().year, DateTime.now().month - 1, DateTime.now().day);
       selectedToDate = DateTime(
           DateTime.now().year, DateTime.now().month, DateTime.now().day - 1);
-      dateTo = AppDateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd');
+      dateTo = AppDateUtils.convertDateToFormat(selectedToDate!, 'yyyy-MM-dd');
       dateFrom =
-          AppDateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd');
+          AppDateUtils.convertDateToFormat(selectedFromDate!, 'yyyy-MM-dd');
     } else if (OutPatientFilterType.NextWeek == outPatientFilterType) {
       dateTo = AppDateUtils.convertDateToFormat(
           DateTime(DateTime.now().year, DateTime.now().month,
@@ -144,7 +144,7 @@ class PatientSearchViewModel extends BaseViewModel {
           'yyyy-MM-dd');
     }
     PatientSearchRequestModel currentModel = PatientSearchRequestModel();
-    currentModel.patientID = patientSearchRequestModel.patientID;
+    currentModel.patientID = patientSearchRequestModel!.patientID;
     currentModel.firstName = patientSearchRequestModel.firstName;
     currentModel.lastName = patientSearchRequestModel.lastName;
     currentModel.middleName = patientSearchRequestModel.middleName;
@@ -177,7 +177,7 @@ class PatientSearchViewModel extends BaseViewModel {
     if (inPatientList.length == 0)
       await _inPatientService.getInPatientList(requestModel, false);
     if (_inPatientService.hasError) {
-      error = _inPatientService.error;
+      error = _inPatientService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else {
@@ -190,7 +190,10 @@ class PatientSearchViewModel extends BaseViewModel {
     }
   }
 
-  sortInPatient({bool isDes = false, bool isAllClinic, bool isMyInPatient}) {
+  sortInPatient(
+      {bool isDes = false,
+      required bool isAllClinic,
+      required bool isMyInPatient}) {
     if (isMyInPatient
         ? myIinPatientList.length > 0
         : isAllClinic
@@ -203,12 +206,12 @@ class PatientSearchViewModel extends BaseViewModel {
               : [...filteredInPatientItems];
       if (isDes)
         localInPatient.sort((PatiantInformtion a, PatiantInformtion b) => b
-            .admissionDateWithDateTimeForm
+            .admissionDateWithDateTimeForm!
-            .compareTo(a.admissionDateWithDateTimeForm));
+            .compareTo(a.admissionDateWithDateTimeForm!));
       else
         localInPatient.sort((PatiantInformtion a, PatiantInformtion b) => a
-            .admissionDateWithDateTimeForm
+            .admissionDateWithDateTimeForm!
-            .compareTo(b.admissionDateWithDateTimeForm));
+            .compareTo(b.admissionDateWithDateTimeForm!));
       if (isMyInPatient) {
         filteredMyInPatientItems.clear();
         filteredMyInPatientItems.addAll(localInPatient);
@@ -253,7 +256,7 @@ class PatientSearchViewModel extends BaseViewModel {
     InpatientClinicList.clear();
     inPatientList.forEach((element) {
       if (!InpatientClinicList.contains(element.clinicDescription)) {
-        InpatientClinicList.add(element.clinicDescription);
+        InpatientClinicList.add(element!.clinicDescription!);
       }
     });
   }
@@ -281,7 +284,7 @@ class PatientSearchViewModel extends BaseViewModel {
     }
   }
 
-  filterByHospital({int hospitalId}) {
+  filterByHospital({required int hospitalId}) {
     filteredInPatientItems = [];
     for (var i = 0; i < inPatientList.length; i++) {
       if (inPatientList[i].projectId == hospitalId) {
@@ -291,7 +294,7 @@ class PatientSearchViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  filterByClinic({String clinicName}) {
+  filterByClinic({required String clinicName}) {
     filteredInPatientItems = [];
     for (var i = 0; i < inPatientList.length; i++) {
       if (inPatientList[i].clinicDescription == clinicName) {
@@ -307,7 +310,7 @@ class PatientSearchViewModel extends BaseViewModel {
   }
 
   void filterSearchResults(String query,
-      {bool isAllClinic, bool isMyInPatient}) {
+      {required bool isAllClinic, required bool isMyInPatient}) {
     var strExist = query.length > 0 ? true : false;
 
     if (isMyInPatient) {
@@ -319,13 +322,13 @@ class PatientSearchViewModel extends BaseViewModel {
         filteredMyInPatientItems.clear();
         for (var i = 0; i < localFilteredMyInPatientItems.length; i++) {
           String firstName =
-              localFilteredMyInPatientItems[i].firstName.toUpperCase();
+              localFilteredMyInPatientItems[i].firstName!.toUpperCase();
           String lastName =
-              localFilteredMyInPatientItems[i].lastName.toUpperCase();
+              localFilteredMyInPatientItems[i].lastName!.toUpperCase();
           String mobile =
-              localFilteredMyInPatientItems[i].mobileNumber.toUpperCase();
+              localFilteredMyInPatientItems[i].mobileNumber!.toUpperCase();
           String patientID =
-              localFilteredMyInPatientItems[i].patientId.toString();
+              localFilteredMyInPatientItems[i].patientId!.toString();
 
           if (firstName.contains(query.toUpperCase()) ||
               lastName.contains(query.toUpperCase()) ||
@@ -345,9 +348,9 @@ class PatientSearchViewModel extends BaseViewModel {
         if (strExist) {
           filteredInPatientItems = [];
           for (var i = 0; i < inPatientList.length; i++) {
-            String firstName = inPatientList[i].firstName.toUpperCase();
+            String firstName = inPatientList[i].firstName!.toUpperCase();
-            String lastName = inPatientList[i].lastName.toUpperCase();
+            String lastName = inPatientList[i].lastName!.toUpperCase();
-            String mobile = inPatientList[i].mobileNumber.toUpperCase();
+            String mobile = inPatientList[i].mobileNumber!.toUpperCase();
             String patientID = inPatientList[i].patientId.toString();
 
             if (firstName.contains(query.toUpperCase()) ||
@@ -372,11 +375,11 @@ class PatientSearchViewModel extends BaseViewModel {
           filteredInPatientItems.clear();
           for (var i = 0; i < localFilteredInPatientItems.length; i++) {
             String firstName =
-                localFilteredInPatientItems[i].firstName.toUpperCase();
+                localFilteredInPatientItems[i].firstName!.toUpperCase();
             String lastName =
-                localFilteredInPatientItems[i].lastName.toUpperCase();
+                localFilteredInPatientItems[i].lastName!.toUpperCase();
             String mobile =
-                localFilteredInPatientItems[i].mobileNumber.toUpperCase();
+                localFilteredInPatientItems[i].mobileNumber!.toUpperCase();
             String patientID =
                 localFilteredInPatientItems[i].patientId.toString();
 
@@ -407,7 +410,7 @@ class PatientSearchViewModel extends BaseViewModel {
     }
     await _specialClinicsService.getSpecialClinicalCareMappingList(clinicId);
     if (_specialClinicsService.hasError) {
-      error = _specialClinicsService.error;
+      error = _specialClinicsService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else {

lib/core/viewModel/SOAP_view_model.dart

@@ -94,7 +94,7 @@ class SOAPViewModel extends BaseViewModel {
   List<GetAssessmentResModel> get patientAssessmentList =>
       _SOAPService.patientAssessmentList;
 
-  int get episodeID => _SOAPService.episodeID;
+  int? get episodeID => _SOAPService.episodeID;
 
   bool isAddProgress = true;
   bool isAddExamInProgress = true;
@@ -114,7 +114,7 @@ class SOAPViewModel extends BaseViewModel {
   List<GetMedicationResponseModel> get allMedicationList =>
       _prescriptionService.allMedicationList;
 
-  SubjectiveCallBack subjectiveCallBack;
+  late SubjectiveCallBack subjectiveCallBack;
 
   setSubjectiveCallBack(SubjectiveCallBack callBack) {
     this.subjectiveCallBack = callBack;
@@ -124,7 +124,7 @@ class SOAPViewModel extends BaseViewModel {
     subjectiveCallBack.nextFunction(model);
   }
 
-  ObjectiveCallBack objectiveCallBack;
+  late ObjectiveCallBack objectiveCallBack;
 
   setObjectiveCallBack(ObjectiveCallBack callBack) {
     this.objectiveCallBack = callBack;
@@ -134,7 +134,7 @@ class SOAPViewModel extends BaseViewModel {
     objectiveCallBack.nextFunction(model);
   }
 
-  AssessmentCallBack assessmentCallBack;
+  late AssessmentCallBack assessmentCallBack;
 
   setAssessmentCallBack(AssessmentCallBack callBack) {
     this.assessmentCallBack = callBack;
@@ -144,7 +144,7 @@ class SOAPViewModel extends BaseViewModel {
     assessmentCallBack.nextFunction(model);
   }
 
-  PlanCallBack planCallBack;
+  late PlanCallBack planCallBack;
 
   setPlanCallBack(PlanCallBack callBack) {
     this.planCallBack = callBack;
@@ -158,7 +158,8 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _SOAPService.getAllergies(getAllergiesRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
+
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -172,7 +173,7 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Busy);
     await _SOAPService.getMasterLookup(masterKeys);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -182,7 +183,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.postEpisode(postEpisodeReqModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -195,7 +196,7 @@ class SOAPViewModel extends BaseViewModel {
     await _SOAPService.postEpisodeForInPatient(
         postEpisodeForInpatientRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -206,7 +207,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.postPhysicalExam(postPhysicalExamRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -217,7 +218,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.postProgressNote(postProgressNoteRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -228,7 +229,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.postAssessment(postAssessmentRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -239,7 +240,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.patchPhysicalExam(patchPhysicalExamRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -250,7 +251,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.patchProgressNote(patchProgressNoteRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -261,7 +262,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _SOAPService.patchAssessment(patchAssessmentRequestModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -275,7 +276,7 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Busy);
     await _SOAPService.getPatientAllergy(generalGetReqForSOAP);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else
@@ -287,21 +288,16 @@ class SOAPViewModel extends BaseViewModel {
   String getAllergicNames(isArabic) {
     String allergiesString = '';
     patientAllergiesList.forEach((element) {
-      MasterKeyModel selectedAllergy = getOneMasterKey(
+      MasterKeyModel? selectedAllergy = getOneMasterKey(
-          masterKeys: MasterKeysService.Allergies,
+          masterKeys: MasterKeysService.Allergies, id: element.allergyDiseaseId, typeId: element.allergyDiseaseType);
-          id: element.allergyDiseaseId,
+      if (selectedAllergy != null && element.isChecked!)
-          typeId: element.allergyDiseaseType);
+        allergiesString += (isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn)! + ' , ';
-      if (selectedAllergy != null && element.isChecked)
-        allergiesString +=
-            (isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn) +
-                ' , ';
     });
     return allergiesString;
   }
 
 
-  Future getPatientPhysicalExam(
+  Future getPatientPhysicalExam(PatiantInformtion patientInfo,
-    PatiantInformtion patientInfo,
   ) async {
     GetPhysicalExamReqModel getPhysicalExamReqModel = GetPhysicalExamReqModel(
       patientMRN: patientInfo.patientMRN,
@@ -314,36 +310,34 @@ class SOAPViewModel extends BaseViewModel {
               patientInfo.appointmentNo.toString(),
             ),
     );
-    if (patientInfo.admissionNo != null && patientInfo.admissionNo.isNotEmpty)
+    if (patientInfo.admissionNo != null && patientInfo.admissionNo!.isNotEmpty)
-      getPhysicalExamReqModel.admissionNo = int.parse(patientInfo.admissionNo);
+      getPhysicalExamReqModel.admissionNo = int.parse(patientInfo!.admissionNo!);
     else
       getPhysicalExamReqModel.admissionNo = 0;
     setState(ViewState.Busy);
     await _SOAPService.getPatientPhysicalExam(getPhysicalExamReqModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
   }
 
-  Future getPatientProgressNote(
+  Future getPatientProgressNote(GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
-      GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
     setState(ViewState.Busy);
     await _SOAPService.getPatientProgressNote(getGetProgressNoteReqModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
   }
 
-  Future getPatientAssessment(
+  Future getPatientAssessment(GetAssessmentReqModel getAssessmentReqModel) async {
-      GetAssessmentReqModel getAssessmentReqModel) async {
     setState(ViewState.Busy);
     await _SOAPService.getPatientAssessment(getAssessmentReqModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -353,7 +347,7 @@ class SOAPViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionService.getMedicationList();
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -364,11 +358,11 @@ class SOAPViewModel extends BaseViewModel {
     GetEpisodeForInpatientReqModel getEpisodeForInpatientReqModel =
         GetEpisodeForInpatientReqModel(
             patientID: patient.patientId,
-            admissionNo: int.parse(patient.admissionNo),
+            admissionNo: int.parse(patient!.admissionNo!),
             patientTypeID: 1);
     await _SOAPService.getEpisodeForInpatient(getEpisodeForInpatientReqModel);
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       patient.episodeNo = _SOAPService.episodeID;
@@ -377,13 +371,11 @@ class SOAPViewModel extends BaseViewModel {
   }
 
   // ignore: missing_return
-  MasterKeyModel getOneMasterKey(
+  MasterKeyModel? getOneMasterKey({@required MasterKeysService? masterKeys, dynamic id, int? typeId}) {
-      {@required MasterKeysService masterKeys, dynamic id, int typeId}) {
     switch (masterKeys) {
       case MasterKeysService.Allergies:
         List<MasterKeyModel> result = allergiesList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -392,8 +384,7 @@ class SOAPViewModel extends BaseViewModel {
 
       case MasterKeysService.HistoryFamily:
         List<MasterKeyModel> result = historyFamilyList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -401,8 +392,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.HistoryMedical:
         List<MasterKeyModel> result = historyMedicalList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -410,8 +400,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.HistorySocial:
         List<MasterKeyModel> result = historySocialList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -419,8 +408,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.HistorySports:
         List<MasterKeyModel> result = historySocialList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -436,8 +424,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.PhysicalExamination:
         List<MasterKeyModel> result = physicalExaminationList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -445,8 +432,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.AllergySeverity:
         List<MasterKeyModel> result = allergySeverityList.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -461,8 +447,7 @@ class SOAPViewModel extends BaseViewModel {
 
       case MasterKeysService.DiagnosisType:
         List<MasterKeyModel> result = listOfDiagnosisType.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -470,8 +455,7 @@ class SOAPViewModel extends BaseViewModel {
         break;
       case MasterKeysService.DiagnosisCondition:
         List<MasterKeyModel> result = listOfDiagnosisCondition.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys!.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -504,10 +488,9 @@ class SOAPViewModel extends BaseViewModel {
     GetChiefComplaintReqModel getChiefComplaintReqModel =
         GetChiefComplaintReqModel(
             admissionNo:
-                patientInfo
+                patientInfo!.admissionNo !=
-                            .admissionNo !=
                         null
-                    ? int.parse(patientInfo.admissionNo)
+                    ? int.parse(patientInfo!.admissionNo!)
                     : null,
             patientMRN: patientInfo.patientMRN,
             appointmentNo: patientInfo.appointmentNo != null
@@ -608,7 +591,7 @@ class SOAPViewModel extends BaseViewModel {
     final results = await Future.wait(services ?? []);
 
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -668,7 +651,7 @@ class SOAPViewModel extends BaseViewModel {
     final results = await Future.wait(services ?? []);
 
     if (_SOAPService.hasError || _prescriptionService.hasError) {
-      error = _SOAPService.error + _prescriptionService.error;
+      error = _SOAPService.error + _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -708,7 +691,7 @@ class SOAPViewModel extends BaseViewModel {
     final results = await Future.wait(services ?? []);
     if (allowSetState) {
       if (_SOAPService.hasError) {
-        error = _SOAPService.error;
+        error = _SOAPService.error!;
         setState(ViewState.ErrorLocal);
       } else
         setState(ViewState.Idle);
@@ -732,7 +715,7 @@ class SOAPViewModel extends BaseViewModel {
     }
 
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -740,11 +723,11 @@ class SOAPViewModel extends BaseViewModel {
 
   postSubjectServices(
       {patientInfo,
-      String complaintsText,
+      required String complaintsText,
-      String medicationText,
+      required String medicationText,
-      String illnessText,
+      required String illnessText,
-      List<MySelectedHistory> myHistoryList,
+      required List<MySelectedHistory> myHistoryList,
-      List<MySelectedAllergy> myAllergiesList}) async {
+      required List<MySelectedAllergy> myAllergiesList}) async {
     var services;
 
     PostChiefComplaintRequestModel postChiefComplaintRequestModel =
@@ -790,7 +773,7 @@ class SOAPViewModel extends BaseViewModel {
     final results = await Future.wait(services);
 
     if (_SOAPService.hasError) {
-      error = _SOAPService.error;
+      error = _SOAPService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -798,9 +781,9 @@ class SOAPViewModel extends BaseViewModel {
 
   PostChiefComplaintRequestModel createPostChiefComplaintRequestModel(
       {patientInfo,
-      String complaintsText,
+      required String complaintsText,
-      String medicationText,
+      required String medicationText,
-      String illnessText}) {
+      required String illnessText}) {
     return new PostChiefComplaintRequestModel(
         admissionNo: patientInfo.admissionNo != null
             ? int.parse(patientInfo.admissionNo)
@@ -818,13 +801,13 @@ class SOAPViewModel extends BaseViewModel {
   }
 
   PostHistoriesRequestModel createPostHistoriesRequestModel(
-      {patientInfo, List<MySelectedHistory> myHistoryList}) {
+      {patientInfo, required List<MySelectedHistory> myHistoryList}) {
     PostHistoriesRequestModel postHistoriesRequestModel =
         new PostHistoriesRequestModel(doctorID: '');
     myHistoryList.forEach((history) {
       if (postHistoriesRequestModel.listMedicalHistoryVM == null)
         postHistoriesRequestModel.listMedicalHistoryVM = [];
-      postHistoriesRequestModel.listMedicalHistoryVM.add(ListMedicalHistoryVM(
+      postHistoriesRequestModel.listMedicalHistoryVM!.add(ListMedicalHistoryVM(
         patientMRN: patientInfo.patientMRN,
         episodeId: patientInfo.episodeNo,
         appointmentNo: patientInfo.appointmentNo,
@@ -846,7 +829,7 @@ class SOAPViewModel extends BaseViewModel {
       if (postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM ==
           null)
         postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM = [];
-      postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM.add(
+      postAllergyRequestModel.listHisProgNotePatientAllergyDiseaseVM!.add(
           ListHisProgNotePatientAllergyDiseaseVM(
               allergyDiseaseId: allergy.selectedAllergy.id,
               allergyDiseaseType: allergy.selectedAllergy.typeId,

lib/core/viewModel/authentication_view_model.dart

@@ -26,9 +26,7 @@ import 'package:doctor_app_flutter/root_page.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
-import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:local_auth/auth_strings.dart';
 import 'package:local_auth/local_auth.dart';
@@ -59,20 +57,20 @@ class AuthenticationViewModel extends BaseViewModel {
   get checkActivationCodeForDoctorAppRes =>
       _authService.checkActivationCodeForDoctorAppRes;
 
-  NewLoginInformationModel loggedUser;
+  NewLoginInformationModel? loggedUser;
-  GetIMEIDetailsModel user;
+  GetIMEIDetailsModel? user;
 
   UserModel userInfo = UserModel();
   final LocalAuthentication auth = LocalAuthentication();
-  List<BiometricType> _availableBiometrics;
+  late List<BiometricType> _availableBiometrics;
-  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
 
   bool isLogin = false;
   bool unverified = false;
   bool isFromLogin = false;
   APP_STATUS appStatus = APP_STATUS.LOADING;
-  String localToken ="";
+  String localToken = "";
-  AuthenticationViewModel({bool checkDeviceInfo = false}) {
+  AuthenticationViewModel() {
     getDeviceInfoFromFirebase();
     getDoctorProfile();
   }
@@ -92,118 +90,137 @@ class AuthenticationViewModel extends BaseViewModel {
     profileInfo['LogInTypeID'] = await sharedPref.getInt(OTP_TYPE);
     profileInfo['BioMetricEnabled'] = true;
     profileInfo['MobileNo'] =
-    loggedIn != null ? loggedIn['MobileNumber'] : user.mobile;
+        loggedIn != null ? loggedIn['MobileNumber'] : user!.mobile;
-    InsertIMEIDetailsModel insertIMEIDetailsModel = InsertIMEIDetailsModel.fromJson(profileInfo);
+    InsertIMEIDetailsModel insertIMEIDetailsModel =
-    insertIMEIDetailsModel.genderDescription = profileInfo['Gender_Description'];
+        InsertIMEIDetailsModel.fromJson(profileInfo);
-    insertIMEIDetailsModel.genderDescriptionN = profileInfo['Gender_DescriptionN'];
+    insertIMEIDetailsModel.genderDescription =
-    insertIMEIDetailsModel.genderDescriptionN = profileInfo['Gender_DescriptionN'];
+        profileInfo['Gender_Description'];
+    insertIMEIDetailsModel.genderDescriptionN =
+        profileInfo['Gender_DescriptionN'];
+    insertIMEIDetailsModel.genderDescriptionN =
+        profileInfo['Gender_DescriptionN'];
     insertIMEIDetailsModel.titleDescription = profileInfo['Title_Description'];
-    insertIMEIDetailsModel.titleDescriptionN = profileInfo['Title_DescriptionN'];
+    insertIMEIDetailsModel.titleDescriptionN =
+        profileInfo['Title_DescriptionN'];
     insertIMEIDetailsModel.projectID = await sharedPref.getInt(PROJECT_ID);
     insertIMEIDetailsModel.doctorID = loggedIn != null
         ? loggedIn['List_MemberInformation'][0]['MemberID']
-        : user.doctorID;
+        : user!.doctorID;
-    insertIMEIDetailsModel.outSA = loggedIn != null ? loggedIn['PatientOutSA'] : user.outSA;
+    insertIMEIDetailsModel.outSA =
-    insertIMEIDetailsModel.vidaAuthTokenID = await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
+        loggedIn != null ? loggedIn['PatientOutSA'] : user!.outSA;
-    insertIMEIDetailsModel.vidaRefreshTokenID =await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
+    insertIMEIDetailsModel.vidaAuthTokenID =
+        await sharedPref.getString(VIDA_AUTH_TOKEN_ID);
+    insertIMEIDetailsModel.vidaRefreshTokenID =
+        await sharedPref.getString(VIDA_REFRESH_TOKEN_ID);
     insertIMEIDetailsModel.password = userInfo.password;
 
     await _authService.insertDeviceImei(insertIMEIDetailsModel);
     if (_authService.hasError) {
-      error = _authService.error;
+      error = _authService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
   }
 
-
   /// first step login
   Future login(UserModel userInfo) async {
     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);
+      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);
     }
   }
 
   /// send activation code for for msg methods
-  Future sendActivationCodeVerificationScreen( AuthMethodTypes authMethodType) async {
+  Future sendActivationCodeVerificationScreen(
+      AuthMethodTypes authMethodType) async {
     setState(ViewState.BusyLocal);
     ActivationCodeForVerificationScreenModel activationCodeModel =
-    ActivationCodeForVerificationScreenModel(
+        ActivationCodeForVerificationScreenModel(
-        iMEI: user.iMEI,
+            iMEI: user!.iMEI,
-        facilityId: user.projectID,
+            facilityId: user!.projectID,
-        memberID: user.doctorID,
+            memberID: user!.doctorID,
-        loginDoctorID: int.parse(user.editedBy.toString()),
+            loginDoctorID: int.parse(user!.editedBy.toString()),
-        zipCode: user.outSA == true ? '971' : '966',
+            zipCode: user!.outSA == true ? '971' : '966',
-        mobileNumber: user.mobile,
+            mobileNumber: user!.mobile,
-        oTPSendType: authMethodType.getTypeIdService(),
+            oTPSendType: authMethodType.getTypeIdService(),
-        isMobileFingerPrint: 1,
+            isMobileFingerPrint: 1,
-        vidaAuthTokenID: user.vidaAuthTokenID,
+            vidaAuthTokenID: user!.vidaAuthTokenID,
-        vidaRefreshTokenID: user.vidaRefreshTokenID);
+            vidaRefreshTokenID: user!.vidaRefreshTokenID);
-    await _authService.sendActivationCodeVerificationScreen(activationCodeModel);
+    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,
+      facilityId: projectID,
-        memberID: loggedUser.listMemberInformation[0].memberID,
+      memberID: loggedUser!.listMemberInformation![0].memberID,
-        loginDoctorID: loggedUser.listMemberInformation[0].employeeID,
+      loginDoctorID: loggedUser!.listMemberInformation![0].employeeID,
-        otpSendType: authMethodType.getTypeIdService().toString(),
+      otpSendType: authMethodType.getTypeIdService().toString(),
-        );
+    );
     await _authService.sendActivationCodeForDoctorApp(activationCodeModel);
     if (_authService.hasError) {
-      error = _authService.error;
+      error = _authService.error!;
       setState(ViewState.ErrorLocal);
     } else {
-     await sharedPref.setString(TOKEN,
+      await sharedPref.setString(
-          _authService.activationCodeForDoctorAppRes.logInTokenID);
+          TOKEN, _authService.activationCodeForDoctorAppRes.logInTokenID!);
       setState(ViewState.Idle);
     }
   }
 
 
   /// check activation code for sms and whats app
-  Future checkActivationCodeForDoctorApp({String activationCode,bool isSilentLogin = false}) async {
+  Future checkActivationCodeForDoctorApp(
+      {required String activationCode, bool isSilentLogin = false}) async {
     setState(ViewState.BusyLocal);
     CheckActivationCodeRequestModel checkActivationCodeForDoctorApp =
-    new CheckActivationCodeRequestModel(
+        new CheckActivationCodeRequestModel(
-        zipCode:
+            zipCode: loggedUser != null ? loggedUser!.zipCode : user!.zipCode,
-        loggedUser != null ? loggedUser.zipCode :user.zipCode,
+            mobileNumber:
-        mobileNumber:
+                loggedUser != null ? loggedUser!.mobileNumber : user!.mobile,
-        loggedUser != null ? loggedUser.mobileNumber : user.mobile,
+            projectID: await sharedPref.getInt(PROJECT_ID) != null
-        projectID: await sharedPref.getInt(PROJECT_ID) != null
+                ? await sharedPref.getInt(PROJECT_ID)
-            ? await sharedPref.getInt(PROJECT_ID)
+                : user!.projectID,
-            : user.projectID,
+            logInTokenID: await sharedPref.getString(TOKEN),
-        logInTokenID: await sharedPref.getString(TOKEN),
+            activationCode: activationCode,
-        activationCode: activationCode ?? '0000',
+            memberID: userInfo.userID != null
-        memberID:userInfo.userID!=null? int.parse(userInfo.userID):user.doctorID ,
+                ? int.parse(userInfo!.userID!)
-        password: userInfo.password,
+                : user!.doctorID,
-        facilityId:userInfo.projectID!=null? userInfo.projectID.toString():user.projectID.toString(),
+            password: userInfo.password,
-        oTPSendType: await sharedPref.getInt(OTP_TYPE),
+            facilityId: userInfo.projectID != null
-        iMEI: localToken,
+                ? userInfo.projectID.toString()
-        loginDoctorID:userInfo.userID!=null? int.parse(userInfo.userID):user.editedBy,// loggedUser.listMemberInformation[0].employeeID,
+                : user!.projectID.toString(),
-        isForSilentLogin:isSilentLogin,
+            oTPSendType: await sharedPref.getInt(OTP_TYPE),
-        generalid: "Cs2020@2016\$2958");
+            iMEI: localToken,
-    await _authService.checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp);
+            loginDoctorID: userInfo.userID != null
+                ? int.parse(userInfo!.userID!)
+                : user!
+                    .editedBy, // loggedUser.listMemberInformation[0].employeeID,
+            isForSilentLogin: isSilentLogin,
+            generalid: "Cs2020@2016\$2958");
+    await _authService
+        .checkActivationCodeForDoctorApp(checkActivationCodeForDoctorApp);
     if (_authService.hasError) {
-      error = _authService.error;
+      error = _authService.error!;
       setState(ViewState.ErrorLocal);
     } else {
      await setDataAfterSendActivationSuccess(checkActivationCodeForDoctorAppRes);
@@ -213,11 +230,12 @@ class AuthenticationViewModel extends BaseViewModel {
 
   /// get list of Hospitals
   Future getHospitalsList(memberID) async {
-    GetHospitalsRequestModel getHospitalsRequestModel =GetHospitalsRequestModel();
+    GetHospitalsRequestModel getHospitalsRequestModel =
+        GetHospitalsRequestModel();
     getHospitalsRequestModel.memberID = memberID;
     await _hospitalsService.getHospitals(getHospitalsRequestModel);
     if (_hospitalsService.hasError) {
-      error = _hospitalsService.error;
+      error = _hospitalsService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -252,14 +270,16 @@ class AuthenticationViewModel extends BaseViewModel {
   }
 
   /// add  token to shared preferences in case of send activation code is success
-  setDataAfterSendActivationSuccess(CheckActivationCodeForDoctorAppResponseModel sendActivationCodeForDoctorAppResponseModel)async {
+  setDataAfterSendActivationSuccess(
-     // print("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
+      CheckActivationCodeForDoctorAppResponseModel
-   await sharedPref.setString(VIDA_AUTH_TOKEN_ID,
+          sendActivationCodeForDoctorAppResponseModel) async {
-        sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID);
+    // print("VerificationCode : " + sendActivationCodeForDoctorAppResponseModel.verificationCode);
-   await  sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
+    await sharedPref.setString(VIDA_AUTH_TOKEN_ID,
-        sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID);
+        sendActivationCodeForDoctorAppResponseModel.vidaAuthTokenID!);
-   await  sharedPref.setString(TOKEN,
+    await sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
-        sendActivationCodeForDoctorAppResponseModel.authenticationTokenID);
+        sendActivationCodeForDoctorAppResponseModel.vidaRefreshTokenID!);
+    await sharedPref.setString(TOKEN,
+        sendActivationCodeForDoctorAppResponseModel.authenticationTokenID!);
   }
 
   saveObjToString(String key, value) async {
@@ -297,10 +317,12 @@ class AuthenticationViewModel extends BaseViewModel {
         clinicID: clinicInfo.clinicID,
         license: true,
         projectID: clinicInfo.projectID,
-        languageID: 2);///TODO change the lan
+        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);
@@ -311,32 +333,26 @@ class AuthenticationViewModel extends BaseViewModel {
   /// add some logic in case of check activation code is success
   onCheckActivationCodeSuccess({bool isSilentLogin = false}) async {
     sharedPref.setString(
-        TOKEN,
+        TOKEN, checkActivationCodeForDoctorAppRes.authenticationTokenID!);
-        checkActivationCodeForDoctorAppRes.authenticationTokenID);
     if (checkActivationCodeForDoctorAppRes.listDoctorProfile != null &&
-        checkActivationCodeForDoctorAppRes.listDoctorProfile
+        checkActivationCodeForDoctorAppRes.listDoctorProfile!.isNotEmpty) {
-            .isNotEmpty) {
       localSetDoctorProfile(
-          checkActivationCodeForDoctorAppRes.listDoctorProfile[0]);
+          checkActivationCodeForDoctorAppRes.listDoctorProfile![0]);
     } else {
       sharedPref.setObj(
-          CLINIC_NAME,
+          CLINIC_NAME, checkActivationCodeForDoctorAppRes.listDoctorsClinic);
-          checkActivationCodeForDoctorAppRes.listDoctorsClinic);
       ClinicModel clinic = ClinicModel.fromJson(
-          checkActivationCodeForDoctorAppRes.listDoctorsClinic[0]
+          checkActivationCodeForDoctorAppRes.listDoctorsClinic![0].toJson());
-              .toJson());
       await getDoctorProfileBasedOnClinic(clinic);
     }
   }
 
   /// check specific biometric if it available or not
-  Future <bool> checkIfBiometricAvailable(BiometricType biometricType)  async {
+  Future<bool> checkIfBiometricAvailable(BiometricType biometricType) async {
     bool isAvailable = false;
     await _getAvailableBiometrics();
-    if (_availableBiometrics != null) {
+    for (var i = 0; i < _availableBiometrics.length; i++) {
-      for (var i = 0; i < _availableBiometrics.length; i++) {
+      if (biometricType == _availableBiometrics[i]) isAvailable = true;
-        if (biometricType == _availableBiometrics[i]) isAvailable = true;
-      }
     }
     return isAvailable;
   }
@@ -354,26 +370,26 @@ class AuthenticationViewModel extends BaseViewModel {
   getDeviceInfoFromFirebase() async {
     _firebaseMessaging.setAutoInitEnabled(true);
     if (Platform.isIOS) {
-      _firebaseMessaging.requestNotificationPermissions();
+      _firebaseMessaging.requestPermission();
     }
-      setState(ViewState.Busy);
+    setState(ViewState.Busy);
     var token = await _firebaseMessaging.getToken();
     if (localToken == "") {
-      localToken = token;
+      localToken = token!;
 
       await _authService.selectDeviceImei(localToken);
       if (_authService.hasError) {
-        error = _authService.error;
+        error = _authService.error!;
         setState(ViewState.ErrorLocal);
       } else {
         if (_authService.dashboardItemsList.length > 0) {
-          user =_authService.dashboardItemsList[0];
+          user = _authService.dashboardItemsList[0];
           sharedPref.setObj(
               LAST_LOGIN_USER, _authService.dashboardItemsList[0]);
-          await  sharedPref.setString(VIDA_REFRESH_TOKEN_ID,
+          await sharedPref.setString(
-              user.vidaRefreshTokenID);
+              VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!);
-          await  sharedPref.setString(VIDA_AUTH_TOKEN_ID,
+          await sharedPref.setString(
-              user.vidaAuthTokenID);
+              VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!);
           this.unverified = true;
         }
         setState(ViewState.Idle);
@@ -388,9 +404,9 @@ class AuthenticationViewModel extends BaseViewModel {
     if (state == ViewState.Busy) {
       appStatus = APP_STATUS.LOADING;
     } else {
-      if(this.doctorProfile !=null)
+      if (this.doctorProfile != null)
         appStatus = APP_STATUS.AUTHENTICATED;
-     else if (this.unverified) {
+      else if (this.unverified) {
         appStatus = APP_STATUS.UNVERIFIED;
       } else if (this.isLogin) {
         appStatus = APP_STATUS.AUTHENTICATED;
@@ -405,7 +421,7 @@ class AuthenticationViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  setUnverified(bool unverified,{bool isFromLogin = false}){
+  setUnverified(bool unverified, {bool isFromLogin = false}) {
     this.unverified = unverified;
     this.isFromLogin = isFromLogin;
     notifyListeners();
@@ -413,21 +429,19 @@ class AuthenticationViewModel extends BaseViewModel {
 
   /// logout function
   logout({bool isFromLogin = false}) async {
-
-
     localToken = "";
-      String lang = await sharedPref.getString(APP_Language);
+    String lang = await sharedPref.getString(APP_Language);
-      await Helpers.clearSharedPref();
+    await Helpers.clearSharedPref();
-      doctorProfile = null;
+    doctorProfile = null;
-      sharedPref.setString(APP_Language, lang);
+    sharedPref.setString(APP_Language, lang);
-      deleteUser();
+    deleteUser();
-      await getDeviceInfoFromFirebase();
+    await getDeviceInfoFromFirebase();
-      this.isFromLogin = isFromLogin;
+    this.isFromLogin = isFromLogin;
-      appStatus = APP_STATUS.UNAUTHENTICATED;
+    appStatus = APP_STATUS.UNAUTHENTICATED;
-      setState(ViewState.Idle);
+    setState(ViewState.Idle);
   }
 
-  deleteUser(){
+  deleteUser() {
     user = null;
     unverified = false;
     isLogin = false;

lib/core/viewModel/dashboard_view_model.dart

@@ -13,7 +13,7 @@ import 'base_view_model.dart';
 
 
 class DashboardViewModel extends BaseViewModel {
-  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
+  final FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
   DashboardService _dashboardService = locator<DashboardService>();
   SpecialClinicsService _specialClinicsService =
       locator<SpecialClinicsService>();
@@ -24,15 +24,14 @@ class DashboardViewModel extends BaseViewModel {
 
   bool get hasVirtualClinic => _dashboardService.hasVirtualClinic;
 
-  String get sServiceID => _dashboardService.sServiceID;
+  String? get sServiceID => _dashboardService.sServiceID;
 
   int get notRepliedCount => _doctorReplyService.notRepliedCount;
 
-  List<GetSpecialClinicalCareListResponseModel> get specialClinicalCareList =>
+List<GetSpecialClinicalCareListResponseModel> get specialClinicalCareList =>
       _specialClinicsService.specialClinicalCareList;
 
-  Future startHomeScreenServices(ProjectViewModel projectsProvider,
+  Future startHomeScreenServices(ProjectViewModel projectsProvider, AuthenticationViewModel authProvider) async {
-      AuthenticationViewModel authProvider) async {
     setState(ViewState.Busy);
     await getDoctorProfile(isGetProfile: true);
 
@@ -44,7 +43,7 @@ class DashboardViewModel extends BaseViewModel {
     ]);
 
     if (_dashboardService.hasError) {
-      error = _dashboardService.error;
+      error = _dashboardService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -53,17 +52,11 @@ class DashboardViewModel extends BaseViewModel {
   }
 
   Future setFirebaseNotification(AuthenticationViewModel authProvider) async {
-    _firebaseMessaging.requestNotificationPermissions(
+    _firebaseMessaging.requestPermission(sound: true, badge: true, alert: true, provisional: true);
-        const IosNotificationSettings(
-            sound: true, badge: true, alert: true, provisional: true));
-    _firebaseMessaging.onIosSettingsRegistered
-        .listen((IosNotificationSettings settings) {
-      print("Settings registered: $settings");
-    });
 
-    _firebaseMessaging.getToken().then((String token) async {
+    _firebaseMessaging.getToken().then((String? token) async {
       if (token != '') {
-        // DEVICE_TOKEN = token;
+        // DEVICE_TOKEN = token!;
         authProvider.insertDeviceImei(token);
       }
     });
@@ -83,7 +76,7 @@ class DashboardViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _specialClinicsService.getSpecialClinicalCareList();
     // if (_specialClinicsService.hasError) {
-    //   error = _specialClinicsService.error;
+    //   error = _specialClinicsService.error!;
     //   setState(ViewState.Error);
     // } else
     //   setState(ViewState.Idle);
@@ -100,19 +93,19 @@ class DashboardViewModel extends BaseViewModel {
     );
     await authProvider.getDoctorProfileBasedOnClinic(clinicModel);
     if (authProvider.state == ViewState.ErrorLocal) {
-      error = authProvider.error;
+      error = authProvider.error!;
     }
   }
 
   getPatientCount(DashboardModel inPatientCount) {
     int value = 0;
-    inPatientCount.summaryoptions.forEach((result) => {value += result.value});
+    inPatientCount.summaryoptions!.forEach((result) => {value += result.value!});
 
     return value.toString();
   }
 
-  GetSpecialClinicalCareListResponseModel getSpecialClinic(clinicId) {
+  GetSpecialClinicalCareListResponseModel? getSpecialClinic(clinicId) {
-    GetSpecialClinicalCareListResponseModel special;
+    GetSpecialClinicalCareListResponseModel? special;
     specialClinicalCareList.forEach((element) {
       if (element.clinicID == clinicId) {
         special = element;
@@ -127,7 +120,7 @@ class DashboardViewModel extends BaseViewModel {
     await getDoctorProfile();
     await _doctorReplyService.getNotRepliedCount();
     if (_doctorReplyService.hasError) {
-      error = _doctorReplyService.error;
+      error = _doctorReplyService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       notifyListeners();

lib/core/viewModel/doctor_replay_view_model.dart

@@ -34,7 +34,7 @@ class DoctorReplayViewModel extends BaseViewModel {
     await _doctorReplyService.getDoctorReply(_requestDoctorReply,
         clearData: !isLocalBusy, isGettingNotReply: isGettingNotReply);
     if (_doctorReplyService.hasError) {
-      error = _doctorReplyService.error;
+      error = _doctorReplyService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else {
@@ -52,13 +52,13 @@ class DoctorReplayViewModel extends BaseViewModel {
             transactionNo: model.transactionNo.toString(),
             doctorResponse: response,
             infoStatus: 6,
-            createdBy: this.doctorProfile!.doctorID,
+            createdBy: this.doctorProfile!.doctorID!,
-            infoEnteredBy: this.doctorProfile!.doctorID,
+            infoEnteredBy: this.doctorProfile!.doctorID!,
             setupID: "010266");
     setState(ViewState.BusyLocal);
     await _doctorReplyService.createDoctorResponse(createDoctorResponseModel);
     if (_doctorReplyService.hasError) {
-      error = _doctorReplyService.error;
+      error = _doctorReplyService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/hospitals_view_model.dart

@@ -19,7 +19,7 @@ class HospitalViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _hospitalsService.getHospitals(getHospitalsRequestModel);
     if (_hospitalsService.hasError) {
-      error = _hospitalsService.error;
+      error = _hospitalsService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/labs_view_model.dart

@@ -32,7 +32,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) {
@@ -46,7 +46,7 @@ class LabsViewModel extends BaseViewModel {
               .add(element);
         } else {
           _patientLabOrdersListClinic
-              .add(PatientLabOrdersList(filterName: element.clinicDescription, patientDoctorAppointment: element));
+              .add(PatientLabOrdersList(filterName: element.clinicDescription!, patientDoctorAppointment: element));
         }
 
         //   doctor list sort via project
@@ -62,7 +62,7 @@ class LabsViewModel extends BaseViewModel {
               .add(element);
         } else {
           _patientLabOrdersListHospital
-              .add(PatientLabOrdersList(filterName: element.projectName, patientDoctorAppointment: element));
+              .add(PatientLabOrdersList(filterName: element.projectName!, patientDoctorAppointment: element));
         }
       });
 
@@ -86,12 +86,12 @@ class LabsViewModel extends BaseViewModel {
   }
 
   getLaboratoryResult(
-      {String projectID,
+      {required String projectID,
-      int clinicID,
+      required int clinicID,
-      String invoiceNo,
+      required String invoiceNo,
-      String orderNo,
+      required String orderNo,
-      PatiantInformtion patient,
+      required PatiantInformtion patient,
-      bool isInpatient}) async {
+      required bool isInpatient}) async {
     setState(ViewState.Busy);
     await _labsService.getLaboratoryResult(
         invoiceNo: invoiceNo,
@@ -101,19 +101,21 @@ class LabsViewModel extends BaseViewModel {
         patient: patient,
         isInpatient: isInpatient);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getPatientLabResult({PatientLabOrders patientLabOrder, PatiantInformtion patient, bool isInpatient}) async {
+  getPatientLabResult({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);
@@ -128,23 +130,25 @@ class LabsViewModel extends BaseViewModel {
       if (patientLabOrdersClinic.length != 0) {
         labResultLists[labResultLists.indexOf(patientLabOrdersClinic[0])].patientLabResultList.add(element);
       } else {
-        labResultLists.add(LabResultList(filterName: element.testCode, lab: element));
+        labResultLists.add(LabResultList(filterName: element.testCode!, lab: element));
       }
     });
   }
 
-  getPatientLabOrdersResults({PatientLabOrders patientLabOrder, String procedure, PatiantInformtion patient}) async {
+  getPatientLabOrdersResults({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)
+          if (element.resultValue!.contains('/') || element.resultValue!.contains('*') || element.resultValue!.isEmpty)
             isShouldClear = true;
         });
       }
@@ -154,31 +158,31 @@ class LabsViewModel extends BaseViewModel {
   }
 
   getPatientLabResultHistoryByDescription(
-      {PatientLabOrders patientLabOrder, String procedureDescription, PatiantInformtion patient}) async {
+      {required PatientLabOrders patientLabOrder, required String procedureDescription, required PatiantInformtion patient}) async {
     setState(ViewState.Busy);
     await _labsService.getPatientLabOrdersResultHistoryByDescription(
         patientLabOrder: patientLabOrder, procedureDescription: procedureDescription, patient: patient);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  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);
   }
 
-  Future getAllSpecialLabResult({int patientId}) async {
+  Future getAllSpecialLabResult({required int patientId}) async {
     setState(ViewState.Busy);
     await _labsService.getAllSpecialLabResult(mrn: patientId);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/leave_rechdule_response.dart

@@ -1,16 +1,16 @@
 class GetRescheduleLeavesResponse {
-  int clinicId;
+  int? clinicId;
   var coveringDoctorId;
-  String date;
+  String? date;
-  String dateTimeFrom;
+  String? dateTimeFrom;
-  String dateTimeTo;
+  String? dateTimeTo;
-  int doctorId;
+  int? doctorId;
-  int reasonId;
+  int? reasonId;
-  int requisitionNo;
+  int? requisitionNo;
-  int requisitionType;
+  int? requisitionType;
-  int status;
+  int? status;
-  String createdOn;
+  String? createdOn;
-  String statusDescription;
+  String? statusDescription;
   GetRescheduleLeavesResponse(
       {this.clinicId,
       this.coveringDoctorId,

lib/core/viewModel/livecare_view_model.dart

@@ -16,7 +16,7 @@ class LiveCareViewModel with ChangeNotifier {
   DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
 
   List<LiveCarePendingListResponse> liveCarePendingList = [];
-  StartCallRes inCallResponse;
+  late StartCallRes inCallResponse;
   var transferToAdmin = {};
   var endCallResponse = {};
   bool isFinished = true;

lib/core/viewModel/medical_file_view_model.dart

@@ -11,13 +11,13 @@ class MedicalFileViewModel extends BaseViewModel {
   List<MedicalFileModel> 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);

lib/core/viewModel/medicine_view_model.dart

@@ -42,13 +42,13 @@ class MedicineViewModel extends BaseViewModel {
   List<dynamic> get itemMedicineListRoute => _prescriptionService.itemMedicineListRoute;
   List<dynamic> 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({String? drug}) async {
     setState(ViewState.Busy);
-    await _prescriptionService.getMedicationList(drug: drug);
+    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,19 @@ 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 +201,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);

lib/core/viewModel/patient-admission-request-viewmodel.dart

@@ -39,7 +39,7 @@ class AdmissionRequestViewModel extends BaseViewModel {
   List<dynamic> 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);

lib/core/viewModel/patient-referral-viewmodel.dart

@@ -54,7 +54,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) {
@@ -69,7 +69,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();
@@ -79,7 +79,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);
@@ -91,7 +91,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);
@@ -101,7 +101,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();
@@ -113,9 +113,9 @@ class PatientReferralViewModel extends BaseViewModel {
   }
 
   Future<dynamic> getDoctorBranch() async {
-    DoctorProfileModel doctorProfile = await getDoctorProfile();
+    DoctorProfileModel? doctorProfile = await getDoctorProfile();
     if (doctorProfile != null) {
-      dynamic _selectedBranch = {"facilityId": doctorProfile!.projectID, "facilityName": doctorProfile!.projectName};
+      dynamic _selectedBranch = {"facilityId": doctorProfile.projectID, "facilityName": doctorProfile.projectName};
       return _selectedBranch;
     }
     return null;
@@ -128,7 +128,7 @@ class PatientReferralViewModel extends BaseViewModel {
       setState(ViewState.BusyLocal);
     await _referralPatientService.getMyReferredPatient();
     if (_referralPatientService.hasError) {
-      error = _referralPatientService.error;
+      error = _referralPatientService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -141,7 +141,7 @@ class PatientReferralViewModel extends BaseViewModel {
       setState(ViewState.BusyLocal);
     await _referralPatientService.getMyReferredOutPatient();
     if (_referralPatientService.hasError) {
-      error = _referralPatientService.error;
+      error = _referralPatientService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -155,7 +155,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);
@@ -168,7 +168,7 @@ class PatientReferralViewModel extends BaseViewModel {
       setState(ViewState.Busy);
     await _myReferralService.getMyReferralPatientService();
     if (_myReferralService.hasError) {
-      error = _myReferralService.error;
+      error = _myReferralService.error!;
       if (localBusy)
         setState(ViewState.ErrorLocal);
       else
@@ -184,7 +184,7 @@ class PatientReferralViewModel extends BaseViewModel {
       setState(ViewState.Busy);
     await _myReferralService.getMyReferralOutPatientService();
     if (_myReferralService.hasError) {
-      error = _myReferralService.error;
+      error = _myReferralService.error!;
       if (localBusy)
         setState(ViewState.ErrorLocal);
       else
@@ -197,7 +197,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();
@@ -207,7 +207,7 @@ class PatientReferralViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _referralPatientService.responseReferral(referralPatient, isAccepted);
     if (_referralPatientService.hasError) {
-      error = _referralPatientService.error;
+      error = _referralPatientService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -218,7 +218,7 @@ class PatientReferralViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     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);
@@ -226,21 +226,21 @@ class PatientReferralViewModel extends BaseViewModel {
   }
 
   Future makeInPatientReferral(
-      {PatiantInformtion patient,
+      {required PatiantInformtion patient,
-      int projectID,
+      required int projectID,
-      int clinicID,
+      required int clinicID,
-      int doctorID,
+      required int doctorID,
-      int frequencyCode,
+      required int frequencyCode,
-      int priority,
+      required int priority,
-      String referralDate,
+      required String referralDate,
-      String remarks,
+      required String remarks,
-      String ext}) async {
+      required String ext}) async {
     setState(ViewState.Busy);
     await _referralService.referralPatient(
       patientID: patient.patientId,
       roomID: patient.roomId,
       referralClinic: clinicID,
-      admissionNo: int.parse(patient.admissionNo),
+      admissionNo: int.parse(patient.admissionNo!),
       referralDoctor: doctorID,
       patientTypeID: patient.patientType,
       referringDoctorRemarks: remarks,
@@ -249,7 +249,7 @@ class PatientReferralViewModel extends BaseViewModel {
       extension: ext,
     );
     if (_referralService.hasError) {
-      error = _referralService.error;
+      error = _referralService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -262,7 +262,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);
@@ -272,7 +272,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();
@@ -284,7 +284,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);
@@ -389,7 +389,7 @@ class PatientReferralViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _myReferralService.replayReferred(referredDoctorRemarks, referral, referralStatus);
     if (_myReferralService.hasError) {
-      error = _myReferralService.error;
+      error = _myReferralService.error!;
       setState(ViewState.ErrorLocal);
     } else
       getMyReferralPatientService();

lib/core/viewModel/patient-ucaf-viewmodel.dart

@@ -29,16 +29,15 @@ class UcafViewModel extends BaseViewModel {
 
   List<MasterKeyModel> get diagnosisTypes => _ucafService.listOfDiagnosisType;
 
-  List<MasterKeyModel> get diagnosisConditions =>
+  List<MasterKeyModel> get diagnosisConditions => _ucafService.listOfDiagnosisCondition;
-      _ucafService.listOfDiagnosisCondition;
 
-  PrescriptionModel get prescriptionList => _ucafService.prescriptionList;
+  PrescriptionModel? get prescriptionList => _ucafService.prescriptionList;
 
   List<OrderProcedure> get orderProcedures => _ucafService.orderProcedureList;
 
-  Function saveUCAFOnTap;
+  late Function saveUCAFOnTap;
 
-  String selectedLanguage;
+  late String selectedLanguage;
   String heightCm = "0";
   String weightKg = "0";
   String bodyMax = "0";
@@ -49,8 +48,8 @@ class UcafViewModel extends BaseViewModel {
 
   resetDataInFirst({bool firstPage = true}) {
     if(firstPage){
-      _ucafService.patientVitalSignsHistory = null;
+      _ucafService.patientVitalSignsHistory = [];
-      _ucafService.patientChiefComplaintList = null;
+      _ucafService.patientChiefComplaintList = [];
     }
     _ucafService.patientAssessmentList = [];
     _ucafService.orderProcedureList = [];
@@ -66,48 +65,39 @@ class UcafViewModel extends BaseViewModel {
 
     String from;
     String to;
-    if (from == null || from == "0") {
+
-      from = AppDateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
+    from = AppDateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
-    }
+
-    if (to == null || to == "0") {
+    to = AppDateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd');
-      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" ||
+        if (temperatureCelcius == "0" || temperatureCelcius == 'null') {
-            temperatureCelcius == null ||
-            temperatureCelcius == 'null') {
           temperatureCelcius = element.temperatureCelcius.toString();
         }
         if (hartRat == "0" || hartRat == null || hartRat == 'null') {
           hartRat = element.pulseBeatPerMinute.toString();
         }
-        if (respirationBeatPerMinute == "0" ||
+        if (respirationBeatPerMinute == "0" || respirationBeatPerMinute == null || respirationBeatPerMinute == 'null') {
-            respirationBeatPerMinute == null ||
+          respirationBeatPerMinute = element.respirationBeatPerMinute.toString();
-            respirationBeatPerMinute == 'null') {
-          respirationBeatPerMinute =
-              element.respirationBeatPerMinute.toString();
         }
-        if (bloodPressure == "0 / 0" ||
+        if (bloodPressure == "0 / 0" || bloodPressure == null || bloodPressure == 'null') {
-            bloodPressure == null ||
-            bloodPressure == 'null') {
           bloodPressure = element.bloodPressure.toString();
         }
       });
@@ -121,19 +111,18 @@ 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) {
           if (diagnosisConditions.length == 0) {
-            await _ucafService
+            await _ucafService.getMasterLookup(MasterKeysService.DiagnosisCondition);
-                .getMasterLookup(MasterKeysService.DiagnosisCondition);
           }
           if (diagnosisTypes.length == 0) {
             await _ucafService.getMasterLookup(MasterKeysService.DiagnosisType);
           }
           if (_ucafService.hasError) {
-            error = _ucafService.error;
+            error = _ucafService.error!;
             setState(ViewState.Error);
           } else
             setState(ViewState.Idle);
@@ -148,7 +137,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);
@@ -161,7 +150,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);
@@ -169,13 +158,11 @@ class UcafViewModel extends BaseViewModel {
     }
   }
 
-  MasterKeyModel findMasterDataById(
+  MasterKeyModel? findMasterDataById({required MasterKeysService masterKeys, dynamic id}) {
-      {@required MasterKeysService masterKeys, dynamic id}) {
     switch (masterKeys) {
       case MasterKeysService.DiagnosisCondition:
         List<MasterKeyModel> result = diagnosisConditions.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -183,8 +170,7 @@ class UcafViewModel extends BaseViewModel {
         return null;
       case MasterKeysService.DiagnosisType:
         List<MasterKeyModel> result = diagnosisTypes.where((element) {
-          return element.id == id &&
+          return element.id == id && element.typeId == masterKeys.getMasterKeyService();
-              element.typeId == masterKeys.getMasterKeyService();
         }).toList();
         if (result.isNotEmpty) {
           return result.first;
@@ -199,7 +185,7 @@ class UcafViewModel extends BaseViewModel {
     // setState(ViewState.Busy);
     await _ucafService.postUCAF(patient);
     if (_ucafService.hasError) {
-      error = _ucafService.error;
+      error = _ucafService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle); // but with empty list

lib/core/viewModel/patient-vital-sign-viewmodel.dart

@@ -11,7 +11,7 @@ import '../../locator.dart';
 class VitalSignsViewModel extends BaseViewModel {
   VitalSignsService _vitalSignService = locator<VitalSignsService>();
 
-  VitalSignData get patientVitalSigns => _vitalSignService.patientVitalSigns;
+  VitalSignData? get patientVitalSigns => _vitalSignService.patientVitalSigns;
 
   List<VitalSignHistory> get patientVitalSignsHistory =>
       _vitalSignService.patientVitalSignsHistory;
@@ -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) {
@@ -150,7 +150,7 @@ class VitalSignsViewModel extends BaseViewModel {
     }
   }
 
-  String getTempratureMethod(int temperatureCelciusMethod) {
+  String? getTempratureMethod(int temperatureCelciusMethod) {
     // temperatureCelciusMethod ( vital sign response field )- master 2005
     if (temperatureCelciusMethod == 1) {
       return "Oral";

lib/core/viewModel/patient_view_model.dart

@@ -83,7 +83,7 @@ class PatientViewModel extends BaseViewModel {
         isView: isView);
 
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
@@ -95,7 +95,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);
@@ -105,7 +105,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);
@@ -115,7 +115,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);
@@ -125,7 +125,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);
@@ -135,7 +135,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);
@@ -145,7 +145,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);
@@ -155,7 +155,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);
@@ -170,7 +170,7 @@ class PatientViewModel extends BaseViewModel {
 
     await _patientService.getPatientProgressNote(patient);
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       if (isLocalBusy) {
         setState(ViewState.ErrorLocal);
       } else {
@@ -184,7 +184,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);
@@ -194,7 +194,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);
@@ -204,7 +204,7 @@ class PatientViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _patientService.getClinicsList();
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       setState(ViewState.Error);
     } else {
       {
@@ -218,7 +218,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 {
       {
@@ -246,7 +246,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);
@@ -260,17 +260,17 @@ class PatientViewModel extends BaseViewModel {
   }
 
   Future referToDoctor(
-      {String selectedDoctorID,
+      {required String selectedDoctorID,
-      String selectedClinicID,
+      required String selectedClinicID,
-      int admissionNo,
+      required int admissionNo,
-      String extension,
+      required String extension,
-      String priority,
+      required String priority,
-      String frequency,
+      required String frequency,
-      String referringDoctorRemarks,
+      required String referringDoctorRemarks,
-      int patientID,
+      required int patientID,
-      int patientTypeID,
+      required int patientTypeID,
-      String roomID,
+      required String roomID,
-      int projectID}) async {
+      required int projectID}) async {
     setState(ViewState.BusyLocal);
     await _patientService.referToDoctor(
         selectedClinicID: selectedClinicID,
@@ -285,7 +285,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);
@@ -295,7 +295,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);
@@ -308,7 +308,7 @@ class PatientViewModel extends BaseViewModel {
 
     await _patientService.getInPatient(requestModel, false);
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       // setDefaultInPatientList();
@@ -323,7 +323,7 @@ class PatientViewModel extends BaseViewModel {
 
     await _patientService.getNursingProgressNote(requestModel);
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -337,7 +337,7 @@ class PatientViewModel extends BaseViewModel {
 
     await _patientService.getDiagnosisForInPatient(requestModel);
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -355,14 +355,14 @@ class PatientViewModel extends BaseViewModel {
     GetDiabeticChartValuesRequestModel requestModel =
         GetDiabeticChartValuesRequestModel(
             patientID: patient.patientId,
-            admissionNo: int.parse(patient.admissionNo),
+            admissionNo: int.parse(patient.admissionNo!),
             patientTypeID: 1,
             patientType: 1,
             resultType: resultType,
             setupID: "010266");
     await _patientService.getDiabeticChartValues(requestModel);
     if (_patientService.hasError) {
-      error = _patientService.error;
+      error = _patientService.error!;
       if (isLocalBusy)
         setState(ViewState.ErrorLocal);
       else

lib/core/viewModel/pednding_orders_view_model.dart

@@ -15,26 +15,26 @@ class PendingOrdersViewModel extends BaseViewModel {
   List<AdmissionOrdersModel> get admissionOrderList =>
       _pendingOrderService.admissionOrderList;
 
-  Future getPendingOrders({int patientId, int admissionNo}) async {
+  Future getPendingOrders({required int patientId, required int admissionNo}) async {
     hasError = false;
     setState(ViewState.Busy);
     await _pendingOrderService.getPendingOrders(
         patientId: patientId, admissionNo: admissionNo);
     if (_pendingOrderService.hasError) {
-      error = _pendingOrderService.error;
+      error = _pendingOrderService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  Future getAdmissionOrders({int patientId, int admissionNo}) async {
+  Future getAdmissionOrders({required int patientId, required int admissionNo}) async {
     hasError = false;
     setState(ViewState.Busy);
     await _pendingOrderService.getAdmissionOrders(
         patientId: patientId, admissionNo: admissionNo);
     if (_pendingOrderService.hasError) {
-      error = _pendingOrderService.error;
+      error = _pendingOrderService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/prescription_view_model.dart

@@ -68,25 +68,25 @@ class PrescriptionViewModel extends BaseViewModel {
     }
   }
 
-  Future getItem({int itemID}) async {
+  Future getItem({int? itemID}) async {
     hasError = false;
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.BusyLocal);
     await _prescriptionService.getItem(itemID: itemID);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
   }
 
-  Future getPrescription({int mrn}) async {
+  Future getPrescription({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);
@@ -98,7 +98,7 @@ class PrescriptionViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionService.postPrescription(postProcedureReqModel);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       await getPrescription(mrn: mrn);
@@ -106,11 +106,11 @@ class PrescriptionViewModel extends BaseViewModel {
     }
   }
 
-  Future getMedicationList({String drug}) async {
+  Future getMedicationList({String? drug}) async {
     setState(ViewState.Busy);
-    await _prescriptionService.getMedicationList(drug: drug);
+    await _prescriptionService.getMedicationList(drug: drug!);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -122,7 +122,7 @@ class PrescriptionViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionService.updatePrescription(updatePrescriptionReqModel);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       await getPrescription(mrn: mrn);
@@ -130,13 +130,13 @@ class PrescriptionViewModel extends BaseViewModel {
     }
   }
 
-  Future getDrugs({String drugName}) async {
+  Future getDrugs({String? drugName}) async {
     hasError = false;
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.BusyLocal);
     await _prescriptionService.getDrugs(drugName: drugName);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -148,7 +148,7 @@ class PrescriptionViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionService.getDrugToDrug(vital, lstAssessments, allergy, patient, prescription);
     if (_prescriptionService.hasError) {
-      error = _prescriptionService.error;
+      error = _prescriptionService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -159,22 +159,22 @@ class PrescriptionViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  getPrescriptionReport({Prescriptions prescriptions, @required PatiantInformtion patient}) async {
+  getPrescriptionReport({Prescriptions? prescriptions, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptionReport(prescriptions: prescriptions, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getListPharmacyForPrescriptions({int itemId, @required PatiantInformtion patient}) async {
+  getListPharmacyForPrescriptions({int? itemId, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getListPharmacyForPrescriptions(itemId: itemId, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
@@ -214,11 +214,11 @@ class PrescriptionViewModel extends BaseViewModel {
     });
   }
 
-  getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder, @required PatiantInformtion patient}) async {
+  getPrescriptionReportEnh({PrescriptionsOrder? prescriptionsOrder, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptionReportEnh(prescriptionsOrder: prescriptionsOrder, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
@@ -228,18 +228,18 @@ class PrescriptionViewModel extends BaseViewModel {
   _getPrescriptionsOrders() async {
     await _prescriptionsService.getPrescriptionsOrders();
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getPrescriptions(PatiantInformtion patient, {String patientType}) async {
+  getPrescriptions(PatiantInformtion patient, {String? patientType}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptions(patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       if (patientType == "7")
         setState(ViewState.ErrorLocal);
       else
@@ -256,7 +256,7 @@ class PrescriptionViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionsService.getMedicationForInPatient(patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/prescriptions_view_model.dart

@@ -38,7 +38,7 @@ class PrescriptionsViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptions(patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.Error);
     } else {
       _filterList();
@@ -51,7 +51,7 @@ class PrescriptionsViewModel extends BaseViewModel {
   _getPrescriptionsOrders() async {
     await _prescriptionsService.getPrescriptionsOrders();
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -96,33 +96,33 @@ class PrescriptionsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  getPrescriptionReport({Prescriptions prescriptions, @required PatiantInformtion patient}) async {
+  getPrescriptionReport({Prescriptions? prescriptions, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptionReport(prescriptions: prescriptions, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getListPharmacyForPrescriptions({int itemId, @required PatiantInformtion patient}) async {
+  getListPharmacyForPrescriptions({int? itemId, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getListPharmacyForPrescriptions(itemId: itemId, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder, @required PatiantInformtion patient}) async {
+  getPrescriptionReportEnh({PrescriptionsOrder? prescriptionsOrder, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _prescriptionsService.getPrescriptionReportEnh(prescriptionsOrder: prescriptionsOrder, patient: patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
@@ -132,7 +132,7 @@ class PrescriptionsViewModel extends BaseViewModel {
   getMedicationForInPatient(PatiantInformtion patient) async {
     await _prescriptionsService.getMedicationForInPatient(patient);
     if (_prescriptionsService.hasError) {
-      error = _prescriptionsService.error;
+      error = _prescriptionsService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/procedure_View_model.dart

@@ -60,15 +60,15 @@ class ProcedureViewModel extends BaseViewModel {
   List<PatientLabOrdersList> _patientLabOrdersListClinic = [];
   List<PatientLabOrdersList> _patientLabOrdersListHospital = [];
 
-  Future getProcedure({int mrn, String patientType, int appointmentNo}) async {
+  Future getProcedure({int? mrn, String? patientType,  int?  appointmentNo}) async {
     hasError = false;
     await getDoctorProfile();
 
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.Busy);
-    await _procedureService.getProcedure(mrn: mrn, appointmentNo: appointmentNo);
+    await _procedureService.getProcedure(mrn: mrn, appointmentNo: appointmentNo!);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       if (patientType == "7")
         setState(ViewState.ErrorLocal);
       else
@@ -77,14 +77,14 @@ class ProcedureViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
-  Future getProcedureCategory({String categoryName, String categoryID, patientId}) async {
+  Future getProcedureCategory({String? categoryName, String? categoryID, patientId}) async {
     if (categoryName == null) return;
     hasError = false;
     setState(ViewState.Busy);
     await _procedureService.getProcedureCategory(
         categoryName: categoryName, categoryID: categoryID, patientId: patientId);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -96,18 +96,18 @@ class ProcedureViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _procedureService.getCategory();
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
   }
 
-  Future getProcedureTemplate({String categoryID}) async {
+  Future getProcedureTemplate({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();
@@ -133,14 +133,14 @@ class ProcedureViewModel extends BaseViewModel {
 
   int tempId = 0;
 
-  Future getProcedureTemplateDetails({int templateId}) async {
+  Future getProcedureTemplateDetails({int? templateId}) async {
-    tempId = templateId;
+    tempId = templateId!;
     hasError = false;
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.BusyLocal);
     await _procedureService.getProcedureTemplateDetails(templateId: templateId);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -152,10 +152,10 @@ class ProcedureViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _procedureService.postProcedure(postProcedureReqModel);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else {
-      await getProcedure(mrn: mrn);
+      await getProcedure(mrn: mrn, appointmentNo: null);
       setState(ViewState.Idle);
     }
   }
@@ -166,31 +166,31 @@ class ProcedureViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _procedureService.valadteProcedure(procedureValadteRequestModel);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  Future updateProcedure({UpdateProcedureRequestModel updateProcedureRequestModel, int mrn}) async {
+  Future updateProcedure({UpdateProcedureRequestModel? updateProcedureRequestModel, int? mrn}) async {
     hasError = false;
     //_insuranceCardService.clearInsuranceCard();
     setState(ViewState.Busy);
-    await _procedureService.updateProcedure(updateProcedureRequestModel);
+    await _procedureService.updateProcedure(updateProcedureRequestModel!);
     if (_procedureService.hasError) {
-      error = _procedureService.error;
+      error = _procedureService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
     //await getProcedure(mrn: mrn);
   }
 
-  void getPatientRadOrders(PatiantInformtion patient, {String patientType, bool isInPatient = false}) async {
+  void getPatientRadOrders(PatiantInformtion patient, {String? patientType, bool isInPatient = false}) async {
     setState(ViewState.Busy);
     await _radiologyService.getPatientRadOrders(patient, isInPatient: isInPatient);
     if (_radiologyService.hasError) {
-      error = _radiologyService.error;
+      error = _radiologyService.error!;
       if (patientType == "7")
         setState(ViewState.ErrorLocal);
       else
@@ -232,12 +232,12 @@ class ProcedureViewModel extends BaseViewModel {
 
   String get radImageURL => _radiologyService.url;
 
-  getRadImageURL({int invoiceNo, int lineItem, int projectId, @required PatiantInformtion patient}) async {
+  getRadImageURL({int? invoiceNo, int? lineItem, int? projectId, @required PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _radiologyService.getRadImageURL(
         invoiceNo: invoiceNo, lineItem: lineItem, projectId: projectId, patient: patient);
     if (_radiologyService.hasError) {
-      error = _radiologyService.error;
+      error = _radiologyService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -262,7 +262,7 @@ class ProcedureViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _labsService.getPatientLabOrdersList(patient, isInpatient);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
@@ -270,30 +270,30 @@ class ProcedureViewModel extends BaseViewModel {
   }
 
   getLaboratoryResult(
-      {String projectID, int clinicID, String invoiceNo, String orderNo, PatiantInformtion patient}) async {
+      {String? projectID, int? clinicID, String? invoiceNo, String? orderNo, PatiantInformtion? patient}) async {
     setState(ViewState.Busy);
     await _labsService.getLaboratoryResult(
         invoiceNo: invoiceNo, orderNo: orderNo, projectID: projectID, clinicID: clinicID, patient: patient);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
       setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-  getPatientLabOrdersResults({PatientLabOrders patientLabOrder, String procedure, PatiantInformtion patient}) async {
+  getPatientLabOrdersResults({PatientLabOrders? patientLabOrder, String? procedure, 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)
+          if (element.resultValue!.contains('/') || element.resultValue!.contains('*') || element.resultValue!.isEmpty)
             isShouldClear = true;
         });
       }
@@ -302,23 +302,23 @@ class ProcedureViewModel extends BaseViewModel {
     }
   }
 
-  sendLabReportEmail({PatientLabOrders patientLabOrder, String mes}) async {
+  sendLabReportEmail({PatientLabOrders? patientLabOrder, String? mes}) async {
     await _labsService.sendLabReportEmail(patientLabOrder: patientLabOrder);
     if (_labsService.hasError) {
-      error = _labsService.error;
+      error = _labsService.error!;
     } else
       DrAppToastMsg.showSuccesToast(mes);
   }
 
   Future preparePostProcedure(
-      {String remarks,
+      {String? remarks,
-      String orderType,
+      String? orderType,
-      PatiantInformtion patient,
+      PatiantInformtion? patient,
-      List<cpe.EntityList> entityList,
+      List<cpe.EntityList>? entityList,
-      ProcedureType procedureType}) async {
+      ProcedureType? procedureType}) async {
     PostProcedureReqModel postProcedureReqModel = new PostProcedureReqModel();
     ProcedureValadteRequestModel procedureValadteRequestModel = new ProcedureValadteRequestModel();
-    procedureValadteRequestModel.patientMRN = patient.patientMRN;
+    procedureValadteRequestModel.patientMRN = patient!.patientMRN;
     procedureValadteRequestModel.episodeID = patient.episodeNo;
     procedureValadteRequestModel.appointmentNo = patient.appointmentNo;
 
@@ -328,8 +328,8 @@ class ProcedureViewModel extends BaseViewModel {
     postProcedureReqModel.episodeID = patient.episodeNo;
     postProcedureReqModel.patientMRN = patient.patientMRN;
 
-    entityList.forEach((element) {
+    entityList!.forEach((element) {
-      procedureValadteRequestModel.procedure = [element.procedureId];
+      procedureValadteRequestModel.procedure = [element.procedureId!];
       List<Controls> controls = [];
       controls.add(
         Controls(code: "remarks", controlValue: element.remarks != null ? element.remarks : ""),
@@ -344,8 +344,8 @@ class ProcedureViewModel extends BaseViewModel {
     postProcedureReqModel.procedures = controlsProcedure;
     await valadteProcedure(procedureValadteRequestModel);
     if (state == ViewState.Idle) {
-      if (valadteProcedureList[0].entityList.length == 0) {
+      if (valadteProcedureList[0].entityList!.length == 0) {
-        await postProcedure(postProcedureReqModel, patient.patientMRN);
+        await postProcedure(postProcedureReqModel, patient.patientMRN!);
 
         if (state == ViewState.ErrorLocal) {
           Helpers.showErrorToast(error);
@@ -358,7 +358,7 @@ class ProcedureViewModel extends BaseViewModel {
           Helpers.showErrorToast(error);
           getProcedure(mrn: patient.patientMRN);
         } else if (state == ViewState.Idle) {
-          Helpers.showErrorToast(valadteProcedureList[0].entityList[0].warringMessages);
+          Helpers.showErrorToast(valadteProcedureList[0].entityList![0].warringMessages);
         }
       }
     } else {

lib/core/viewModel/profile/discharge_summary_view_model.dart

@@ -14,33 +14,41 @@ class DischargeSummaryViewModel extends BaseViewModel {
   List<GetDischargeSummaryResModel> get pendingDischargeSummaryList =>
       _dischargeSummaryService.pendingDischargeSummaryList;
 
-
   List<GetDischargeSummaryResModel> get allDisChargeSummaryList =>
       _dischargeSummaryService.allDischargeSummaryList;
 
-
+  Future getPendingDischargeSummary({
-  Future getPendingDischargeSummary({int patientId, int admissionNo, }) async {
+    required int patientId,
-    GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId );
+    required int admissionNo,
+  }) async {
+    GetDischargeSummaryReqModel getDischargeSummaryReqModel =
+        GetDischargeSummaryReqModel(
+            admissionNo: admissionNo, patientID: patientId);
     hasError = false;
     setState(ViewState.Busy);
-    await _dischargeSummaryService.getPendingDischargeSummary(getDischargeSummaryReqModel: getDischargeSummaryReqModel);
+    await _dischargeSummaryService.getPendingDischargeSummary(
+        getDischargeSummaryReqModel: getDischargeSummaryReqModel);
     if (_dischargeSummaryService.hasError) {
-      error = _dischargeSummaryService.error;
+      error = _dischargeSummaryService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
   }
 
-
+  Future getAllDischargeSummary({
-
+    int? patientId,
-  Future getAllDischargeSummary({int patientId, int admissionNo, }) async {
+    int? admissionNo,
-    GetDischargeSummaryReqModel getDischargeSummaryReqModel = GetDischargeSummaryReqModel(admissionNo:admissionNo,patientID: patientId );
+  }) async {
+    GetDischargeSummaryReqModel getDischargeSummaryReqModel =
+        GetDischargeSummaryReqModel(
+            admissionNo: admissionNo!, patientID: patientId!);
     hasError = false;
     setState(ViewState.Busy);
-    await _dischargeSummaryService.getAllDischargeSummary(getDischargeSummaryReqModel: getDischargeSummaryReqModel);
+    await _dischargeSummaryService.getAllDischargeSummary(
+        getDischargeSummaryReqModel: getDischargeSummaryReqModel);
     if (_dischargeSummaryService.hasError) {
-      error = _dischargeSummaryService.error;
+      error = _dischargeSummaryService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);

lib/core/viewModel/profile/operation_report_view_model.dart

@@ -23,7 +23,7 @@ class OperationReportViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _operationReportService.getReservations(patientId: patientId);
     if (_operationReportService.hasError) {
-      error = _operationReportService.error;
+      error = _operationReportService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -36,7 +36,7 @@ class OperationReportViewModel extends BaseViewModel {
     GetOperationDetailsRequestModel getOperationReportRequestModel = GetOperationDetailsRequestModel(reservationNo:reservation.oTReservationID, patientID: reservation.patientID, setupID: "010266" );
     await _operationReportService.getOperationReportDetails(getOperationReportRequestModel:getOperationReportRequestModel);
     if (_operationReportService.hasError) {
-      error = _operationReportService.error;
+      error = _operationReportService.error!;
       setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
@@ -51,7 +51,7 @@ class OperationReportViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _operationReportService.updateOperationReport(createUpdateOperationReport);
     if (_operationReportService.hasError) {
-      error = _operationReportService.error;
+      error = _operationReportService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/project_view_model.dart

@@ -52,7 +52,7 @@ class ProjectViewModel with ChangeNotifier {
 
   void loadSharedPrefLanguage() async {
     currentLanguage = await sharedPref.getString(APP_Language);
-    _appLocale = Locale(currentLanguage ?? 'en');
+    _appLocale = Locale(currentLanguage);
     _isArabic =  currentLanguage == 'ar'
             ? true
             : false;

lib/core/viewModel/radiology_view_model.dart

@@ -26,7 +26,7 @@ class RadiologyViewModel extends BaseViewModel {
     await _radiologyService.getPatientRadOrders(patient,
         isInPatient: isInPatient);
     if (_radiologyService.hasError) {
-      error = _radiologyService.error;
+      error = _radiologyService.error!;
       setState(ViewState.Error);
     } else {
       _radiologyService.finalRadiologyList.forEach((element) {
@@ -72,11 +72,7 @@ class RadiologyViewModel extends BaseViewModel {
 
   String get radImageURL => _radiologyService.url;
 
-  getRadImageURL(
+  getRadImageURL({int? invoiceNo, int? lineItem, int? projectId, @required PatiantInformtion? patient}) async {
-      {int invoiceNo,
-      int lineItem,
-      int projectId,
-      @required PatiantInformtion patient}) async {
     setState(ViewState.Busy);
     await _radiologyService.getRadImageURL(
         invoiceNo: invoiceNo,
@@ -84,7 +80,7 @@ class RadiologyViewModel extends BaseViewModel {
         projectId: projectId,
         patient: patient);
     if (_radiologyService.hasError) {
-      error = _radiologyService.error;
+      error = _radiologyService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/referral_view_model.dart

@@ -16,7 +16,7 @@ class ReferralPatientViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _referralPatientService.getMyReferralPatient();
     if (_referralPatientService.hasError) {
-      error = _referralPatientService.error;
+      error = _referralPatientService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -27,7 +27,7 @@ class ReferralPatientViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _referralPatientService.replay(referredDoctorRemarks, model);
     if (_referralPatientService.hasError) {
-      error = _referralPatientService.error;
+      error = _referralPatientService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/scan_qr_view_model.dart

@@ -15,7 +15,7 @@ class ScanQrViewModel extends BaseViewModel {
 
     await _scanQrService.getInPatient(requestModel, isMyInpatient);
     if (_scanQrService.hasError) {
-      error = _scanQrService.error;
+      error = _scanQrService.error!;
 
       setState(ViewState.ErrorLocal);
     } else {

lib/core/viewModel/schedule_view_model.dart

@@ -15,7 +15,7 @@ class ScheduleViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _scheduleService.getDoctorSchedule();
     if (_scheduleService.hasError) {
-      error = _scheduleService.error;
+      error = _scheduleService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/core/viewModel/sick_leave_view_model.dart

@@ -39,7 +39,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _sickLeaveService.addSickLeave(addSickLeaveRequest);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -49,7 +49,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.BusyLocal);
     await _sickLeaveService.extendSickLeave(extendSickLeaveRequest);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -59,7 +59,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getStatistics(appoNo, patientMRN);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -69,7 +69,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getSickLeave(patientMRN);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -82,7 +82,7 @@ class SickLeaveViewModel extends BaseViewModel {
       setState(ViewState.Busy);
     await _sickLeaveService.getSickLeavePatient(patientMRN);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.ErrorLocal);
 
     } else
@@ -99,7 +99,7 @@ class SickLeaveViewModel extends BaseViewModel {
 
     final results = await Future.wait(services);
      if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       // if (isLocalBusy)
         setState(ViewState.ErrorLocal);
       // else
@@ -113,7 +113,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getSickLeaveDoctor(patientMRN);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
@@ -123,7 +123,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getRescheduleLeave();
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -133,7 +133,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getOffTime();
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -143,7 +143,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.getReasonsByID(id: id);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -153,7 +153,7 @@ class SickLeaveViewModel extends BaseViewModel {
     //setState(ViewState.Busy);
     await _sickLeaveService.getCoveringDoctors();
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       // setState(ViewState.Error);
     }
     //else
@@ -165,7 +165,7 @@ class SickLeaveViewModel extends BaseViewModel {
     await _sickLeaveService.addReschedule(request);
 
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);
@@ -175,7 +175,7 @@ class SickLeaveViewModel extends BaseViewModel {
     setState(ViewState.Busy);
     await _sickLeaveService.updateReschedule(request);
     if (_sickLeaveService.hasError) {
-      error = _sickLeaveService.error;
+      error = _sickLeaveService.error!;
       setState(ViewState.Error);
     } else
       setState(ViewState.Idle);

lib/screens/patients/profile/notes/note/progress_note_screen.dart

@@ -59,7 +59,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
     ProgressNoteRequest progressNoteRequest = ProgressNoteRequest(
         visitType: widget.visitType,
         // if equal 5 then this will return progress note
-        admissionNo: int.parse(patient.admissionNo),
+        admissionNo: int.parse(patient!.admissionNo!),
         projectID: patient.projectId,
         tokenID: token,
         patientTypeID: patient.patientType,

lib/screens/patients/profile/notes/note/update_note.dart

@@ -217,7 +217,7 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
 
                         if (widget.isUpdate) {
                           UpdateNoteReqModel reqModel = UpdateNoteReqModel(
-                            admissionNo: int.parse(widget.patient.admissionNo),
+                            admissionNo: int.parse(widget.patient!.admissionNo!),
                             cancelledNote: false,
                             lineItemNo: widget.note.lineItemNo,
                             createdBy: widget.note.createdBy,
@@ -231,7 +231,7 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
                         } else {
                           CreateNoteModel reqModel = CreateNoteModel(
                               admissionNo:
-                                  int.parse(widget.patient.admissionNo),
+                                  int.parse(widget.patient!.admissionNo!),
                               createdBy: doctorProfile!.doctorID,
                               visitType: widget.visitType,
                               patientID: widget.patient.patientId,
@@ -252,7 +252,7 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
                                   visitType: widget.visitType,
                                   // if equal 5 then this will return progress note
                                   admissionNo:
-                                      int.parse(widget.patient.admissionNo),
+                                      int.parse(widget.patient!.admissionNo!),
                                   projectID: widget.patient.projectId,
                                   patientTypeID: widget.patient.patientType,
                                   languageID: 2);

lib/screens/patients/profile/notes/nursing_note/nursing_note_screen.dart

@@ -54,7 +54,7 @@ class _ProgressNoteState extends State<NursingProgressNoteScreen> {
     print(type);
     GetNursingProgressNoteRequestModel getNursingProgressNoteRequestModel =
         GetNursingProgressNoteRequestModel(
-            admissionNo: int.parse(patient.admissionNo),
+            admissionNo: int.parse(patient!.admissionNo!),
             patientTypeID: patient.patientType,
             patientID: patient.patientId,
             setupID: "010266");

lib/screens/patients/profile/operation_report/update_operation_report.dart

@@ -579,7 +579,7 @@ class _UpdateOperationReportState extends State<UpdateOperationReport> {
                                               bloodLossDetailController.text,
                                           patientID: widget.patient.patientId,
                                           admissionNo: int.parse(
-                                              widget.patient.admissionNo),
+                                              widget.patient!.admissionNo!),
                                           createdBy:
                                               model.doctorProfile!.doctorID,
                                           setupID: "010266");