fix PatientRenderer

This commit is contained in:
Grahame Grieve 2022-03-16 08:30:25 +11:00
parent 535a9cd9c9
commit 5ae5e5d4c8
1 changed files with 5 additions and 4 deletions

View File

@ -162,7 +162,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)) {
pw.value().getBase().primitiveValue(); gender = pw.value().getBase().primitiveValue();
} }
DateType dt = null; DateType dt = null;
pw = getProperty(pat, "birthDate"); pw = getProperty(pat, "birthDate");
@ -182,11 +182,11 @@ public class PatientRenderer extends ResourceRenderer {
} else { } else {
b.append(gender); b.append(gender);
} }
b.append(" "); b.append(", ");
if (dob == null) { if (dob == null) {
b.append("DoB Unknown"); b.append("DoB Unknown");
} else { } else {
b.append(display(dob)); b.append("DoB: "+display(dob));
} }
if (id != null) { if (id != null) {
b.append(" ( "); b.append(" ( ");
@ -208,10 +208,11 @@ public class PatientRenderer extends ResourceRenderer {
} else { } else {
x.tx(gender); x.tx(gender);
} }
x.tx(" "); x.tx(", ");
if (dob == null) { if (dob == null) {
x.tx("DoB Unknown"); x.tx("DoB Unknown");
} else { } else {
x.tx("DoB: ");
render(x, dob); render(x, dob);
} }
if (id != null) { if (id != null) {