diff --git a/lib/screens/procedures/procedure_screen.dart b/lib/screens/procedures/procedure_screen.dart index f15e825d..c66b66a9 100644 --- a/lib/screens/procedures/procedure_screen.dart +++ b/lib/screens/procedures/procedure_screen.dart @@ -460,20 +460,27 @@ class _ProcedureScreenState extends State { onTap: () { // model // .updateProcedure(); - if (model + if (model.procedureList[0].entityList[index].categoryID == 02 || + model .procedureList[ 0] .entityList[ index] .categoryID == - 02 || + 03 || model .procedureList[0] .entityList[index] .categoryID == - 03) { + 55) { updateProcedureForm( context, + limetNo: model + .procedureList[ + 0] + .entityList[ + index] + .lineItemNo, model: model, orderNo: model diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart index 6918d9a2..312bdfe1 100644 --- a/lib/screens/procedures/update-procedure.dart +++ b/lib/screens/procedures/update-procedure.dart @@ -23,6 +23,7 @@ import 'package:hexcolor/hexcolor.dart'; void updateProcedureForm(context, {String procedureName, int orderNo, + int limetNo, PatiantInformtion patient, String orderType, String procedureId, @@ -45,6 +46,7 @@ void updateProcedureForm(context, procedureId: procedureId, categoryId: categoreId, orderNo: orderNo, + limetNo: limetNo, ); }); } @@ -58,6 +60,7 @@ class UpdateProcedureWidget extends StatefulWidget { final String procedureId; final String categoryId; final int orderNo; + final int limetNo; UpdateProcedureWidget( {this.model, @@ -67,7 +70,8 @@ class UpdateProcedureWidget extends StatefulWidget { this.patient, this.procedureId, this.categoryId, - this.orderNo}); + this.orderNo, + this.limetNo}); @override _UpdateProcedureWidgetState createState() => _UpdateProcedureWidgetState(); } @@ -189,7 +193,10 @@ class _UpdateProcedureWidgetState extends State { 02 || selectedCategory[ 'categoryId'] == - 03 + 03 || + selectedCategory[ + 'categoryId'] == + 55 ? EntityListCheckboxSearchWidget( model: widget.model, masterList: widget @@ -254,7 +261,7 @@ class _UpdateProcedureWidgetState extends State { setSelectedType(value); }, ), - Text(TranslationBase.of(context).urgent), + Text('routine'), Radio( activeColor: Color(0xFFB9382C), groupValue: selectedType, @@ -263,7 +270,7 @@ class _UpdateProcedureWidgetState extends State { setSelectedType(value); }, ), - Text('routine'), + Text(TranslationBase.of(context).urgent), ], ), ), @@ -308,6 +315,7 @@ class _UpdateProcedureWidgetState extends State { } Navigator.pop(context); updateProcedure( + limetNO: widget.limetNo, orderNo: widget.orderNo, orderType: selectedType.toString(), categorieId: widget.categoryId, @@ -337,6 +345,7 @@ class _UpdateProcedureWidgetState extends State { updateProcedure( {ProcedureViewModel model, String remarks, + int limetNO, int orderNo, String newProcedureId, String newCategorieId, @@ -354,20 +363,22 @@ class _UpdateProcedureWidgetState extends State { updateProcedureReqModel.episodeID = patient.episodeNo; updateProcedureReqModel.patientMRN = patient.patientMRN; - updateProcedureReqModel.lineItemNo = 1; + updateProcedureReqModel.lineItemNo = limetNO; updateProcedureReqModel.orderNo = orderNo; if (entityList.isNotEmpty) { entityList.forEach((element) { controls.add( - Controls(code: "remarks", controlValue: element.remarks ?? remarks), + Controls(code: "remarks", controlValue: element.remarks ?? ''), ); controls.add( Controls(code: "ordertype", controlValue: '1'), ); controlsProcedure.procedure = element.procedureId; - controlsProcedure.category = element.categoryID; + controlsProcedure.category = int.parse(element.categoryID) > 9 + ? element.categoryID + : "0" + element.categoryID; controlsProcedure.controls = controls; }); } else { @@ -376,13 +387,14 @@ class _UpdateProcedureWidgetState extends State { code: "remarks", controlValue: remarks.isNotEmpty ? remarks : ""), ); controls.add( - Controls(code: "ordertype", controlValue: '0'), + Controls(code: "ordertype", controlValue: orderType), ); - } - controlsProcedure.procedure = procedureId; - controlsProcedure.category = categorieId; - controlsProcedure.controls = controls; + controlsProcedure.procedure = procedureId; + controlsProcedure.category = '0' + categorieId; + + controlsProcedure.controls = controls; + } // controlsProcedure.add(ProcedureDetail( // category: categorieId, procedure: procedureId, controls: controls)); updateProcedureReqModel.procedureDetail = controlsProcedure; @@ -396,6 +408,7 @@ class _UpdateProcedureWidgetState extends State { model.getProcedure(mrn: patient.patientMRN); } else if (model.state == ViewState.Idle) { DrAppToastMsg.showSuccesToast('procedure has been updated'); + model.getProcedure(mrn: patient.patientMRN); } }