updates & fixes

lib/client/base_app_client.dart

@@ -60,6 +60,12 @@ class BaseAppClient {
         } else if (doctorID != null) body['DoctorID'] = int.parse(doctorID);
       }
 
+      body['SetupID'] = body.containsKey('SetupID')
+          ? body['SetupID'] != null
+              ? body['SetupID']
+              : await sharedPref.getString(DOCTOR_SETUP_ID)
+          : await sharedPref.getString(DOCTOR_SETUP_ID);
+
       if (body['EditedBy'] == '') {
         body.remove("EditedBy");
       }

lib/config/config.dart

@@ -14,118 +14,83 @@ const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
 
 const BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; //Vida Plus URL
 
-
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
-const PATIENT_PROGRESS_NOTE_URL =
-    "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
-const PATIENT_INSURANCE_APPROVALS_URL =
-    "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
-const PATIENT_REFER_TO_DOCTOR_URL =
-    "Services/DoctorApplication.svc/REST/ReferToDoctor";
-const PATIENT_GET_DOCTOR_BY_CLINIC_URL =
-    "Services/DoctorApplication.svc/REST/GetDoctorsByClinicID";
-
-const PATIENT_GET_DOCTOR_BY_CLINIC_Hospital =
-    "Services/Doctors.svc/REST/SearchDoctorsByTime";
-
-const GET_CLINICS_FOR_DOCTOR =
-    'Services/DoctorApplication.svc/REST/GetClinicsForDoctor';
-const PATIENT_GET_LIST_REFERAL_URL =
-    "Services/Lists.svc/REST/GetList_STPReferralFrequency";
-const PATIENT_GET_CLINIC_BY_PROJECT_URL =
-    "Services/DoctorApplication.svc/REST/GetClinicsByProjectID";
+const PATIENT_PROGRESS_NOTE_URL = "Services/DoctorApplication.svc/REST/GetProgressNoteForInPatient";
+const PATIENT_INSURANCE_APPROVALS_URL = "Services/DoctorApplication.svc/REST/GetApprovalStatusForInpatient";
+const PATIENT_REFER_TO_DOCTOR_URL = "Services/DoctorApplication.svc/REST/ReferToDoctor";
+const PATIENT_GET_DOCTOR_BY_CLINIC_URL = "Services/DoctorApplication.svc/REST/GetDoctorsByClinicID";
+
+const PATIENT_GET_DOCTOR_BY_CLINIC_Hospital = "Services/Doctors.svc/REST/SearchDoctorsByTime";
+
+const GET_CLINICS_FOR_DOCTOR = 'Services/DoctorApplication.svc/REST/GetClinicsForDoctor';
+const PATIENT_GET_LIST_REFERAL_URL = "Services/Lists.svc/REST/GetList_STPReferralFrequency";
+const PATIENT_GET_CLINIC_BY_PROJECT_URL = "Services/DoctorApplication.svc/REST/GetClinicsByProjectID";
 const PROJECT_GET_INFO = "Services/DoctorApplication.svc/REST/GetProjectInfo";
 const GET_CLINICS = "Services/DoctorApplication.svc/REST/GetClinics";
 
-const GET_REFERRAL_FACILITIES =
-    'Services/DoctorApplication.svc/REST/GetReferralFacilities';
+const GET_REFERRAL_FACILITIES = 'Services/DoctorApplication.svc/REST/GetReferralFacilities';
 
 const GET_PROJECTS = 'Services/DoctorApplication.svc/REST/GetProjectInfo';
 
-const GET_PATIENT_VITAL_SIGN =
-    'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
-const GET_PATIENT_VITAL_SIGN_DATA =
-    'Services/DoctorApplication.svc/REST/GetVitalSigns';
-const GET_PATIENT_LAB_OREDERS =
-    'Services/DoctorApplication.svc/REST/GetPatientLabOreders';
+const GET_PATIENT_VITAL_SIGN = 'Services/Doctors.svc/REST/Doctor_GetPatientVitalSign';
+const GET_PATIENT_VITAL_SIGN_DATA = 'Services/DoctorApplication.svc/REST/GetVitalSigns';
+const GET_PATIENT_LAB_OREDERS = 'Services/DoctorApplication.svc/REST/GetPatientLabOreders';
 const GET_PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
 
-const GET_LIVECARE_PENDINGLIST =
-    'Services/DoctorApplication.svc/REST/GetPendingPatientER';
+const GET_LIVECARE_PENDINGLIST = 'Services/DoctorApplication.svc/REST/GetPendingPatientER';
 const START_LIVE_CARE_CALL = 'LiveCareApi/DoctorApp/CallPatient';
-const LIVE_CARE_STATISTICS_FOR_CERTAIN_DOCTOR_URL =
-    "Lists.svc/REST/DashBoard_GetLiveCareDoctorsStatsticsForCertainDoctor";
+const LIVE_CARE_STATISTICS_FOR_CERTAIN_DOCTOR_URL = "Lists.svc/REST/DashBoard_GetLiveCareDoctorsStatsticsForCertainDoctor";
 
-const GET_PRESCRIPTION_REPORT =
-    'Services/Patients.svc/REST/GetPrescriptionReport';
+const GET_PRESCRIPTION_REPORT = 'Services/Patients.svc/REST/GetPrescriptionReport';
 
-const GT_MY_PATIENT_QUESTION =
-    'Services/DoctorApplication.svc/REST/GtMyPatientsQuestions';
+const GT_MY_PATIENT_QUESTION = 'Services/DoctorApplication.svc/REST/GtMyPatientsQuestions';
 
-const PRM_SEARCH_PATIENT =
-    'Services/Patients.svc/REST/GetPatientInformation_PRM';
+const PRM_SEARCH_PATIENT = 'Services/Patients.svc/REST/GetPatientInformation_PRM';
 
 const GET_PATIENT = 'Services/DoctorApplication.svc/REST/';
 
-const GET_PRESCRIPTION_REPORT_FOR_IN_PATIENT =
-    'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
+const GET_PRESCRIPTION_REPORT_FOR_IN_PATIENT = 'Services/DoctorApplication.svc/REST/GetPrescriptionReportForInPatient';
 
-const GET_MY_REFERRAL_PATIENT =
-    'Services/DoctorApplication.svc/REST/GtMyReferralPatient';
+const GET_MY_REFERRAL_PATIENT = 'Services/DoctorApplication.svc/REST/GtMyReferralPatient';
 
 const REFER_TO_DOCTOR = 'Services/DoctorApplication.svc/REST/ReferToDoctor';
 
-const ADD_REFERRED_DOCTOR_REMARKS =
-    'Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks';
+const ADD_REFERRED_DOCTOR_REMARKS = 'Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks';
 
-const GET_MY_REFERRED_PATIENT =
-    'Services/DoctorApplication.svc/REST/GtMyReferredPatient';
+const GET_MY_REFERRED_PATIENT = 'Services/DoctorApplication.svc/REST/GtMyReferredPatient';
 
-const GET_MY_REFERRED_OUT_PATIENT =
-    'Services/DoctorApplication.svc/REST/GtMyReferredOutPatient';
+const GET_MY_REFERRED_OUT_PATIENT = 'Services/DoctorApplication.svc/REST/GtMyReferredOutPatient';
 
-const GET_PENDING_REFERRAL_PATIENT =
-    'Services/DoctorApplication.svc/REST/PendingReferrals';
+const GET_PENDING_REFERRAL_PATIENT = 'Services/DoctorApplication.svc/REST/PendingReferrals';
 
-const CREATE_REFERRAL_PATIENT =
-    'Services/DoctorApplication.svc/REST/CreateReferral';
+const CREATE_REFERRAL_PATIENT = 'Services/DoctorApplication.svc/REST/CreateReferral';
 
-const RESPONSE_PENDING_REFERRAL_PATIENT =
-    'Services/DoctorApplication.svc/REST/RespondReferral';
+const RESPONSE_PENDING_REFERRAL_PATIENT = 'Services/DoctorApplication.svc/REST/RespondReferral';
 
 const GET_PATIENT_REFERRAL = 'Services/DoctorApplication.svc/REST/GetRefferal';
 
 const POST_UCAF = 'Services/DoctorApplication.svc/REST/PostUCAF';
 
-const GET_DOCTOR_WORKING_HOURS_TABLE =
-    'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable';
+const GET_DOCTOR_WORKING_HOURS_TABLE = 'Services/Doctors.svc/REST/GetDoctorWorkingHoursTable';
 
-const GET_PATIENT_LAB_RESULTS =
-    'Services/DoctorApplication.svc/REST/GetPatientLabResults';
+const GET_PATIENT_LAB_RESULTS = 'Services/DoctorApplication.svc/REST/GetPatientLabResults';
 const LOGIN_URL = 'Services/Sentry.svc/REST/MemberLogIN_New';
-const INSERT_DEVICE_IMEI =
-    'Services/DoctorApplication.svc/REST/DoctorApp_InsertOrUpdateDeviceDetails';
+const INSERT_DEVICE_IMEI = 'Services/DoctorApplication.svc/REST/DoctorApp_InsertOrUpdateDeviceDetails';
 // 'Services/Sentry.svc/REST/DoctorApplication_INSERTDeviceIMEI';
 // const SELECT_DEVICE_IMEI =
 //     'Services/Sentry.svc/REST/DoctorApplication_SELECTDeviceIMEIbyIMEI';
 
-const SELECT_DEVICE_IMEI =
-    'Services/DoctorApplication.svc/REST/DoctorApp_GetDeviceDetailsByIMEI';
+const SELECT_DEVICE_IMEI = 'Services/DoctorApplication.svc/REST/DoctorApp_GetDeviceDetailsByIMEI';
 
-const SEND_ACTIVATION_CODE_BY_OTP_NOTIFICATION_TYPE =
-    'Services/Sentry.svc/REST/DoctorApplication_SendActivationCodebyOTPNotificationType';
+const SEND_ACTIVATION_CODE_BY_OTP_NOTIFICATION_TYPE = 'Services/Sentry.svc/REST/DoctorApplication_SendActivationCodebyOTPNotificationType';
 
-const SEND_ACTIVATION_CODE_FOR_DOCTOR_APP =
-    'Services/DoctorApplication.svc/REST/SendActivationCodeForDoctorApp';
+const SEND_ACTIVATION_CODE_FOR_DOCTOR_APP = 'Services/DoctorApplication.svc/REST/SendActivationCodeForDoctorApp';
 
-const SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN =
-    'Services/DoctorApplication.svc/REST/SendVerificationCode';
-const MEMBER_CHECK_ACTIVATION_CODE_NEW =
-    'Services/Sentry.svc/REST/MemberCheckActivationCode_New';
+const SEND_ACTIVATION_CODE_FOR_VERIFICATION_SCREEN = 'Services/DoctorApplication.svc/REST/SendVerificationCode';
+const MEMBER_CHECK_ACTIVATION_CODE_NEW = 'Services/Sentry.svc/REST/MemberCheckActivationCode_New';
 
-const CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP =
-    'Services/DoctorApplication.svc/REST/CheckActivationCodeForDoctorApp';
+const CHECK_ACTIVATION_CODE_FOR_DOCTOR_APP = 'Services/DoctorApplication.svc/REST/CheckActivationCodeForDoctorApp';
 
 const GET_DOC_PROFILES = 'Services/Doctors.svc/REST/GetDocProfiles';
 const TRANSFERT_TO_ADMIN = 'LiveCareApi/DoctorApp/TransferToAdmin';
@@ -133,268 +98,179 @@ const SEND_SMS_INSTRUCTIONS = 'LiveCareApi/DoctorApp/SendSMSInstruction';
 const GET_ALTERNATIVE_SERVICE = 'LiveCareApi/DoctorApp/GetAlternativeServices';
 const END_CALL = 'LiveCareApi/DoctorApp/EndCall';
 const END_CALL_WITH_CHARGE = 'LiveCareApi/DoctorApp/CompleteCallWithCharge';
-const GET_DASHBOARD =
-    'Services/DoctorApplication.svc/REST/GetDoctorDashboardKPI';
-const GET_SICKLEAVE_STATISTIC =
-    'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics';
-const ARRIVED_PATIENT_URL =
-    'Services/DoctorApplication.svc/REST/PatientArrivalList';
+const GET_DASHBOARD = 'Services/DoctorApplication.svc/REST/GetDoctorDashboardKPI';
+const GET_SICKLEAVE_STATISTIC = 'Services/DoctorApplication.svc/REST/PreSickLeaveStatistics';
+const ARRIVED_PATIENT_URL = 'Services/DoctorApplication.svc/REST/PatientArrivalList';
 const ADD_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/PostSickLeave';
 const GET_SICK_LEAVE = 'Services/Patients.svc/REST/GetPatientSickLeave';
 const EXTEND_SICK_LEAVE = 'Services/DoctorApplication.svc/REST/ExtendSickLeave';
 
 const GET_MASTER_LOOKUP_LIST = 'Services/DoctorApplication.svc/REST/GetMasterLookUpList';
-const GET_COVERING_DOCTORS =
-    'Services/DoctorApplication.svc/REST/GetCoveringDoctor';
+const GET_COVERING_DOCTORS = 'Services/DoctorApplication.svc/REST/GetCoveringDoctor';
 const ADD_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PostRequisition';
-const UPDATE_RESCHDEULE =
-    'Services/DoctorApplication.svc/REST/PatchRequisition';
-const GET_RESCHEDULE_LEAVE =
-    'Services/DoctorApplication.svc/REST/GetRequisition';
-const GET_PRESCRIPTION_LIST =
-    'Services/DoctorApplication.svc/REST/GetPrescription';
-
-const POST_PRESCRIPTION_LIST =
-    'Services/DoctorApplication.svc/REST/PostPrescription';
-const GET_PROCEDURE_LIST =
-    'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
-const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
+const UPDATE_RESCHDEULE = 'Services/DoctorApplication.svc/REST/PatchRequisition';
+const GET_RESCHEDULE_LEAVE = 'Services/DoctorApplication.svc/REST/GetRequisition';
+const GET_PRESCRIPTION_LIST = 'Services/DoctorApplication.svc/REST/GetPrescription';
 
+const POST_PRESCRIPTION_LIST = 'Services/DoctorApplication.svc/REST/PostPrescription';
+const GET_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/GetOrderedProcedure';
+const POST_PROCEDURE_LIST = 'Services/DoctorApplication.svc/REST/PostProcedure';
 
-const GET_PATIENT_IN_PATIENT_LIST =
-    'Services/DoctorApplication.svc/REST/GetMyInPatient';
+const GET_PATIENT_IN_PATIENT_LIST = 'Services/DoctorApplication.svc/REST/GetMyInPatient';
 
-const Verify_Referral_Doctor_Remarks =
-    'Services/DoctorApplication.svc/REST/VerifyReferralDoctorRemarks';
+const Verify_Referral_Doctor_Remarks = 'Services/DoctorApplication.svc/REST/VerifyReferralDoctorRemarks';
 
 ///Lab Order
 const GET_Patient_LAB_ORDERS = 'Services/Patients.svc/REST/GetPatientLabOrders';
-const GET_Patient_LAB_SPECIAL_RESULT =
-    'Services/Patients.svc/REST/GetPatientLabSpecialResults';
-const SEND_LAB_RESULT_EMAIL =
-    'Services/Notifications.svc/REST/SendLabReportEmail';
-const GET_Patient_LAB_RESULT =
-    'Services/Patients.svc/REST/GetPatientLabResults';
-const GET_Patient_LAB_ORDERS_RESULT =
-    'Services/Patients.svc/REST/GetPatientLabOrdersResults';
-const GET_PATIENT_LAB_ORDERS_RESULT_HISTORY_BY_DESCRIPTION =
-    'Services/Patients.svc/REST/GetPatientLabOrdersResultsHistoryByDescription';
+const GET_Patient_LAB_SPECIAL_RESULT = 'Services/Patients.svc/REST/GetPatientLabSpecialResults';
+const SEND_LAB_RESULT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail';
+const GET_Patient_LAB_RESULT = 'Services/Patients.svc/REST/GetPatientLabResults';
+const GET_Patient_LAB_ORDERS_RESULT = 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
+const GET_PATIENT_LAB_ORDERS_RESULT_HISTORY_BY_DESCRIPTION = 'Services/Patients.svc/REST/GetPatientLabOrdersResultsHistoryByDescription';
 
 // SOAP
 
 const GET_ALLERGIES = 'Services/DoctorApplication.svc/REST/GetAllergies';
 
 const POST_EPISODE = 'Services/DoctorApplication.svc/REST/PostEpisode';
-const POST_EPISODE_FOR_IN_PATIENT =
-    'Services/DoctorApplication.svc/REST/PostEpisodeForInpatient';
+const POST_EPISODE_FOR_IN_PATIENT = 'Services/DoctorApplication.svc/REST/PostEpisodeForInpatient';
 
 const POST_ALLERGY = 'Services/DoctorApplication.svc/REST/PostAllergies';
 const POST_HISTORY = 'Services/DoctorApplication.svc/REST/PostHistory';
-const POST_CHIEF_COMPLAINT =
-    'Services/DoctorApplication.svc/REST/PostChiefcomplaint';
-const POST_PHYSICAL_EXAM =
-    'Services/DoctorApplication.svc/REST/PostPhysicalExam';
-const POST_PROGRESS_NOTE =
-    '/Services/DoctorApplication.svc/REST/PostProgressNote';
+const POST_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/PostChiefcomplaint';
+const POST_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/PostPhysicalExam';
+const POST_PROGRESS_NOTE = '/Services/DoctorApplication.svc/REST/PostProgressNote';
 const POST_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PostAssessment';
 
 const PATCH_ALLERGY = 'Services/DoctorApplication.svc/REST/PatchAllergies';
 const PATCH_HISTORY = 'Services/DoctorApplication.svc/REST/PatchHistory';
-const PATCH_CHIEF_COMPLAINT =
-    'Services/DoctorApplication.svc/REST/PatchChiefcomplaint';
+const PATCH_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/PatchChiefcomplaint';
 
-const PATCH_PHYSICAL_EXAM =
-    'Services/DoctorApplication.svc/REST/PatchPhysicalExam';
-const PATCH_PROGRESS_NOTE =
-    'Services/DoctorApplication.svc/REST/PatchProgressNote';
+const PATCH_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/PatchPhysicalExam';
+const PATCH_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/PatchProgressNote';
 const PATCH_ASSESSMENT = 'Services/DoctorApplication.svc/REST/PatchAssessment';
 
 const GET_HISTORY = 'Services/DoctorApplication.svc/REST/GetHistory';
-const GET_CHIEF_COMPLAINT =
-    'Services/DoctorApplication.svc/REST/GetChiefcomplaint';
+const GET_CHIEF_COMPLAINT = 'Services/DoctorApplication.svc/REST/GetChiefcomplaint';
 const GET_PHYSICAL_EXAM = 'Services/DoctorApplication.svc/REST/GetPhysicalExam';
 const GET_PROGRESS_NOTE = 'Services/DoctorApplication.svc/REST/GetProgressNote';
 const GET_ASSESSMENT = 'Services/DoctorApplication.svc/REST/GetAssessment';
 
+const GET_LIST_CATEGORISE = 'Services/DoctorApplication.svc/REST/GetProcedureCategories';
 
-const GET_LIST_CATEGORISE =
-    'Services/DoctorApplication.svc/REST/GetProcedureCategories';
-
-const GET_CATEGORISE_PROCEDURE =
-    'Services/DoctorApplication.svc/REST/GetProcedure';
+const GET_CATEGORISE_PROCEDURE = 'Services/DoctorApplication.svc/REST/GetProcedure';
 const UPDATE_PROCEDURE = 'Services/DoctorApplication.svc/REST/PatchProcedure';
-const UPDATE_PRESCRIPTION =
-    'Services/DoctorApplication.svc/REST/PatchPrescription';
+const UPDATE_PRESCRIPTION = 'Services/DoctorApplication.svc/REST/PatchPrescription';
 const SEARCH_DRUG = 'Services/DoctorApplication.svc/REST/GetMedicationList';
-const DRUG_TO_DRUG =
-    'Services/DoctorApplication.svc/REST/DrugToDrugInteraction';
+const DRUG_TO_DRUG = 'Services/DoctorApplication.svc/REST/DrugToDrugInteraction';
 const GET_MEDICAL_FILE = 'Services/DoctorApplication.svc/REST/GetMedicalFile';
 const GET_FLOORS = 'Services/DoctorApplication.svc/REST/GetFloors';
 const GET_WARDS = 'Services/DoctorApplication.svc/REST/GetWards';
-const GET_ROOM_CATEGORIES =
-    'Services/DoctorApplication.svc/REST/GetRoomCategories';
-const GET_DIAGNOSIS_TYPES =
-    'Services/DoctorApplication.svc/REST/DiagnosisTypes';
+const GET_ROOM_CATEGORIES = 'Services/DoctorApplication.svc/REST/GetRoomCategories';
+const GET_DIAGNOSIS_TYPES = 'Services/DoctorApplication.svc/REST/DiagnosisTypes';
 const GET_DIET_TYPES = 'Services/DoctorApplication.svc/REST/DietTypes';
 const GET_ICD_CODES = 'Services/DoctorApplication.svc/REST/GetICDCodes';
-const POST_ADMISSION_REQUEST =
-    'Services/DoctorApplication.svc/REST/PostAdmissionRequest';
-const GET_ITEM_BY_MEDICINE =
-    'Services/DoctorApplication.svc/REST/GetItemByMedicineCode';
+const POST_ADMISSION_REQUEST = 'Services/DoctorApplication.svc/REST/PostAdmissionRequest';
+const GET_ITEM_BY_MEDICINE = 'Services/DoctorApplication.svc/REST/GetItemByMedicineCode';
 
-const GET_PROCEDURE_VALIDATION =
-    'Services/DoctorApplication.svc/REST/ValidateProcedures';
-const GET_BOX_QUANTITY =
-    'Services/DoctorApplication.svc/REST/CalculateBoxQuantity';
+const GET_PROCEDURE_VALIDATION = 'Services/DoctorApplication.svc/REST/ValidateProcedures';
+const GET_BOX_QUANTITY = 'Services/DoctorApplication.svc/REST/CalculateBoxQuantity';
 
 ///GET ECG
 const GET_ECG = "Services/Patients.svc/REST/HIS_GetPatientMuseResults";
 
-const GET_MY_REFERRAL_INPATIENT =
-    "Services/DoctorApplication.svc/REST/GtMyReferralPatient";
+const GET_MY_REFERRAL_INPATIENT = "Services/DoctorApplication.svc/REST/GtMyReferralPatient";
 
-const GET_MY_REFERRAL_OUT_PATIENT =
-    "Services/DoctorApplication.svc/REST/GtMyReferralForOutPatient";
+const GET_MY_REFERRAL_OUT_PATIENT = "Services/DoctorApplication.svc/REST/GtMyReferralForOutPatient";
 
-const GET_MY_DISCHARGE_PATIENT =
-    "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
-const GET_DISCHARGE_PATIENT =
-    "Services/DoctorApplication.svc/REST/GtMyDischargePatient";
+const GET_MY_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargeReferralPatient";
+const GET_DISCHARGE_PATIENT = "Services/DoctorApplication.svc/REST/GtMyDischargePatient";
 
-const GET_PAtIENTS_INSURANCE_APPROVALS =
-    "Services/Patients.svc/REST/GetApprovalStatus";
+const GET_PAtIENTS_INSURANCE_APPROVALS = "Services/Patients.svc/REST/GetApprovalStatus";
 
 const GET_RAD_IMAGE_URL = 'Services/Patients.svc/Rest/GetRadImageURL';
 const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
-const GET_IN_PATIENT_ORDERS =
-    'Services/DoctorApplication.svc/REST/GetPatientRadResult';
+const GET_IN_PATIENT_ORDERS = 'Services/DoctorApplication.svc/REST/GetPatientRadResult';
 
 ///Prescriptions
-const GET_PRESCRIPTIONS_ALL_ORDERS =
-    'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
-const GET_PRESCRIPTION_REPORT_NEW =
-    'Services/Patients.svc/REST/INP_GetPrescriptionReport';
-const SEND_PRESCRIPTION_EMAIL =
-    'Services/Notifications.svc/REST/SendPrescriptionEmail';
-const GET_PRESCRIPTION_REPORT_ENH =
-    'Services/Patients.svc/REST/GetPrescriptionReport_enh';
-const UPDATE_PROGRESS_NOTE_FOR_INPATIENT =
-    "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
-const CREATE_PROGRESS_NOTE_FOR_INPATIENT =
-    "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
+const GET_PRESCRIPTIONS_ALL_ORDERS = 'Services/Patients.svc/REST/PatientER_GetPatientAllPresOrders';
+const GET_PRESCRIPTION_REPORT_NEW = 'Services/Patients.svc/REST/INP_GetPrescriptionReport';
+const SEND_PRESCRIPTION_EMAIL = 'Services/Notifications.svc/REST/SendPrescriptionEmail';
+const GET_PRESCRIPTION_REPORT_ENH = 'Services/Patients.svc/REST/GetPrescriptionReport_enh';
+const UPDATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/UpdateProgressNoteForInPatient";
+const CREATE_PROGRESS_NOTE_FOR_INPATIENT = "Services/DoctorApplication.svc/REST/CreateProgressNoteForInPatient";
 
 const GET_SICK_LEAVE_PATIENT = "Services/Patients.svc/REST/GetPatientSickLeave";
-const GET_MY_OUT_PATIENT =
-    "Services/DoctorApplication.svc/REST/GetMyOutPatient";
+const GET_MY_OUT_PATIENT = "Services/DoctorApplication.svc/REST/GetMyOutPatient";
 
-const PATIENT_MEDICAL_REPORT_GET_LIST =
-    "Services/Patients.svc/REST/DAPP_ListMedicalReport";
-const PATIENT_MEDICAL_REPORT_GET_TEMPLATE =
-    "Services/Patients.svc/REST/DAPP_GetTemplateByID";
-const PATIENT_MEDICAL_REPORT_INSERT =
-    "Services/Patients.svc/REST/DAPP_InsertMedicalReport";
-const PATIENT_MEDICAL_REPORT_VERIFIED =
-    "Services/Patients.svc/REST/DAPP_VerifiedMedicalReport";
+const PATIENT_MEDICAL_REPORT_GET_LIST = "Services/Patients.svc/REST/DAPP_ListMedicalReport";
+const PATIENT_MEDICAL_REPORT_GET_TEMPLATE = "Services/Patients.svc/REST/DAPP_GetTemplateByID";
+const PATIENT_MEDICAL_REPORT_INSERT = "Services/Patients.svc/REST/DAPP_InsertMedicalReport";
+const PATIENT_MEDICAL_REPORT_VERIFIED = "Services/Patients.svc/REST/DAPP_VerifiedMedicalReport";
 
-const GET_PROCEDURE_TEMPLETE =
-    'Services/Doctors.svc/REST/DAPP_ProcedureTemplateGet';
+const GET_PROCEDURE_TEMPLETE = 'Services/Doctors.svc/REST/DAPP_ProcedureTemplateGet';
 
 const GET_TEMPLETE_LIST = 'Services/Doctors.svc/REST/DAPP_TemplateGet';
 
-const GET_PROCEDURE_TEMPLETE_DETAILS =
-    "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet";
-const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP =
-    'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp';
+const GET_PROCEDURE_TEMPLETE_DETAILS = "Services/Doctors.svc/REST/DAPP_ProcedureTemplateDetailsGet";
+const GET_PENDING_PATIENT_ER_FOR_DOCTOR_APP = 'Services/DoctorApplication.svc/REST/GetPendingPatientERForDoctorApp';
 
-const DOCTOR_CHECK_HAS_LIVE_CARE =
-    "Services/DoctorApplication.svc/REST/CheckDoctorHasLiveCare";
+const DOCTOR_CHECK_HAS_LIVE_CARE = "Services/DoctorApplication.svc/REST/CheckDoctorHasLiveCare";
 
 const LIVE_CARE_IS_LOGIN = "LiveCareApi/DoctorApp/UseIsLogin";
-const ADD_REFERRED_REMARKS_NEW =
-    "Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks_New";
-const GET_SPECIAL_CLINICAL_CARE_LIST =
-    "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareList";
-const GET_SPECIAL_CLINICAL_CARE_MAPPING_LIST =
-    "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareMappingList";
-
-const INSERT_MEDICAL_REPORT =
-    "Services/Patients.svc/REST/DAPP_InsertMedicalReport_New";
-
-const UPDATE_MEDICAL_REPORT =
-    "Services/Patients.svc/REST/DAPP_UpdateMedicalReport";
-const GET_SICK_LEAVE_DOCTOR_APP =
-    "Services/DoctorApplication.svc/REST/GetAllSickLeaves";
+const ADD_REFERRED_REMARKS_NEW = "Services/DoctorApplication.svc/REST/AddReferredDoctorRemarks_New";
+const GET_SPECIAL_CLINICAL_CARE_LIST = "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareList";
+const GET_SPECIAL_CLINICAL_CARE_MAPPING_LIST = "Services/DoctorApplication.svc/REST/GetSpecialClinicalCareMappingList";
+
+const INSERT_MEDICAL_REPORT = "Services/Patients.svc/REST/DAPP_InsertMedicalReport_New";
+
+const UPDATE_MEDICAL_REPORT = "Services/Patients.svc/REST/DAPP_UpdateMedicalReport";
+const GET_SICK_LEAVE_DOCTOR_APP = "Services/DoctorApplication.svc/REST/GetAllSickLeaves";
 const ADD_PATIENT_TO_DOCTOR = "LiveCareApi/DoctorApp/AssignPatientToDoctor";
 const REMOVE_PATIENT_FROM_DOCTOR = "LiveCareApi/DoctorApp/BackPatientToQueue";
-const CREATE_DOCTOR_RESPONSE =
-    "Services/DoctorApplication.svc/REST/CreateDoctorResponse";
-const GET_DOCTOR_NOT_REPLIED_COUNTS =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetDoctorNotRepliedCounts";
-const ALL_SPECIAL_LAB_RESULT =
-    "services/Patients.svc/REST/GetPatientLabSpecialResultsALL";
-const GET_MEDICATION_FOR_IN_PATIENT =
-    "Services/DoctorApplication.svc/REST/Doctor_GetMedicationForInpatient";
-const GET_EPISODE_FOR_INPATIENT =
-    "/Services/DoctorApplication.svc/REST/DoctorApp_GetEpisodeForInpatient";
+const CREATE_DOCTOR_RESPONSE = "Services/DoctorApplication.svc/REST/CreateDoctorResponse";
+const GET_DOCTOR_NOT_REPLIED_COUNTS = "Services/DoctorApplication.svc/REST/DoctorApp_GetDoctorNotRepliedCounts";
+const ALL_SPECIAL_LAB_RESULT = "services/Patients.svc/REST/GetPatientLabSpecialResultsALL";
+const GET_MEDICATION_FOR_IN_PATIENT = "Services/DoctorApplication.svc/REST/Doctor_GetMedicationForInpatient";
+const GET_EPISODE_FOR_INPATIENT = "/Services/DoctorApplication.svc/REST/DoctorApp_GetEpisodeForInpatient";
 
 ///Operation Details Services
 
-const GET_RESERVATIONS =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetReservationDetails";
-const GET_OPERATION_DETAILS =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetOperationDetails";
-const UPDATE_OPERATION_REPORT =
-    "Services/DoctorApplication.svc/REST/DoctorApp_CreateUpdateOperationReport";
+const GET_RESERVATIONS = "Services/DoctorApplication.svc/REST/DoctorApp_GetReservationDetails";
+const GET_OPERATION_DETAILS = "Services/DoctorApplication.svc/REST/DoctorApp_GetOperationDetails";
+const UPDATE_OPERATION_REPORT = "Services/DoctorApplication.svc/REST/DoctorApp_CreateUpdateOperationReport";
 
-const NURSING_PROGRESS_NOTE =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetNursingProgressNote";
-const GET_DIAGNOSIS_FOR_IN_PATIENT =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetDiagnosisForInPatient";
+const NURSING_PROGRESS_NOTE = "Services/DoctorApplication.svc/REST/DoctorApp_GetNursingProgressNote";
+const GET_DIAGNOSIS_FOR_IN_PATIENT = "Services/DoctorApplication.svc/REST/DoctorApp_GetDiagnosisForInPatient";
 
-const GET_DIABETIC_CHART_VALUES =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetDiabeticChartValues";
+const GET_DIABETIC_CHART_VALUES = "Services/DoctorApplication.svc/REST/DoctorApp_GetDiabeticChartValues";
 
-const GET_PENDING_ORDERS =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingOrdersForInPatient";
+const GET_PENDING_ORDERS = "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingOrdersForInPatient";
 
-const GET_ADMISSION_ORDERS =
-    "/Services/DoctorApplication.svc/REST/DoctorApp_GetAdmissionOrders";
+const GET_ADMISSION_ORDERS = "/Services/DoctorApplication.svc/REST/DoctorApp_GetAdmissionOrders";
 
 ///Patient Registration Services
-const CHECK_PATIENT_FOR_REGISTRATION =
-    "Services/Authentication.svc/REST/CheckPatientForRegisteration";
-const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION =
-    "Services/Authentication.svc/REST/SendActivationCodebyOTPNotificationTypeForRegistration";
-const CHECK_ACTIVATION_CODE_FOR_PATIENT =
-    "Services/Authentication.svc/REST/CheckActivationCode";
-const PATIENT_REGISTRATION =
-    "Services/Authentication.svc/REST/PatientRegistration";
+const CHECK_PATIENT_FOR_REGISTRATION = "Services/Authentication.svc/REST/CheckPatientForRegisteration";
+const SEND_ACTIVATION_CODE_BY_OTP_NOT_TYPE_FOR_REGISTRATION = "Services/Authentication.svc/REST/SendActivationCodebyOTPNotificationTypeForRegistration";
+const CHECK_ACTIVATION_CODE_FOR_PATIENT = "Services/Authentication.svc/REST/CheckActivationCode";
+const PATIENT_REGISTRATION = "Services/Authentication.svc/REST/PatientRegistration";
 const GET_PATIENT_INFO = "Services/NHIC.svc/REST/GetPatientInfo";
 
 ///  Discharge Summary
-const GET_PENDING_DISCHARGE_SUMMARY =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingDischargeSummary";
-const GET_ALL_DISCHARGE_SUMMARY =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary";
-
-const VTE_ASSESSMENT =
-    "Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo";
+const GET_PENDING_DISCHARGE_SUMMARY = "Services/DoctorApplication.svc/REST/DoctorApp_GetPendingDischargeSummary";
+const GET_ALL_DISCHARGE_SUMMARY = "Services/DoctorApplication.svc/REST/DoctorApp_GetDischargeSummary";
 
-const GET_INTERVENTION_MEDICATION =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionMedications";
+const VTE_ASSESSMENT = "Services/Patients.svc/REST/INP_GetVTEHistoryByTransactionNo";
 
-const GET_INTERVENTION_MEDICATION_HISTORY =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionHistory";
+const GET_INTERVENTION_MEDICATION = "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionMedications";
 
-const SET_ACCEPTED_OR_REJECTED =
-    "Services/DoctorApplication.svc/REST/DoctorApp_AcceptOrRejectIntervention";
+const GET_INTERVENTION_MEDICATION_HISTORY = "Services/DoctorApplication.svc/REST/DoctorApp_GetInterventionHistory";
 
-const GET_STP_MASTER_LIST =
-    "Services/DoctorApplication.svc/REST/DoctorApp_GetSTPMasterList";
+const SET_ACCEPTED_OR_REJECTED = "Services/DoctorApplication.svc/REST/DoctorApp_AcceptOrRejectIntervention";
 
+const GET_STP_MASTER_LIST = "Services/DoctorApplication.svc/REST/DoctorApp_GetSTPMasterList";
 
-const DOCTOR_ER_SIGN_ASSESSMENT =
-    "Services/DoctorApplication.svc/REST/DoctorApp_DoctorERSignAssessment";
+const DOCTOR_ER_SIGN_ASSESSMENT = "Services/DoctorApplication.svc/REST/DoctorApp_DoctorERSignAssessment";
 
 var selectedPatientType = 1;
 
@@ -419,26 +295,8 @@ var SERVICES_PATIANT2 = [
   "List_MyReferralPatient",
   "patientArrivalList"
 ];
-var SERVICES_PATIANT_HEADER = [
-  "My OutPatient",
-  "My InPatient",
-  "Discharge",
-  "Referred",
-  "Referral Discharge",
-  "Tomorrow",
-  "Referral",
-  "Arrival Patient"
-];
-var SERVICES_PATIANT_HEADER_AR = [
-  "المريض الخارجي",
-  "المريض المنوم",
-  "المريض المعافى",
-  "المريض المحول الي",
-  "المريض المحال المعافى",
-  "مريض الغد",
-  "المريض المحول مني",
-  "المريض الواصل"
-];
+var SERVICES_PATIANT_HEADER = ["My OutPatient", "My InPatient", "Discharge", "Referred", "Referral Discharge", "Tomorrow", "Referral", "Arrival Patient"];
+var SERVICES_PATIANT_HEADER_AR = ["المريض الخارجي", "المريض المنوم", "المريض المعافى", "المريض المحول الي", "المريض المحال المعافى", "مريض الغد", "المريض المحول مني", "المريض الواصل"];
 
 const PRIMARY_COLOR = 0xff515B5D;
 
@@ -458,7 +316,6 @@ const GENERAL_ID = 'Cs2020@2016\$2958';
 const PATIENT_TYPE = 1;
 const PATIENT_TYPE_ID = 1;
 
-
 /// Timer Info
 const TIMER_MIN = 10;
 
@@ -467,7 +324,6 @@ class AppGlobal {
   static Color appRedColor = Color(0xFFD02127);
   static Color appGreenColor = Color(0xFF359846);
   static Color appTextColor = Color(0xFF2B353E);
-  static Color scheduleTextColor =  Color(0xFF2E303A);
-  static Color inProgressColor =  Color(0xFFCC9B14);
-
+  static Color scheduleTextColor = Color(0xFF2E303A);
+  static Color inProgressColor = Color(0xFFCC9B14);
 }

lib/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart

@@ -1,14 +1,18 @@
 class DoctorErSignAssessmentReqModel {
-  String setupID;
+  // String setupID;
   int signInType;
   int loginDoctorID;
   int patientID;
 
   DoctorErSignAssessmentReqModel(
-      {this.setupID, this.signInType, this.loginDoctorID, this.patientID});
+      {
+      // this.setupID,
+      this.signInType,
+      this.loginDoctorID,
+      this.patientID});
 
   DoctorErSignAssessmentReqModel.fromJson(Map<String, dynamic> json) {
-    setupID = json['SetupID'];
+    // setupID = json['SetupID'];
     signInType = json['SignInType'];
     loginDoctorID = json['LoginDoctorID'];
     patientID = json['PatientID'];
@@ -16,7 +20,7 @@ class DoctorErSignAssessmentReqModel {
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['SetupID'] = this.setupID;
+    // data['SetupID'] = this.setupID;
     data['SignInType'] = this.signInType;
     data['LoginDoctorID'] = this.loginDoctorID;
     data['PatientID'] = this.patientID;

lib/core/service/patient_medical_file/ER_signin/ER_signin_service.dart

@@ -33,10 +33,7 @@ class ERSignInService extends LookupService {
 
 
   Future signInERPatient({DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel}) async {
-
-
     hasError = false;
-
     await baseAppClient.post(DOCTOR_ER_SIGN_ASSESSMENT,
         onSuccess: (dynamic response, int statusCode) {
 

lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart

@@ -27,7 +27,7 @@ class ERSignInViewModel extends BaseViewModel {
   Future signInERPatient({int patientId, int signInType}) async {
     hasError = false;
     await getDoctorProfile();
-    DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel = new DoctorErSignAssessmentReqModel(signInType:signInType, loginDoctorID:doctorProfile.doctorID, patientID: patientId   );
+    DoctorErSignAssessmentReqModel doctorErSignAssessmentReqModel = new DoctorErSignAssessmentReqModel(signInType: signInType, loginDoctorID: doctorProfile.doctorID, patientID: patientId);
     setState(ViewState.BusyLocal);
     await _ERSignInService.signInERPatient(doctorErSignAssessmentReqModel: doctorErSignAssessmentReqModel);
     if (_ERSignInService.hasError) {
@@ -36,6 +36,4 @@ class ERSignInViewModel extends BaseViewModel {
     } else
       setState(ViewState.Idle);
   }
-
-
 }