diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index c5460859..d27f698c 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -123,7 +123,7 @@ const Map> localizedValues = { 'en': 'please enter answer', 'ar': 'الرجاء ادخال اجابة ' }, - 'replay': {'en': 'Replay', 'ar': 'تاكيد'}, + 'replay': {'en': 'Reply', 'ar': 'تاكيد'}, 'progressNote': {'en': 'Progress Note', 'ar': 'ملاحظة التقدم'}, 'progress': {'en': 'Progress', 'ar': 'التقدم'}, 'note': {'en': 'Note', 'ar': 'ملاحظة'}, 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 9e3d4297..0c284f3d 100644 --- a/lib/core/service/patient_medical_file/procedure/procedure_service.dart +++ b/lib/core/service/patient_medical_file/procedure/procedure_service.dart @@ -145,10 +145,10 @@ class ProcedureService extends BaseService { }, body: Map()); } - Future getProcedureCategory({String categoryName, String categoryID}) async { + Future getProcedureCategory({String categoryName, String categoryID,patientId}) async { _getProcedureCategoriseReqModel = GetProcedureReqModel( search: ["$categoryName"], - patientMRN: 0, + patientMRN: patientId, pageIndex: 0, clinicId: 0, pageSize: 0, diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 2c75f639..ad62158e 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -84,12 +84,11 @@ class ProcedureViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getProcedureCategory({String categoryName, String categoryID}) async { + Future getProcedureCategory({String categoryName, String categoryID, patientId}) async { hasError = false; - //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _procedureService.getProcedureCategory( - categoryName: categoryName, categoryID: categoryID); + categoryName: categoryName, categoryID: categoryID,patientId: patientId); if (_procedureService.hasError) { error = _procedureService.error; setState(ViewState.ErrorLocal); @@ -111,7 +110,6 @@ class ProcedureViewModel extends BaseViewModel { Future getProcedureTemplate({String categoryID}) async { hasError = false; - //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _procedureService.getProcedureTemplate(categoryID: categoryID); if (_procedureService.hasError) { @@ -135,10 +133,12 @@ class ProcedureViewModel extends BaseViewModel { .procedureTemplate .add(element); } else { - templateList.add(ProcedureTempleteDetailsModelList( + var template = ProcedureTempleteDetailsModelList( templateName: element.templateName, templateId: element.templateID, - template: element)); + template: element); + if(!templateList.contains(template)) + templateList.add(template); } }); print(templateList.length.toString()); diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index 0cb067e0..75552184 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/lib/models/patient/patiant_info_model.dart @@ -10,7 +10,7 @@ class PatiantInformtion { String arrivalTime; String arrivalTimeD; int callStatus; - Null callStatusDisc; + dynamic callStatusDisc; int callTypeID; String clientRequestID; String clinicName; diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 5c65ceb4..1ebc4fd3 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -3,6 +3,7 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/profile/lab_result/laboratory_result_page.dart'; +import 'package:doctor_app_flutter/screens/procedures/add_lab_home_screen.dart'; import 'package:doctor_app_flutter/screens/procedures/add_lab_orders.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/add-order/addNewOrder.dart'; @@ -111,7 +112,7 @@ class _LabsHomePageState extends State { Navigator.push( context, MaterialPageRoute( - builder: (context) => AddSelectedLabOrder( + builder: (context) => AddLabHomeScreen( patient: patient, model: model, )), diff --git a/lib/screens/procedures/add-favourite-procedure.dart b/lib/screens/procedures/add-favourite-procedure.dart index ac355a85..9b5a97ad 100644 --- a/lib/screens/procedures/add-favourite-procedure.dart +++ b/lib/screens/procedures/add-favourite-procedure.dart @@ -46,12 +46,8 @@ class _AddFavouriteProcedureState extends State { @override Widget build(BuildContext context) { return BaseView( - onModelReady: (model) async { - // TODO mosa_change - // if (model.procedureTemplate.length == 0) { - model.getProcedureTemplate(); - // } - }, + onModelReady: (model) => + model.getProcedureTemplate(categoryID: widget.categoryID), builder: (BuildContext context, ProcedureViewModel model, Widget child) => AppScaffold( isShowAppBar: false, @@ -61,14 +57,12 @@ class _AddFavouriteProcedureState extends State { Container( height: MediaQuery.of(context).size.height * 0.070, ), - if (model.procedureTemplate.length != 0) + if (model.templateList.length != 0) Expanded( child: NetworkBaseView( baseViewModel: model, child: EntityListCheckboxSearchFavProceduresWidget( - model: widget.model, - // masterList: widget.model.procedureTemplate, - //TODO change it to the new model + model: model, removeFavProcedure: (item) { setState(() { entityList.remove(item); diff --git a/lib/screens/procedures/add-procedure-form.dart b/lib/screens/procedures/add-procedure-form.dart index 844ff246..354ada19 100644 --- a/lib/screens/procedures/add-procedure-form.dart +++ b/lib/screens/procedures/add-procedure-form.dart @@ -203,6 +203,7 @@ class _AddSelectedProcedureState extends State { if (procedureName.text.isNotEmpty && procedureName.text.length >= 3) model.getProcedureCategory( + patientId: patient.patientId, categoryName: procedureName.text); else @@ -223,8 +224,8 @@ class _AddSelectedProcedureState extends State { if (procedureName.text.isNotEmpty && procedureName.text.length >= 3) model.getProcedureCategory( - categoryName: - procedureName.text); + patientId: patient.patientId, + categoryName: procedureName.text); else DrAppToastMsg.showErrorToast( TranslationBase.of(context) diff --git a/lib/screens/procedures/add_lab_orders.dart b/lib/screens/procedures/add_lab_orders.dart index a4cb4e68..b8d4e7c7 100644 --- a/lib/screens/procedures/add_lab_orders.dart +++ b/lib/screens/procedures/add_lab_orders.dart @@ -138,7 +138,7 @@ class _AddSelectedLabOrderState extends State { final screenSize = MediaQuery.of(context).size; return BaseView( onModelReady: (model) => model.getProcedureCategory( - categoryName: "Laboratory", categoryID: "02"), + categoryName: "Laboratory", categoryID: "02",patientId: patient.patientId), builder: (BuildContext context, ProcedureViewModel model, Widget child) => AppScaffold( isShowAppBar: false, @@ -158,26 +158,6 @@ class _AddSelectedLabOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - AppText( - TranslationBase.of(context).applyForNewLabOrder, - fontWeight: FontWeight.w700, - fontSize: 20, - ), - - InkWell( - child: Icon( - Icons.close, - size: 28.0, - ), - onTap: () { - Navigator.pop(context); - }, - ), - ], - ), SizedBox( height: 10.0, ), diff --git a/lib/screens/procedures/add_radiology_order.dart b/lib/screens/procedures/add_radiology_order.dart index 78e91ba8..dc68aacc 100644 --- a/lib/screens/procedures/add_radiology_order.dart +++ b/lib/screens/procedures/add_radiology_order.dart @@ -141,7 +141,7 @@ class _AddSelectedRadiologyOrderState extends State { final screenSize = MediaQuery.of(context).size; return BaseView( onModelReady: (model) => model.getProcedureCategory( - categoryName: "Radiology", categoryID: "03"), + categoryName: "Radiology", categoryID: "03",patientId: patient.patientId), builder: (BuildContext context, ProcedureViewModel model, Widget child) => AppScaffold( isShowAppBar: false, @@ -161,25 +161,6 @@ class _AddSelectedRadiologyOrderState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - AppText( - TranslationBase.of(context).newRadiologyOrder, - fontWeight: FontWeight.w700, - fontSize: 20, - ), - InkWell( - child: Icon( - Icons.close, - size: 28.0, - ), - onTap: () { - Navigator.pop(context); - }, - ), - ], - ), SizedBox( height: 10.0, ), diff --git a/lib/screens/procedures/entity_list_fav_procedure.dart b/lib/screens/procedures/entity_list_fav_procedure.dart index c5189a48..822726ce 100644 --- a/lib/screens/procedures/entity_list_fav_procedure.dart +++ b/lib/screens/procedures/entity_list_fav_procedure.dart @@ -61,14 +61,13 @@ class _EntityListCheckboxSearchFavProceduresWidgetState } List items = List(); - List itemss = List(); List itemsProcedure = List(); List remarksList = List(); List typeList = List(); @override void initState() { - items.addAll(widget.masterList); + //items.addAll(widget.masterList); super.initState(); } @@ -103,9 +102,9 @@ class _EntityListCheckboxSearchFavProceduresWidgetState SizedBox( height: 15, ), - items.length != 0 + widget.model.templateList.length != 0 ? Column( - children: itemss.map((historyInfo) { + children: widget.model.templateList.map((historyInfo) { return ExpansionProcedure( procedureTempleteModel: historyInfo, model: widget.model,