O3-3791: Dispensing: display instructions from DrugOrder.instructions… (

#116)
openmrs · Aug 15, 2024 · 47cf3c0 · 47cf3c0
1 parent a90ff57
commit 47cf3c0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/components/medication-event.component.tsx b/src/components/medication-event.component.tsx
@@ -66,6 +66,9 @@ const MedicationEvent: React.FC<{
         </p>
       )}
       {dosageInstruction?.text && <p className={styles.bodyLong01}>{dosageInstruction.text}</p>}
+      {dosageInstruction?.additionalInstruction?.length > 0 && (
+        <p className={styles.bodyLong01}>{dosageInstruction?.additionalInstruction[0].text}</p>
+      )}
     </div>
   );
 };

diff --git a/src/medication-dispense/medication-dispense.resource.tsx b/src/medication-dispense/medication-dispense.resource.tsx
@@ -135,7 +135,15 @@ export function initiateMedicationDispenseBody(
       whenHandedOver: null,
       dosageInstruction: [
         {
-          text: medicationRequest.dosageInstruction[0].text,
+          // see https://openmrs.atlassian.net/browse/O3-3791 for an explanation for the reason for the below
+          text: [
+            medicationRequest.dosageInstruction[0].text,
+            medicationRequest.dosageInstruction[0].additionalInstruction?.length > 0
+              ? medicationRequest.dosageInstruction[0].additionalInstruction[0].text
+              : null,
+          ]
+            .filter((str) => str != null)
+            .join(' '),
           timing: medicationRequest.dosageInstruction[0].timing,
           asNeededBoolean: false,
           route: medicationRequest.dosageInstruction[0].route,

diff --git a/src/types.ts b/src/types.ts
@@ -97,7 +97,7 @@ export interface Attribute {
 }
 
 export interface CodeableConcept {
-  coding: Coding[];
+  coding?: Coding[];
   text?: string;
 }
 
@@ -131,6 +131,7 @@ export interface DosageInstruction {
   doseAndRate: Array<{
     doseQuantity: Quantity;
   }>;
+  additionalInstruction?: Array<CodeableConcept>;
 }
 
 export interface Drug {