diff --git a/lib/core/model/procedure/get_procedure_req_model.dart b/lib/core/model/procedure/get_procedure_req_model.dart index 1769f43f..6202a520 100644 --- a/lib/core/model/procedure/get_procedure_req_model.dart +++ b/lib/core/model/procedure/get_procedure_req_model.dart @@ -4,7 +4,7 @@ class GetProcedureReqModel { int pageSize; int pageIndex; List search; - dynamic categoryId; + dynamic category; String vidaAuthTokenID; GetProcedureReqModel( @@ -13,7 +13,7 @@ class GetProcedureReqModel { this.pageSize, this.pageIndex, this.search, - this.categoryId, + this.category, this.vidaAuthTokenID}); GetProcedureReqModel.fromJson(Map json) { @@ -22,7 +22,7 @@ class GetProcedureReqModel { pageSize = json['PageSize']; pageIndex = json['PageIndex']; search = json['Search'].cast(); - categoryId = json['CategoryId']; + category = json['Category']; vidaAuthTokenID = json['VidaAuthTokenID']; } @@ -33,7 +33,7 @@ class GetProcedureReqModel { data['PageSize'] = this.pageSize; data['PageIndex'] = this.pageIndex; data['Search'] = this.search; - data['CategoryId'] = this.categoryId; + data['Category'] = this.category; data['VidaAuthTokenID'] = this.vidaAuthTokenID; return data; } diff --git a/lib/core/service/procedure_service.dart b/lib/core/service/procedure_service.dart index 515e0e50..1ec996fb 100644 --- a/lib/core/service/procedure_service.dart +++ b/lib/core/service/procedure_service.dart @@ -73,13 +73,14 @@ class ProcedureService extends BaseService { }, body: Map()); } - Future getProcedureCategory({String categoryName}) async { + Future getProcedureCategory({String categoryName, String categoryID}) async { _getProcedureCategoriseReqModel = GetProcedureReqModel( - search: [categoryName], + search: [""], patientMRN: 0, - pageIndex: 1, + pageIndex: 0, clinicId: 0, - pageSize: 300, + pageSize: 0, + category: categoryID, ); hasError = false; _categoriesList.clear(); diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 440724b7..a753052c 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -29,11 +29,12 @@ class ProcedureViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getProcedureCategory({String categoryName}) async { + Future getProcedureCategory({String categoryName, String categoryID}) async { hasError = false; //_insuranceCardService.clearInsuranceCard(); - setState(ViewState.BusyLocal); - await _procedureService.getProcedureCategory(categoryName: categoryName); + setState(ViewState.Busy); + await _procedureService.getProcedureCategory( + categoryName: categoryName, categoryID: categoryID); if (_procedureService.hasError) { error = _procedureService.error; setState(ViewState.ErrorLocal); diff --git a/lib/screens/procedures/add-procedure-form.dart b/lib/screens/procedures/add-procedure-form.dart index 0d34da6b..11eadbb0 100644 --- a/lib/screens/procedures/add-procedure-form.dart +++ b/lib/screens/procedures/add-procedure-form.dart @@ -147,7 +147,17 @@ class _AddSelectedProcedureState extends State { selectedCategory = selectedValue; model.getProcedureCategory( categoryName: selectedCategory[ - 'categoryName']); + 'categoryName'], + categoryID: selectedCategory[ + 'categoryId'] <= + 9 + ? "0" + + selectedCategory[ + 'categoryId'] + .toString() + : selectedCategory[ + 'categoryId'] + .toString()); }); }, ); diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart index 7036bc0d..a29100f5 100644 --- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart +++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart @@ -37,6 +37,13 @@ class EntityListCheckboxSearchWidget extends StatefulWidget { class _EntityListCheckboxSearchWidgetState extends State { + int selectedType; + setSelectedType(int val) { + setState(() { + selectedType = val; + }); + } + List items = List(); @override diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 9239527c..2c502334 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -135,7 +135,17 @@ class _UpdateProcedureWidgetState extends State { model.getProcedureCategory( categoryName: selectedCategory[ - 'categoryName']); + 'categoryName'], + categoryID: selectedCategory[ + 'categoryId'] <= + 9 + ? "0" + + selectedCategory[ + 'categoryId'] + .toString() + : selectedCategory[ + 'categoryId'] + .toString()); }); }, );