diff --git a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx index 151098d71ec..8e5fb21112d 100644 --- a/src/Components/Medicine/PrescriptionAdministrationsTable.tsx +++ b/src/Components/Medicine/PrescriptionAdministrationsTable.tsx @@ -158,19 +158,21 @@ export default function PrescriptionAdministrationsTable({ />
- {t("medicine")}
-
- Dosage & -- {!state?.prescriptions[0]?.is_prn - ? "Frequency" - : "Indicator"} - - + |
+
+ {t("medicine")}
+
+
Dosage & ++ {!state?.prescriptions[0]?.is_prn + ? "Frequency" + : "Indicator"} + + + |
@@ -405,40 +407,42 @@ const PrescriptionRow = ({ prescription, ...props }: PrescriptionRowProps) => { )} | setShowDetails(true)}
>
-
-
+
-
-
-
+
+ {prescription.medicine_object?.name ?? prescription.medicine_old}
+
+
+ {prescription.discontinued && (
+
+ {t("discontinued")}
+
)}
- >
- {prescription.medicine_object?.name ?? prescription.medicine_old}
-
- {prescription.discontinued && (
-
- {t("discontinued")}
-
- )}
+ {prescription.route && (
+
+ {t(prescription.route)}
+
+ )}
+
- {prescription.route && (
-
- {t(prescription.route)}
-
- )}
+
+ {prescription.dosage} ++ {!prescription.is_prn + ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency) + : prescription.indicator} + +{prescription.dosage} -- {!prescription.is_prn - ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency) - : prescription.indicator} - - |
---|