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

Loading…
Cancel
Save