From 2b626a9361647d14e2f6dace6031d8af5fbd1ed5 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Wed, 20 Jul 2022 11:25:10 +1000 Subject: [PATCH] Changes to ConceptMap rendering as discussed with Vocab Committee --- .../org/hl7/fhir/r5/renderers/ConceptMapRenderer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java index af30b652c..5f422fdd1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java @@ -159,9 +159,9 @@ public class ConceptMapRenderer extends TerminologyRenderer { else { if (ccm.getRelationshipElement().hasExtension(ToolingExtensions.EXT_OLD_CONCEPTMAP_EQUIVALENCE)) { String code = ToolingExtensions.readStringExtension(ccm.getRelationshipElement(), ToolingExtensions.EXT_OLD_CONCEPTMAP_EQUIVALENCE); - tr.td().ah(eqpath+"#"+code).tx(presentEquivalenceCode(code)); + tr.td().ah(eqpath+"#"+code, code).tx(presentEquivalenceCode(code)); } else { - tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); + tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode(), ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); } } td = tr.td(); @@ -192,7 +192,7 @@ public class ConceptMapRenderer extends TerminologyRenderer { if (hasRelationships) { tr.td().b().tx("Relationship"); } - tr.td().colspan(Integer.toString(1+targets.size())).b().tx("Destination Concept Details"); + tr.td().colspan(Integer.toString(1+targets.size())).b().tx("Target Concept Details"); if (comment) { tr.td().b().tx("Comment"); } @@ -299,9 +299,9 @@ public class ConceptMapRenderer extends TerminologyRenderer { else { if (ccm.getRelationshipElement().hasExtension(ToolingExtensions.EXT_OLD_CONCEPTMAP_EQUIVALENCE)) { String code = ToolingExtensions.readStringExtension(ccm.getRelationshipElement(), ToolingExtensions.EXT_OLD_CONCEPTMAP_EQUIVALENCE); - tr.td().ah(eqpath+"#"+code).tx(presentEquivalenceCode(code)); + tr.td().ah(eqpath+"#"+code, code).tx(presentEquivalenceCode(code)); } else { - tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); + tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode(), ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); } } }