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

fix DiagnosticReport rendering (NPEs)

This commit is contained in:
Grahame Grieve 2021-08-24 06:56:51 +10:00
parent aa5ab74003
commit 9e7e6698bd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java
View File

@ -189,9 +189,9 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
ObservationNode obs = new ObservationNode(); ObservationNode obs = new ObservationNode();
obs.ref = b.get("reference").primitiveValue(); obs.ref = b.get("reference").primitiveValue();
obs.obs = resolveReference(rw, obs.ref); obs.obs = resolveReference(rw, obs.ref);
if (obs.obs.getResource() != null) { if (obs.obs != null && obs.obs.getResource() != null) {
PropertyWrapper t = getProperty(obs.obs.getResource(), "contained"); PropertyWrapper t = getProperty(obs.obs.getResource(), "contained");
if (t.hasValues()) { if (t != null && t.hasValues()) {
obs.contained = fetchObservations(t.getValues(), rw); obs.contained = fetchObservations(t.getValues(), rw);
} }
} }
@ -239,7 +239,7 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private boolean scanObsForRefRange(List<ObservationNode> observations) { private boolean scanObsForRefRange(List<ObservationNode> observations) {
for (ObservationNode o : observations) { for (ObservationNode o : observations) {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
PropertyWrapper pw = getProperty(o.obs.getResource(), "referenceRange"); PropertyWrapper pw = getProperty(o.obs.getResource(), "referenceRange");
if (valued(pw)) { if (valued(pw)) {
return true; return true;
@ -256,7 +256,7 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private boolean scanObsForNote(List<ObservationNode> observations) { private boolean scanObsForNote(List<ObservationNode> observations) {
for (ObservationNode o : observations) { for (ObservationNode o : observations) {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
PropertyWrapper pw = getProperty(o.obs.getResource(), "note"); PropertyWrapper pw = getProperty(o.obs.getResource(), "note");
if (valued(pw)) { if (valued(pw)) {
return true; return true;
@ -273,7 +273,7 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private boolean scanObsForIssued(List<ObservationNode> observations, DataType iss) throws UnsupportedEncodingException, FHIRException, IOException { private boolean scanObsForIssued(List<ObservationNode> observations, DataType iss) throws UnsupportedEncodingException, FHIRException, IOException {
for (ObservationNode o : observations) { for (ObservationNode o : observations) {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
PropertyWrapper pw = getProperty(o.obs.getResource(), "issued"); PropertyWrapper pw = getProperty(o.obs.getResource(), "issued");
if (valued(pw)) { if (valued(pw)) {
if (!Base.compareDeep(pw.value().getBase(), iss, true)) { if (!Base.compareDeep(pw.value().getBase(), iss, true)) {
@ -292,7 +292,7 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private boolean scanObsForEffective(List<ObservationNode> observations, DataType eff) throws UnsupportedEncodingException, FHIRException, IOException { private boolean scanObsForEffective(List<ObservationNode> observations, DataType eff) throws UnsupportedEncodingException, FHIRException, IOException {
for (ObservationNode o : observations) { for (ObservationNode o : observations) {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
PropertyWrapper pw = getProperty(o.obs.getResource(), "effective[x]"); PropertyWrapper pw = getProperty(o.obs.getResource(), "effective[x]");
if (valued(pw)) { if (valued(pw)) {
if (!Base.compareDeep(pw.value().getBase(), eff, true)) { if (!Base.compareDeep(pw.value().getBase(), eff, true)) {
@ -311,7 +311,7 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private boolean scanObsForFlags(List<ObservationNode> observations) throws UnsupportedEncodingException, FHIRException, IOException { private boolean scanObsForFlags(List<ObservationNode> observations) throws UnsupportedEncodingException, FHIRException, IOException {
for (ObservationNode o : observations) { for (ObservationNode o : observations) {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
PropertyWrapper pw = getProperty(o.obs.getResource(), "interpretation"); PropertyWrapper pw = getProperty(o.obs.getResource(), "interpretation");
if (valued(pw)) { if (valued(pw)) {
return true; return true;
@ -335,15 +335,15 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
private void addObservationToTable(XhtmlNode tbl, ObservationNode o, int i, String cs, boolean refRange, boolean flags, boolean note, boolean effectiveTime, boolean issued, DataType eff, DataType iss) throws UnsupportedEncodingException, FHIRException, IOException { private void addObservationToTable(XhtmlNode tbl, ObservationNode o, int i, String cs, boolean refRange, boolean flags, boolean note, boolean effectiveTime, boolean issued, DataType eff, DataType iss) throws UnsupportedEncodingException, FHIRException, IOException {
XhtmlNode tr = tbl.tr(); XhtmlNode tr = tbl.tr();
if (o.obs.getReference() == null) { if (o.obs != null && o.obs.getReference() == null) {
XhtmlNode td = tr.td().colspan(cs); XhtmlNode td = tr.td().colspan(cs);
td.i().tx("This Observation could not be resolved"); td.i().tx("This Observation could not be resolved");
} else { } else {
if (o.obs.getResource() != null) { if (o.obs != null && o.obs.getResource() != null) {
addObservationToTable(tr, o.obs.getResource(), i, o.obs.getReference(), refRange, flags, note, effectiveTime, issued, eff, iss); addObservationToTable(tr, o.obs.getResource(), i, o.obs.getReference(), refRange, flags, note, effectiveTime, issued, eff, iss);
} else { } else {
XhtmlNode td = tr.td().colspan(cs); XhtmlNode td = tr.td().colspan(cs);
td.i().ah(o.obs.getReference()).tx("Observation"); td.i().tx("Observation");
} }
if (o.contained != null) { if (o.contained != null) {
for (ObservationNode c : o.contained) { for (ObservationNode c : o.contained) {