Merge branch 'sultan' into 'development'

Sultan

See merge request Cloud_Solution/doctor_app_flutter!491
merge-requests/492/head
Mohammad Aljammal 5 years ago
commit 6ed3a8424f

@ -1228,7 +1228,7 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
.addMedication,
fontWeight: FontWeight.w600,
onPressed: () {
// formKey.currentState.save();
formKey.currentState.save();
// Navigator.pop(context);
// openDrugToDrug();
if (route == null ||
@ -1520,21 +1520,23 @@ class _PrescriptionFormWidgetState extends State<PrescriptionFormWidget> {
getPriscriptionforDrug(List<PrescriptionModel> prescriptionList) {
var prescriptionDetails = [];
prescriptionList[0].entityList.forEach((element) {
if (element.mediSpanGPICode != null) {
prescriptionDetails.add({
'DrugId': element.mediSpanGPICode,
'DrugName': element.medicationName,
'Dose': element.doseDailyQuantity,
'DoseType': element.doseDailyUnitID,
'Unit': element.uom,
'FrequencyType': element.frequencyID,
'Duration': element.doseDurationDays,
'RouteID': element.routeID,
'IsScreen': element.isSIG
});
}
});
if (prescriptionList.length > 0) {
prescriptionList[0].entityList.forEach((element) {
if (element.mediSpanGPICode != null) {
prescriptionDetails.add({
'DrugId': element.mediSpanGPICode,
'DrugName': element.medicationName,
'Dose': element.doseDailyQuantity,
'DoseType': element.doseDailyUnitID,
'Unit': element.uom,
'FrequencyType': element.frequencyID,
'Duration': element.doseDurationDays,
'RouteID': element.routeID,
'IsScreen': element.isSIG
});
}
});
}
if (_selectedMedication.mediSpanGPICode != null) {
prescriptionDetails.add({
'DrugId': _selectedMedication.mediSpanGPICode,

Loading…
Cancel
Save