FM2-638: Mapping OpenMRS Drug Order instructions to FHIR Dosage instr… (

#548)
openmrs · Aug 14, 2024 · 47cc436 · 47cc436
1 parent 98c713f
commit 47cc436
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/DosageTranslatorImpl.java b/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/DosageTranslatorImpl.java
@@ -51,6 +51,10 @@ public Dosage toFhirResource(@Nonnull DrugOrder drugOrder) {
 		dosage.setRoute(conceptTranslator.toFhirResource(drugOrder.getRoute()));
 		dosage.setTiming(timingTranslator.toFhirResource(drugOrder));
 
+		if (drugOrder.getInstructions() != null) {
+			dosage.addAdditionalInstruction().setText(drugOrder.getInstructions());
+		}
+
 		if (drugOrder.getDose() != null) {
 			Dosage.DosageDoseAndRateComponent doseAndRate = new Dosage.DosageDoseAndRateComponent();
 			Quantity dose = new SimpleQuantity();
@@ -73,6 +77,11 @@ public Dosage toFhirResource(@Nonnull DrugOrder drugOrder) {
 	@Override
 	public DrugOrder toOpenmrsType(@Nonnull DrugOrder drugOrder, @Nonnull Dosage dosage) {
 		drugOrder.setDosingInstructions(dosage.getText());
+
+		if (dosage.hasAdditionalInstruction()) {
+			drugOrder.setInstructions(dosage.getAdditionalInstructionFirstRep().getText());
+		}
+
 		if (dosage.getAsNeededBooleanType() != null) {
 			drugOrder.setAsNeeded(dosage.getAsNeededBooleanType().getValue());
 		}

diff --git a/...src/test/java/org/openmrs/module/fhir2/api/translators/impl/DosageTranslatorImplTest.java b/...src/test/java/org/openmrs/module/fhir2/api/translators/impl/DosageTranslatorImplTest.java
@@ -109,6 +109,14 @@ public void toFhirResource_shouldTranslateDosingInstructionToDosageText() {
 		assertThat(result.getText(), equalTo(DOSING_INSTRUCTION));
 	}
 
+	@Test
+	public void toFhirResource_shouldTranslateOrdersInstructionToDosageAdditionalInstructions() {
+		drugOrder.setInstructions(DOSING_INSTRUCTION);
+		Dosage result = dosageTranslator.toFhirResource(drugOrder);
+		assertThat(result, notNullValue());
+		assertThat(result.getAdditionalInstruction().get(0).getText(), equalTo(DOSING_INSTRUCTION));
+	}
+
 	@Test
 	public void toFhirResource_shouldTranslateDrugOrderRouteToRoute() {
 		Concept concept = new Concept();
@@ -317,4 +325,16 @@ public void toOpenmrsType_shouldTranslateDoseQuantityUnitsToDrugOrderDoseUnits()
 		assertThat(result, notNullValue());
 		assertThat(result.getDoseUnits(), equalTo(mg));
 	}
+
+	@Test
+	public void toOpenmrsType_shouldTranslateAdditionalInstructionsToOrderInstructions() {
+		Dosage dosage = new Dosage();
+		CodeableConcept additionalInstructions = new CodeableConcept();
+		additionalInstructions.setText(DOSING_INSTRUCTION);
+		dosage.addAdditionalInstruction(additionalInstructions);
+
+		DrugOrder result = dosageTranslator.toOpenmrsType(new DrugOrder(), dosage);
+		assertThat(result, notNullValue());
+		assertThat(result.getInstructions(), equalTo(DOSING_INSTRUCTION));
+	}
 }