Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'DAPP_99_soap_model' into 'development'

Browse Source 
episode refactor names  part 2

See merge request Cloud_Solution/doctor_app_flutter!987
merge-requests/988/merge
Elham Ali 4 years ago
parent 010310eb48 e73271cb29
commit 323e3f3538
21 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File

0
lib/core/model/SOAP/GeneralGetReqForSOAP.dart → lib/core/model/SOAP/general_get_req_for_SOAP.dart
Unescape Escape View File

0
lib/core/model/SOAP/history/GetHistoryResModel.dart → lib/core/model/SOAP/history/get_history_res_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart → lib/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart → lib/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/PhysicalExam/GetPhysicalExamListResModel.dart → lib/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/PhysicalExam/GetPhysicalExamReqModel.dart → lib/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/PhysicalExam/post_physical_exam_request_model.dart → lib/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/PostEpisodeReqModel.dart → lib/core/model/SOAP/post_episode_req_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/ProgressNote/GetGetProgressNoteResModel.dart → lib/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart
Unescape Escape View File

6
lib/core/model/SOAP/ProgressNote/GetGetProgressNoteReqModel.dart → lib/core/model/SOAP/progress_note/get_progress_note_req_model.dart
Unescape Escape View File

@ -1,4 +1,4 @@
class GetGetProgressNoteReqModel {
class GetProgressNoteReqModel {
int patientMRN;
int appointmentNo;
String episodeID;
@ -8,7 +8,7 @@ class GetGetProgressNoteReqModel {
dynamic doctorID;
dynamic editedBy;
GetGetProgressNoteReqModel(
GetProgressNoteReqModel(
{this.patientMRN,
this.appointmentNo,
this.episodeID,
@ -18,7 +18,7 @@ class GetGetProgressNoteReqModel {
this.editedBy,
this.doctorID});
GetGetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
GetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
patientMRN = json['PatientMRN'];
appointmentNo = json['AppointmentNo'];
episodeID = json['EpisodeID'];

0
lib/core/model/SOAP/ProgressNote/post_progress_note_request_model.dart → lib/core/model/SOAP/progress_note/post_progress_note_request_model.dart
Unescape Escape View File

0
lib/core/model/SOAP/order-procedure.dart → lib/core/model/procedure/order-procedure.dart
Unescape Escape View File

26
lib/core/service/patient_medical_file/soap/SOAP_service.dart
Unescape Escape View File

@ -1,28 +1,26 @@
import 'package:doctor_app_flutter/config/config.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/general_get_req_for_SOAP.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/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/post_episode_req_model.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/get_history_req_model.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/history/get_history_res_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_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/physical_exam/get_physical_exam_list_res_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart';
import '../../base/lookup-service.dart';
@ -275,7 +273,7 @@ class SOAPService extends LookupService {
}
Future getPatientProgressNote(
GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
GetProgressNoteReqModel getGetProgressNoteReqModel) async {
hasError = false;
await baseAppClient.post(GET_PROGRESS_NOTE,
onSuccess: (dynamic response, int statusCode) {

2
lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
Unescape Escape View File

@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.d
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/order-procedure.dart';
import 'package:doctor_app_flutter/core/model/procedure/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';

31
lib/core/viewModel/SOAP_view_model.dart
Unescape Escape View File

@ -2,30 +2,30 @@ 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/get_history_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/history/GetHistoryResModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_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/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/GeneralGetReqForSOAP.dart';
import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.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/in_patient/GetEpisodeForInpatientReqModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/master_key_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';
@ -314,7 +314,7 @@ class SOAPViewModel extends BaseViewModel {
}
Future getPatientProgressNote(
GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
GetProgressNoteReqModel getGetProgressNoteReqModel) async {
setState(ViewState.Busy);
await _SOAPService.getPatientProgressNote(getGetProgressNoteReqModel);
if (_SOAPService.hasError) {
@ -428,13 +428,6 @@ class SOAPViewModel extends BaseViewModel {
return result.first;
}
break;
// case MasterKeysService.physiotherapyGoals:
// listOfPhysiotherapyGoals.clear();
// entryList.forEach((v) {
// listOfPhysiotherapyGoals.add(MasterKeyModel.fromJson(v));
// });
// break;
case MasterKeysService.DiagnosisType:
List<MasterKeyModel> result = listOfDiagnosisType.where((element) {
return element.id == id &&

2
lib/core/viewModel/patient-ucaf-viewmodel.dart
Unescape Escape View File

@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_com
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/master_key_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart';
import 'package:doctor_app_flutter/core/model/procedure/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';
import 'package:doctor_app_flutter/utils/date-utils.dart';

2
lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart
Unescape Escape View File

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart';
import 'package:doctor_app_flutter/core/model/procedure/order-procedure.dart';
import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';

4
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
Unescape Escape View File

@ -6,8 +6,8 @@ import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
import 'package:doctor_app_flutter/core/service/VideoCallService.dart';
import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_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/live_care/end_call_screen.dart';

2
lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
Unescape Escape View File

@ -3,9 +3,9 @@ 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/physical_exam/post_physical_exam_request_model.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/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';

18
lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
Unescape Escape View File

@ -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/model/SOAP/progress_note/GetGetProgressNoteResModel.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart';
import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.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/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';
@ -78,8 +78,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage>
getPatientProgressNote(SOAPViewModel model,
{bool isAddProgress = false}) async {
GetGetProgressNoteReqModel getGetProgressNoteReqModel =
GetGetProgressNoteReqModel(
GetProgressNoteReqModel getGetProgressNoteReqModel =
GetProgressNoteReqModel(
appointmentNo:
int.parse(widget.patientInfo.appointmentNo.toString()),
patientMRN: widget.patientInfo.patientMRN,
@ -118,8 +118,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage>
return BaseView<SOAPViewModel>(
onModelReady: (model) async {
widget.sOAPViewModel.setPlanCallBack(this);
GetGetProgressNoteReqModel getGetProgressNoteReqModel =
GetGetProgressNoteReqModel(
GetProgressNoteReqModel getGetProgressNoteReqModel =
GetProgressNoteReqModel(
appointmentNo:
int.parse(widget.patientInfo.appointmentNo.toString()),
patientMRN: widget.patientInfo.patientMRN,
@ -378,8 +378,8 @@ class _UpdatePlanPageState extends State<UpdatePlanPage>
if (widget.sOAPViewModel.state == ViewState.ErrorLocal) {
Utils.showErrorToast(widget.sOAPViewModel.error);
} else {
GetGetProgressNoteReqModel getGetProgressNoteReqModel =
GetGetProgressNoteReqModel(
GetProgressNoteReqModel getGetProgressNoteReqModel =
GetProgressNoteReqModel(
appointmentNo:
int.parse(widget.patientInfo.appointmentNo.toString()),
patientMRN: widget.patientInfo.patientMRN,

2
lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
Unescape Escape View File

@ -6,7 +6,7 @@ import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res
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/general_get_req_for_SOAP.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';

Write Preview
Loading…
Cancel
Save