From f75ac64cad8c4468b8ce4fdfc5ae70a044bf2743 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 26 May 2021 14:47:27 +0300 Subject: [PATCH 1/2] procedure get template --- lib/client/base_app_client.dart | 4 ++- lib/config/config.dart | 2 ++ .../procedure_template_details_model.dart | 5 +-- .../procedure/procedure_service.dart | 17 +++++---- lib/core/viewModel/procedure_View_model.dart | 36 +++++++++++++++++-- .../procedures/add-favourite-procedure.dart | 8 +++-- 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 824b8189..b4e5f810 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -52,7 +52,9 @@ class BaseAppClient { if (body['EditedBy'] == '') { body.remove("EditedBy"); } - body['TokenID'] = token ?? ''; + if(body['TokenID'] == null){ + body['TokenID'] = token ?? ''; + } // body['TokenID'] = "@dm!n" ?? ''; String lang = await sharedPref.getString(APP_Language); if (lang != null && lang == 'ar') diff --git a/lib/config/config.dart b/lib/config/config.dart index 08dd8562..c8af8ad9 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -210,6 +210,8 @@ const PATIENT_MEDICAL_REPORT_VERIFIED = "Services/Patients.svc/REST/DAPP_Verifie 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'; diff --git a/lib/core/model/procedure/procedure_template_details_model.dart b/lib/core/model/procedure/procedure_template_details_model.dart index c566a539..1fc797ae 100644 --- a/lib/core/model/procedure/procedure_template_details_model.dart +++ b/lib/core/model/procedure/procedure_template_details_model.dart @@ -105,11 +105,12 @@ class ProcedureTempleteDetailsModel { } } class ProcedureTempleteDetailsModelList { - List procedureTemplate; + List procedureTemplate = List(); String templateName; + int templateId; ProcedureTempleteDetailsModelList( - {this.templateName, ProcedureTempleteDetailsModel template}) { + {this.templateName, this.templateId, ProcedureTempleteDetailsModel template}) { procedureTemplate.add(template); } } diff --git a/lib/core/service/patient_medical_file/procedure/procedure_service.dart b/lib/core/service/patient_medical_file/procedure/procedure_service.dart index 9673b9bf..756044ca 100644 --- a/lib/core/service/patient_medical_file/procedure/procedure_service.dart +++ b/lib/core/service/patient_medical_file/procedure/procedure_service.dart @@ -23,8 +23,9 @@ class ProcedureService extends BaseService { List procedureslist = List(); List categoryList = []; - List _templateList = List(); - List get templateList => _templateList; + // List _templateList = List(); + // List get templateList => _templateList; + List templateList = List(); List _templateDetailsList = List(); List get templateDetailsList => @@ -68,17 +69,19 @@ class ProcedureService extends BaseService { tokenID: "@dm!n", patientID: 0, searchType: 1, - editedBy: 208195, ); hasError = false; //insuranceApprovalInPatient.clear(); - await baseAppClient.post(GET_PROCEDURE_TEMPLETE, + await baseAppClient.post(GET_TEMPLETE_LIST/*GET_PROCEDURE_TEMPLETE*/, onSuccess: (dynamic response, int statusCode) { - //prescriptionsList.clear(); - response['HIS_ProcedureTemplateList'].forEach((template) { - _templateList.add(ProcedureTempleteModel.fromJson(template)); + templateList.clear(); + response['DAPP_TemplateGetList'].forEach((template) { + templateList.add(ProcedureTempleteDetailsModel.fromJson(template)); }); + // response['HIS_ProcedureTemplateList'].forEach((template) { + // _templateList.add(ProcedureTempleteModel.fromJson(template)); + // }); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 29b4b0e4..6ff78fd0 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -26,17 +26,22 @@ class ProcedureViewModel extends BaseViewModel { FilterType filterType = FilterType.Clinic; bool hasError = false; ProcedureService _procedureService = locator(); + List get procedureList => _procedureService.procedureList; + List get valadteProcedureList => _procedureService.valadteProcedureList; + List get categoriesList => _procedureService.categoriesList; + List get categoryList => _procedureService.categoryList; RadiologyService _radiologyService = locator(); LabsService _labsService = locator(); List _finalRadiologyListClinic = List(); List _finalRadiologyListHospital = List(); + List get finalRadiologyList => filterType == FilterType.Clinic ? _finalRadiologyListClinic @@ -50,8 +55,11 @@ class ProcedureViewModel extends BaseViewModel { List get labOrdersResultsList => _labsService.labOrdersResultsList; - List get procedureTemplate => + + List get procedureTemplate => _procedureService.templateList; + List templateList = List(); + List get procedureTemplateDetails => _procedureService.templateDetailsList; @@ -108,11 +116,35 @@ class ProcedureViewModel extends BaseViewModel { if (_procedureService.hasError) { error = _procedureService.error; setState(ViewState.ErrorLocal); - } else + } else { + setTemplateListDependOnId(); setState(ViewState.Idle); + } + } + + setTemplateListDependOnId() { + procedureTemplate.forEach((element) { + List templateListData = templateList + .where((elementTemplate) => + elementTemplate.templateId == element.templateID) + .toList(); + + if (templateListData.length != 0) { + templateList[templateList.indexOf(templateListData[0])] + .procedureTemplate + .add(element); + } else { + templateList.add(ProcedureTempleteDetailsModelList( + templateName: element.templateName, + templateId: element.templateID, + template: element)); + } + }); + print(templateList.length.toString()); } int tempId = 0; + Future getProcedureTemplateDetails({int templateId}) async { tempId = templateId; hasError = false; diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index be6e3451..f520a226 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -39,13 +39,15 @@ class _AddFavouriteProcedureState extends State { Widget build(BuildContext context) { return BaseView( onModelReady: (model) async { - if (model.procedureTemplate.length == 0) { + // TODO mosa_change + // if (model.procedureTemplate.length == 0) { model.getProcedureTemplate(); - } + // } }, builder: (BuildContext context, ProcedureViewModel model, Widget child) => AppScaffold( isShowAppBar: false, + baseViewModel: model, body: Column( children: [ Container( @@ -57,7 +59,7 @@ class _AddFavouriteProcedureState extends State { baseViewModel: model, child: EntityListCheckboxSearchFavProceduresWidget( model: widget.model, - masterList: widget.model.procedureTemplate, + // masterList: widget.model.procedureTemplate, removeFavProcedure: (item) { setState(() { entityList.remove(item); From 390a34dd818f5000b801441f70d91297eaa9a95d Mon Sep 17 00:00:00 2001 From: mosazaid Date: Wed, 26 May 2021 15:07:37 +0300 Subject: [PATCH 2/2] procedure hot fix --- .../procedure/procedure_service.dart | 13 ++++++++++--- lib/core/viewModel/procedure_View_model.dart | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/core/service/patient_medical_file/procedure/procedure_service.dart b/lib/core/service/patient_medical_file/procedure/procedure_service.dart index 756044ca..9e3d4297 100644 --- a/lib/core/service/patient_medical_file/procedure/procedure_service.dart +++ b/lib/core/service/patient_medical_file/procedure/procedure_service.dart @@ -64,20 +64,27 @@ class ProcedureService extends BaseService { ); Future getProcedureTemplate( - {int doctorId, int projectId, int clinicId}) async { + {int doctorId, int projectId, int clinicId, String categoryID}) async { _procedureTempleteRequestModel = ProcedureTempleteRequestModel( tokenID: "@dm!n", patientID: 0, searchType: 1, ); hasError = false; - //insuranceApprovalInPatient.clear(); await baseAppClient.post(GET_TEMPLETE_LIST/*GET_PROCEDURE_TEMPLETE*/, onSuccess: (dynamic response, int statusCode) { templateList.clear(); response['DAPP_TemplateGetList'].forEach((template) { - templateList.add(ProcedureTempleteDetailsModel.fromJson(template)); + ProcedureTempleteDetailsModel templateElement = ProcedureTempleteDetailsModel.fromJson(template); + if(categoryID != null){ + if(categoryID == templateElement.categoryID){ + templateList.add(templateElement); + } + } else { + templateList.add(templateElement); + } + }); // response['HIS_ProcedureTemplateList'].forEach((template) { // _templateList.add(ProcedureTempleteModel.fromJson(template)); diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 6ff78fd0..fe370800 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -108,11 +108,11 @@ class ProcedureViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getProcedureTemplate() async { + Future getProcedureTemplate({String categoryID}) async { hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); - await _procedureService.getProcedureTemplate(); + await _procedureService.getProcedureTemplate(categoryID: categoryID); if (_procedureService.hasError) { error = _procedureService.error; setState(ViewState.ErrorLocal);