Add Prescription changes

merge-requests/641/head
hussam al-habibeh 5 years ago
parent c4a6d9ad6f
commit f07208586d

@ -438,7 +438,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.550, 0.450,
child: TextFields( child: TextFields(
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter( LengthLimitingTextInputFormatter(
@ -513,7 +513,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
width: MediaQuery.of(context) width: MediaQuery.of(context)
.size .size
.width * .width *
0.350, 0.450,
child: InkWell( child: InkWell(
onTap: onTap:
model.itemMedicineListUnit != model.itemMedicineListUnit !=
@ -561,14 +561,13 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
child: TextField( child: TextField(
decoration: decoration:
textFieldSelectorDecoration( textFieldSelectorDecoration(
TranslationBase.of( 'Select',
context)
.unit,
model.itemMedicineListUnit model.itemMedicineListUnit
.length == .length ==
1 1
? model.itemMedicineListUnit[ ? units = model
0][ .itemMedicineListUnit[0]
[
'description'] 'description']
: units != : units !=
null null
@ -640,16 +639,16 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
TranslationBase.of( TranslationBase.of(
context) context)
.route, .route,
route != null model.itemMedicineListRoute
? model.itemMedicineListRoute .length ==
.length == 1
1 ? model.itemMedicineListRoute[
? model.itemMedicineListRoute[ 0]
0][ ['description']
'description'] : route != null
: route[ ? route[
'description'] 'description']
: null, : null,
true), true),
enabled: false, enabled: false,
), ),
@ -731,16 +730,16 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
TranslationBase.of( TranslationBase.of(
context) context)
.frequency, .frequency,
frequency != null model.itemMedicineList
? model.itemMedicineList .length ==
.length == 1
1 ? model.itemMedicineList[
? model.itemMedicineList[ 0]
0][ ['description']
'description'] : frequency != null
: frequency[ ? frequency[
'description'] 'description']
: null, : null,
true), true),
enabled: false, enabled: false,
), ),
@ -1150,12 +1149,13 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
formKey.currentState.save(); formKey.currentState.save();
// Navigator.pop(context); // Navigator.pop(context);
// openDrugToDrug(); // openDrugToDrug();
if (route == null || if (frequency == null ||
frequency == null || strengthController
.text ==
null ||
doseTime == null || doseTime == null ||
duration == null || duration == null ||
selectedDate == null || selectedDate == null) {
units == null) {
DrAppToastMsg.showErrorToast( DrAppToastMsg.showErrorToast(
TranslationBase.of( TranslationBase.of(
context) context)
@ -1218,27 +1218,48 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
// // .trim()) // // .trim())
// // .toList() // // .toList()
// // .join(' '), // // .join(' '),
// dose: // dose: strengthController
// strengthController // .text,
// .text, // doseUnit: model
// doseUnit: units[ // .itemMedicineListUnit
// 'parameterCode'] // .length ==
// .toString(), // 1
// patient: // ? model
// widget.patient, // .itemMedicineListUnit[
// 0][
// 'parameterCode']
// .toString()
// : units['parameterCode']
// .toString(),
// patient: widget.patient,
// doseTimeIn: // doseTimeIn:
// doseTime['id'] // doseTime['id']
// .toString(), // .toString(),
// model: widget.model, // model: widget.model,
// duration: // duration: duration['id']
// duration['id']
// .toString(),
// frequency: frequency[
// 'parameterCode']
// .toString(),
// route: route[
// 'parameterCode']
// .toString(), // .toString(),
// frequency: model
// .itemMedicineList
// .length ==
// 1
// ? model
// .itemMedicineList[
// 0][
// 'parameterCode']
// .toString()
// : frequency[
// 'parameterCode']
// .toString(),
// route: model.itemMedicineListRoute
// .length ==
// 1
// ? model
// .itemMedicineListRoute[
// 0][
// 'parameterCode']
// .toString()
// : route['parameterCode']
// .toString(),
// drugId: // drugId:
// _selectedMedication // _selectedMedication
// .itemId // .itemId
@ -1252,8 +1273,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
// instruction: // instruction:
// instructionController // instructionController
// .text, // .text,
// doseTime: // doseTime: selectedDate,
// selectedDate,
// ); // );
} }
} }
@ -1362,7 +1382,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
children: [ children: [
DrugToDrug( DrugToDrug(
widget.patient, widget.patient,
getPriscriptionforDrug(widget.prescriptionList), getPriscriptionforDrug(widget.prescriptionList, model),
model.patientAssessmentList), model.patientAssessmentList),
Container( Container(
margin: EdgeInsets.all(SizeConfig.widthMultiplier * 3), margin: EdgeInsets.all(SizeConfig.widthMultiplier * 3),
@ -1447,7 +1467,17 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
}); });
} }
getPriscriptionforDrug(List<PrescriptionModel> prescriptionList) { // selectedValue(itemMdeicationList,key){
// // String selected = "";
// // units[key]=itemMdeicationList.length==1? itemMdeicationList[0][key]:units[key].toString();
// //
// // selected = units[key];
// //
// // return selected;
// // }
getPriscriptionforDrug(
List<PrescriptionModel> prescriptionList, MedicineViewModel model) {
var prescriptionDetails = []; var prescriptionDetails = [];
if (prescriptionList.length > 0) { if (prescriptionList.length > 0) {
prescriptionList[0].entityList.forEach((element) { prescriptionList[0].entityList.forEach((element) {
@ -1471,11 +1501,19 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
'DrugId': _selectedMedication.mediSpanGPICode, 'DrugId': _selectedMedication.mediSpanGPICode,
'DrugName': _selectedMedication.description, 'DrugName': _selectedMedication.description,
'Dose': strengthController.text, 'Dose': strengthController.text,
'DoseType': units['parameterCode'].toString(), 'DoseType': model.itemMedicineListUnit.length == 1
'Unit': units['description'], ? model.itemMedicineListUnit[0]['parameterCode'].toString()
'FrequencyType': frequency['parameterCode'].toString(), : units['parameterCode'].toString(),
'Unit': model.itemMedicineListUnit.length == 1
? model.itemMedicineListUnit[0]['description']
: units['description'],
'FrequencyType': model.itemMedicineList.length == 1
? model.itemMedicineList[0]['parameterCode']
: frequency['parameterCode'].toString(),
'Duration': duration['id'].toString(), 'Duration': duration['id'].toString(),
'RouteID': route['parameterCode'].toString(), 'RouteID': model.itemMedicineListRoute.length == 1
? model.itemMedicineListRoute[0]['parameterCode'].toString()
: route['parameterCode'].toString(),
'IsScreen': true 'IsScreen': true
}); });
} }

Loading…
Cancel
Save