Merge branch 'fix-issues' into 'development'

Medical Report & update Prescription form update

See merge request Cloud_Solution/doctor_app_flutter!342
merge-requests/343/merge
Mohammad Aljammal 5 years ago
commit 929a515a7c

@ -303,8 +303,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
});
},
child: Icon(isHistoryExpand
? EvaIcons.minus
: EvaIcons.plus))
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: ListView.builder(
@ -404,8 +404,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
});
},
child: Icon(isAssessmentExpand
? EvaIcons.minus
: EvaIcons.plus))
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: ListView.builder(
@ -584,8 +584,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
});
},
child: Icon(isProcedureExpand
? EvaIcons.minus
: EvaIcons.plus))
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: ListView.builder(
@ -758,8 +758,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
});
},
child: Icon(isPhysicalExam
? EvaIcons.minus
: EvaIcons.plus))
? EvaIcons.arrowUp
: EvaIcons.arrowDown))
],
),
bodyWidget: ListView.builder(

@ -630,7 +630,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
.toString(),
patient: patient,
drugId: model.prescriptionList[0].entityList[index].medicineCode,
drugName: model.prescriptionList[0].entityList[index].doseDetail,
drugName: model.prescriptionList[0].entityList[index].medicationName,
remarks: model.prescriptionList[0].entityList[index].remarks,
model: model,
enteredRemarks: model.prescriptionList[0].entityList[index].remarks,

Loading…
Cancel
Save