diff --git a/src/components/MedicationStatus/MedicationStatus.jsx b/src/components/MedicationStatus/MedicationStatus.jsx index 5fac43f..65cf645 100644 --- a/src/components/MedicationStatus/MedicationStatus.jsx +++ b/src/components/MedicationStatus/MedicationStatus.jsx @@ -43,10 +43,11 @@ export const getStatusColor = status => { switch (status) { case 'completed': return 'green'; + case 'on-hold': + return '#f0ad4e'; case 'preparation': case 'in-progress': case 'cancelled': - case 'on-hold': case 'entered-in-error': case 'stopped': case 'declined': @@ -62,10 +63,11 @@ export const getStatusText = status => { return 'Picked Up'; case 'unknown': return 'Not Started'; + case 'on-hold': + return 'On Hold'; case 'preparation': case 'in-progress': case 'cancelled': - case 'on-hold': case 'entered-in-error': case 'stopped': case 'declined': diff --git a/src/components/MedicationStatus/MedicationStatusModal.jsx b/src/components/MedicationStatus/MedicationStatusModal.jsx index 93b4dfd..8a80489 100644 --- a/src/components/MedicationStatus/MedicationStatusModal.jsx +++ b/src/components/MedicationStatus/MedicationStatusModal.jsx @@ -11,6 +11,7 @@ export const MedicationStatusModal = props => { const [spin, setSpin] = useState(false); const color = getStatusColor(medicationDispense?.status); const status = getStatusText(medicationDispense?.status); + const note = medicationDispense?.note ? medicationDispense?.note[0]?.text : ""; useEffect(() => { if (update) { @@ -29,6 +30,7 @@ export const MedicationStatusModal = props => {
ID: {getIdText(medicationDispense)}
Status: {status}
+
Note: {note}
diff --git a/src/util/fhir.js b/src/util/fhir.js index 7ad5bd3..6a65276 100644 --- a/src/util/fhir.js +++ b/src/util/fhir.js @@ -59,6 +59,7 @@ function createMedicationDispenseFromMedicationRequest(medicationRequest) { medicationDispense.authorizingPrescription = [ { reference: 'MedicationRequest/' + medicationRequest.id } ]; + medicationDispense.note = [ { text: "Medication sent to pharmacy" } ]; return medicationDispense; }