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 NPE rendering code systems with some kinds of properties

This commit is contained in:
Grahame Grieve 2021-06-15 08:49:08 +10:00
parent 435e0261e0
commit 7d512d6ed0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java
View File

@ -256,7 +256,7 @@ public abstract class TerminologyRenderer extends ResourceRenderer {
if (cs == null) { if (cs == null) {
return null; return null;
} }
ConceptDefinitionComponent cc = CodeSystemUtilities.getCode(cs, code); ConceptDefinitionComponent cc = code == null ? null : CodeSystemUtilities.getCode(cs, code);
return cc == null ? null : cc.getDisplay(); return cc == null ? null : cc.getDisplay();
} }

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java
View File

@ -430,6 +430,9 @@ public class CodeSystemUtilities {
} }
public static ConceptDefinitionComponent getCode(CodeSystem cs, String code) { public static ConceptDefinitionComponent getCode(CodeSystem cs, String code) {
if (code == null) {
return null;
}
for (ConceptDefinitionComponent cc : cs.getConcept()) { for (ConceptDefinitionComponent cc : cs.getConcept()) {
ConceptDefinitionComponent cd = getCode(cc, code); ConceptDefinitionComponent cd = getCode(cc, code);
if (cd != null) { if (cd != null) {