FM2-631: HumanName.text should use the NameTemplate

openmrs · Jan 12, 2024 · cd74bb9 · cd74bb9
1 parent b4dcbe2
commit cd74bb9
Show file tree

Hide file tree

Showing 2 changed files with 282 additions and 216 deletions.
diff --git a/...src/main/java/org/openmrs/module/fhir2/api/translators/impl/PersonNameTranslatorImpl.java b/...src/main/java/org/openmrs/module/fhir2/api/translators/impl/PersonNameTranslatorImpl.java
@@ -18,6 +18,8 @@
 import org.hl7.fhir.r4.model.HumanName;
 import org.hl7.fhir.r4.model.StringType;
 import org.openmrs.PersonName;
+import org.openmrs.layout.name.NameSupport;
+import org.openmrs.layout.name.NameTemplate;
 import org.openmrs.module.fhir2.FhirConstants;
 import org.openmrs.module.fhir2.api.translators.PersonNameTranslator;
 import org.springframework.stereotype.Component;
@@ -50,6 +52,8 @@ public HumanName toFhirResource(@Nonnull PersonName name) {
 		addNameExtension(humanName, "familyName2", name.getFamilyName2());
 		addNameExtension(humanName, "familyNameSuffix", name.getFamilyNameSuffix());
 		addNameExtension(humanName, "degree", name.getDegree());
+
+		humanName.setText(name.getFullName());
 
 		return humanName;
 	}