honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i18n for Patient renderer

This commit is contained in:
Grahame Grieve 2024-03-29 20:37:36 +11:00
parent 2373ab7a22
commit 89b885f191
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java
View File

@ -18,6 +18,7 @@ import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.ContactPoint; import org.hl7.fhir.r5.model.ContactPoint;
import org.hl7.fhir.r5.model.DataType; import org.hl7.fhir.r5.model.DataType;
import org.hl7.fhir.r5.model.DateType; import org.hl7.fhir.r5.model.DateType;
import org.hl7.fhir.r5.model.Enumeration;
import org.hl7.fhir.r5.model.Extension; import org.hl7.fhir.r5.model.Extension;
import org.hl7.fhir.r5.model.HumanName; import org.hl7.fhir.r5.model.HumanName;
import org.hl7.fhir.r5.model.HumanName.NameUse; import org.hl7.fhir.r5.model.HumanName.NameUse;
@ -88,7 +89,7 @@ public class PatientRenderer extends ResourceRenderer {
for (HumanName t : pat.getName()) { for (HumanName t : pat.getName()) {
n = chooseName(n, t); n = chooseName(n, t);
} }
return display(n, pat.hasGender() ? pat.getGender().getDisplay() : null, pat.getBirthDateElement(), id); return display(n, pat.hasGender() ? context.getTranslatedCode(pat.getGenderElement(), "http://hl7.org/fhir/administrative-gender") : null, pat.getBirthDateElement(), id);
} }
private Identifier chooseId(Identifier oldId, Identifier newId) { private Identifier chooseId(Identifier oldId, Identifier newId) {
@ -186,7 +187,7 @@ public class PatientRenderer extends ResourceRenderer {
String gender = null; String gender = null;
pw = getProperty(pat, "gender"); pw = getProperty(pat, "gender");
if (valued(pw)) { if (valued(pw)) {
gender = pw.value().getBase().primitiveValue(); gender = context.getTranslatedCode(pw.value().getBase(), "http://hl7.org/fhir/administrative-gender");
} }
DateType dt = null; DateType dt = null;
pw = getProperty(pat, "birthDate"); pw = getProperty(pat, "birthDate");
@ -210,7 +211,7 @@ public class PatientRenderer extends ResourceRenderer {
String gender = null; String gender = null;
pw = getProperty(pat, "gender"); pw = getProperty(pat, "gender");
if (valued(pw)) { if (valued(pw)) {
gender = context.getTranslated((PrimitiveType<?>) pw.value().getBase()); gender = context.getTranslatedCode(pw.value().getBase(), "http://hl7.org/fhir/administrative-gender");
} }
DateType dt = null; DateType dt = null;
pw = getProperty(pat, "birthDate"); pw = getProperty(pat, "birthDate");
@ -545,7 +546,7 @@ public class PatientRenderer extends ResourceRenderer {
pw = getProperty(bw, "gender"); pw = getProperty(bw, "gender");
if (pw.hasValues()) { if (pw.hasValues()) {
gender = pw.getValues().get(0).getBase().primitiveValue(); gender = context.getTranslatedCode(pw.getValues().get(0).getBase(), "http://hl7.org/fhir/administrative-gender");
} }
pw = getProperty(bw, "organization"); pw = getProperty(bw, "organization");