Merge branch 'fix-issues' into 'development'

categories that can update

See merge request Cloud_Solution/doctor_app_flutter!335
merge-requests/336/merge
Mohammad Aljammal 5 years ago
commit 780599a8b2

@ -460,20 +460,27 @@ class _ProcedureScreenState extends State<ProcedureScreen> {
onTap: () { onTap: () {
// model // model
// .updateProcedure(); // .updateProcedure();
if (model if (model.procedureList[0].entityList[index].categoryID == 02 ||
model
.procedureList[ .procedureList[
0] 0]
.entityList[ .entityList[
index] index]
.categoryID == .categoryID ==
02 || 03 ||
model model
.procedureList[0] .procedureList[0]
.entityList[index] .entityList[index]
.categoryID == .categoryID ==
03) { 55) {
updateProcedureForm( updateProcedureForm(
context, context,
limetNo: model
.procedureList[
0]
.entityList[
index]
.lineItemNo,
model: model:
model, model,
orderNo: model orderNo: model

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

Loading…
Cancel
Save