diff --git a/lib/core/model/SOAP/Allergy_model.dart b/lib/core/model/SOAP/Allergy_model.dart deleted file mode 100644 index f1a498da..00000000 --- a/lib/core/model/SOAP/Allergy_model.dart +++ /dev/null @@ -1,60 +0,0 @@ -class AllergyModel { - int allergyDiseaseId; - String allergyDiseaseName; - int allergyDiseaseType; - int appointmentNo; - int createdBy; - String createdByName; - String createdOn; - int episodeID; - bool isChecked; - bool isUpdatedByNurse; - int severity; - String severityName; - - AllergyModel( - {this.allergyDiseaseId, - this.allergyDiseaseName, - this.allergyDiseaseType, - this.appointmentNo, - this.createdBy, - this.createdByName, - this.createdOn, - this.episodeID, - this.isChecked, - this.isUpdatedByNurse, - this.severity, - this.severityName}); - - AllergyModel.fromJson(Map json) { - allergyDiseaseId = json['allergyDiseaseId']; - allergyDiseaseName = json['allergyDiseaseName']; - allergyDiseaseType = json['allergyDiseaseType']; - appointmentNo = json['appointmentNo']; - createdBy = json['createdBy']; - createdByName = json['createdByName']; - createdOn = json['createdOn']; - episodeID = json['episodeID']; - isChecked = json['isChecked']; - isUpdatedByNurse = json['isUpdatedByNurse']; - severity = json['severity']; - severityName = json['severityName']; - } - - Map toJson() { - final Map data = new Map(); - data['allergyDiseaseId'] = this.allergyDiseaseId; - data['allergyDiseaseName'] = this.allergyDiseaseName; - data['allergyDiseaseType'] = this.allergyDiseaseType; - data['appointmentNo'] = this.appointmentNo; - data['createdBy'] = this.createdBy; - data['createdByName'] = this.createdByName; - data['createdOn'] = this.createdOn; - data['episodeID'] = this.episodeID; - data['isChecked'] = this.isChecked; - data['isUpdatedByNurse'] = this.isUpdatedByNurse; - data['severity'] = this.severity; - data['severityName'] = this.severityName; - return data; - } -} diff --git a/lib/core/model/SOAP/GetPhysicalExamListResModel.dart b/lib/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetPhysicalExamListResModel.dart rename to lib/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart diff --git a/lib/core/model/SOAP/GetPhysicalExamReqModel.dart b/lib/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetPhysicalExamReqModel.dart rename to lib/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart diff --git a/lib/core/model/SOAP/post_physical_exam_request_model.dart b/lib/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_physical_exam_request_model.dart rename to lib/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart diff --git a/lib/core/model/SOAP/GetGetProgressNoteReqModel.dart b/lib/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetGetProgressNoteReqModel.dart rename to lib/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart diff --git a/lib/core/model/SOAP/GetGetProgressNoteResModel.dart b/lib/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetGetProgressNoteResModel.dart rename to lib/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart diff --git a/lib/core/model/SOAP/post_progress_note_request_model.dart b/lib/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_progress_note_request_model.dart rename to lib/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart diff --git a/lib/core/model/SOAP/get_Allergies_request_model.dart b/lib/core/model/SOAP/allergy/get_allergies_request_model.dart similarity index 100% rename from lib/core/model/SOAP/get_Allergies_request_model.dart rename to lib/core/model/SOAP/allergy/get_allergies_request_model.dart diff --git a/lib/core/model/SOAP/GetAllergiesResModel.dart b/lib/core/model/SOAP/allergy/get_allergies_res_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAllergiesResModel.dart rename to lib/core/model/SOAP/allergy/get_allergies_res_model.dart diff --git a/lib/core/model/SOAP/post_allergy_request_model.dart b/lib/core/model/SOAP/allergy/post_allergy_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_allergy_request_model.dart rename to lib/core/model/SOAP/allergy/post_allergy_request_model.dart diff --git a/lib/core/model/SOAP/GetAssessmentReqModel.dart b/lib/core/model/SOAP/assessment/get_assessment_req_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAssessmentReqModel.dart rename to lib/core/model/SOAP/assessment/get_assessment_req_model.dart diff --git a/lib/core/model/SOAP/GetAssessmentResModel.dart b/lib/core/model/SOAP/assessment/get_assessment_res_model.dart similarity index 100% rename from lib/core/model/SOAP/GetAssessmentResModel.dart rename to lib/core/model/SOAP/assessment/get_assessment_res_model.dart diff --git a/lib/core/model/SOAP/PatchAssessmentReqModel.dart b/lib/core/model/SOAP/assessment/patch_assessment_req_model.dart similarity index 100% rename from lib/core/model/SOAP/PatchAssessmentReqModel.dart rename to lib/core/model/SOAP/assessment/patch_assessment_req_model.dart diff --git a/lib/core/model/SOAP/post_assessment_request_model.dart b/lib/core/model/SOAP/assessment/post_assessment_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_assessment_request_model.dart rename to lib/core/model/SOAP/assessment/post_assessment_request_model.dart diff --git a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart similarity index 100% rename from lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart rename to lib/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart diff --git a/lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart b/lib/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart similarity index 100% rename from lib/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart rename to lib/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart diff --git a/lib/core/model/SOAP/post_chief_complaint_request_model.dart b/lib/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_chief_complaint_request_model.dart rename to lib/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart diff --git a/lib/core/model/SOAP/GetHistoryReqModel.dart b/lib/core/model/SOAP/history/GetHistoryReqModel.dart similarity index 100% rename from lib/core/model/SOAP/GetHistoryReqModel.dart rename to lib/core/model/SOAP/history/GetHistoryReqModel.dart diff --git a/lib/core/model/SOAP/GetHistoryResModel.dart b/lib/core/model/SOAP/history/GetHistoryResModel.dart similarity index 100% rename from lib/core/model/SOAP/GetHistoryResModel.dart rename to lib/core/model/SOAP/history/GetHistoryResModel.dart diff --git a/lib/core/model/SOAP/post_histories_request_model.dart b/lib/core/model/SOAP/history/post_histories_request_model.dart similarity index 100% rename from lib/core/model/SOAP/post_histories_request_model.dart rename to lib/core/model/SOAP/history/post_histories_request_model.dart diff --git a/lib/core/model/countriesModel.dart b/lib/core/model/countries_model.dart similarity index 98% rename from lib/core/model/countriesModel.dart rename to lib/core/model/countries_model.dart index 89797fab..8628ff6b 100644 --- a/lib/core/model/countriesModel.dart +++ b/lib/core/model/countries_model.dart @@ -1,20 +1,3 @@ -// final List countries = [ -// new Countries( -// name: "Saudi Arabia", name_ar: "المملكة العربية السعودية", code: '966'), -// new Countries( -// name: "United Arab Emirates", -// name_ar: "الإمارات العربية المتحدة", -// code: '971'), -// ]; - -// class Countries { -// final String name; -// final String name_ar; -// final String code; - -// Countries({this.name, this.name_ar, this.code}); -// } - class Countries { String name; String nameAr; diff --git a/lib/core/insurance_approval_request_model.dart b/lib/core/model/insurance_approval_request_model.dart similarity index 100% rename from lib/core/insurance_approval_request_model.dart rename to lib/core/model/insurance_approval_request_model.dart diff --git a/lib/core/model/labs/LabOrderResult.dart b/lib/core/model/labs/lab_order_result.dart similarity index 100% rename from lib/core/model/labs/LabOrderResult.dart rename to lib/core/model/labs/lab_order_result.dart diff --git a/lib/core/model/labs/LabResultHistory.dart b/lib/core/model/labs/lab_result_history.dart similarity index 100% rename from lib/core/model/labs/LabResultHistory.dart rename to lib/core/model/labs/lab_result_history.dart diff --git a/lib/core/model/labs/request_patient_lab_orders.dart b/lib/core/model/labs/request_patient_lab_orders.dart deleted file mode 100644 index 3ee099a5..00000000 --- a/lib/core/model/labs/request_patient_lab_orders.dart +++ /dev/null @@ -1,64 +0,0 @@ -class RequestPatientLabOrders { - double versionID; - int channel; - int languageID; - String iPAdress; - String generalid; - int patientOutSA; - String sessionID; - bool isDentalAllowedBackend; - int deviceTypeID; - int patientID; - String tokenID; - int patientTypeID; - int patientType; - - RequestPatientLabOrders( - {this.versionID, - this.channel, - this.languageID, - this.iPAdress, - this.generalid, - this.patientOutSA, - this.sessionID, - this.isDentalAllowedBackend, - this.deviceTypeID, - this.patientID, - this.tokenID, - this.patientTypeID, - this.patientType}); - - RequestPatientLabOrders.fromJson(Map json) { - versionID = json['VersionID']; - channel = json['Channel']; - languageID = json['LanguageID']; - iPAdress = json['IPAdress']; - generalid = json['generalid']; - patientOutSA = json['PatientOutSA']; - sessionID = json['SessionID']; - isDentalAllowedBackend = json['isDentalAllowedBackend']; - deviceTypeID = json['DeviceTypeID']; - patientID = json['PatientID']; - tokenID = json['TokenID']; - patientTypeID = json['PatientTypeID']; - patientType = json['PatientType']; - } - - Map toJson() { - final Map data = new Map(); - data['VersionID'] = this.versionID; - data['Channel'] = this.channel; - data['LanguageID'] = this.languageID; - data['IPAdress'] = this.iPAdress; - data['generalid'] = this.generalid; - data['PatientOutSA'] = this.patientOutSA; - data['SessionID'] = this.sessionID; - data['isDentalAllowedBackend'] = this.isDentalAllowedBackend; - data['DeviceTypeID'] = this.deviceTypeID; - data['PatientID'] = this.patientID; - data['TokenID'] = this.tokenID; - data['PatientTypeID'] = this.patientTypeID; - data['PatientType'] = this.patientType; - return data; - } -} diff --git a/lib/core/service/base/lookup-service.dart b/lib/core/service/base/lookup-service.dart index f68aa01a..d630f07a 100644 --- a/lib/core/service/base/lookup-service.dart +++ b/lib/core/service/base/lookup-service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'base_service.dart'; diff --git a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart index 1fcc4f78..029f3b8c 100644 --- a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart +++ b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/insurance_approval_request_model.dart'; +import 'package:doctor_app_flutter/core/model/insurance_approval_request_model.dart'; import 'package:doctor_app_flutter/core/model/insurance/insurance_approval.dart'; import 'package:doctor_app_flutter/core/model/insurance/insurance_approval_in_patient_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; diff --git a/lib/core/service/patient_medical_file/lab_order/labs_service.dart b/lib/core/service/patient_medical_file/lab_order/labs_service.dart index a7772e4d..e4cb93bf 100644 --- a/lib/core/service/patient_medical_file/lab_order/labs_service.dart +++ b/lib/core/service/patient_medical_file/lab_order/labs_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_request.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; diff --git a/lib/core/service/patient_medical_file/prescription/medicine_service.dart b/lib/core/service/patient_medical_file/prescription/medicine_service.dart index 5d059f99..cd61e783 100644 --- a/lib/core/service/patient_medical_file/prescription/medicine_service.dart +++ b/lib/core/service/patient_medical_file/prescription/medicine_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_List_request_model.dart'; import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_items_request_model.dart'; diff --git a/lib/core/service/patient_medical_file/prescription/prescription_service.dart b/lib/core/service/patient_medical_file/prescription/prescription_service.dart index 4c38ea8c..1b084ada 100644 --- a/lib/core/service/patient_medical_file/prescription/prescription_service.dart +++ b/lib/core/service/patient_medical_file/prescription/prescription_service.dart @@ -14,15 +14,15 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order. import 'package:doctor_app_flutter/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report_enh.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/calculate_box_request_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/item_by_medicine_request_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/search_drug_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/search_drug_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart index 68d7ce83..0bfdabb8 100644 --- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -1,28 +1,28 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart'; import '../../base/lookup-service.dart'; diff --git a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart index 4305dbec..fd7d4830 100644 --- a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart +++ b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart'; diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 23a49296..7b42af20 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1,32 +1,31 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/soap/SOAP_service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart'; diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 2ddd70d1..0bb6a797 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index 5f4622a5..440fc03d 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,13 +1,13 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.dart'; import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/medicine_service.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/procedure/procedure_service.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_container.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/core/viewModel/patient-ucaf-viewmodel.dart b/lib/core/viewModel/patient-ucaf-viewmodel.dart index 143690d6..466977a8 100644 --- a/lib/core/viewModel/patient-ucaf-viewmodel.dart +++ b/lib/core/viewModel/patient-ucaf-viewmodel.dart @@ -2,10 +2,10 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; diff --git a/lib/core/viewModel/prescription/prescription_view_model.dart b/lib/core/viewModel/prescription/prescription_view_model.dart index e52f16ce..720e7cfd 100644 --- a/lib/core/viewModel/prescription/prescription_view_model.dart +++ b/lib/core/viewModel/prescription/prescription_view_model.dart @@ -8,8 +8,8 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart'; import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 21ce023b..ee03c2db 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_special_result.dart'; diff --git a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart index 21c3deab..5ac4555a 100644 --- a/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart +++ b/lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart index 474c92bd..aea99af0 100644 --- a/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_chart_and_detials.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart index 0c0bb010..df213e11 100644 --- a/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart +++ b/lib/screens/patients/profile/lab_result/history/lab_result_history_details_wideget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart b/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart index cad8c1ea..e07990b9 100644 --- a/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart +++ b/lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:fl_chart/fl_chart.dart'; diff --git a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart index 2125e649..82e2dc7f 100644 --- a/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart +++ b/lib/screens/patients/profile/lab_result/laboratory_result/lab_result_details_wideget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; +import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/utils/date-utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 44a4fa73..fe6ca1c1 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_assement.dart'; import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; diff --git a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart index d728125e..091eb63f 100644 --- a/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart +++ b/lib/screens/patients/profile/soap_update/objective/update_objective_page.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart'; import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; diff --git a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart index c1f7c6b4..cabef7e2 100644 --- a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart +++ b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart @@ -1,11 +1,11 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart'; import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; diff --git a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart index 2ce61af0..d26e4848 100644 --- a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart +++ b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart @@ -2,11 +2,11 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-vital-sign-viewmodel.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart'; diff --git a/lib/screens/prescription/prescription_checkout_screen.dart b/lib/screens/prescription/prescription_checkout_screen.dart index 86567eff..b6aadb73 100644 --- a/lib/screens/prescription/prescription_checkout_screen.dart +++ b/lib/screens/prescription/prescription_checkout_screen.dart @@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart'; +import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart'; import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/prescription/prescription_text_filed.dart';