honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-27 08:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from ahdis/oe_structuremap_np

Browse Source 
StructureMap rendering  has np when RelationShip is not set
This commit is contained in:
Grahame Grieve 2020-06-26 10:24:09 +10:00 committed by GitHub
commit 93f8b1c338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/StructureMapUtilities.java
View File

@ -789,8 +789,7 @@ public class StructureMapUtilities {
if (e.getCode().startsWith("\"")) if (e.getCode().startsWith("\""))
e.setCode(lexer.processConstant(e.getCode())); e.setCode(lexer.processConstant(e.getCode()));
TargetElementComponent tgt = e.addTarget(); TargetElementComponent tgt = e.addTarget();
if (eq != ConceptMapEquivalence.EQUIVALENT) tgt.setEquivalence(eq);
tgt.setEquivalence(eq);
if (tgt.getEquivalence() != ConceptMapEquivalence.UNMATCHED) { if (tgt.getEquivalence() != ConceptMapEquivalence.UNMATCHED) {
lexer.token(":"); lexer.token(":");
tgt.setCode(lexer.take()); tgt.setCode(lexer.take());

3
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java
View File

@ -796,8 +796,7 @@ public class StructureMapUtilities {
if (e.getCode().startsWith("\"")) if (e.getCode().startsWith("\""))
e.setCode(lexer.processConstant(e.getCode())); e.setCode(lexer.processConstant(e.getCode()));
TargetElementComponent tgt = e.addTarget(); TargetElementComponent tgt = e.addTarget();
if (rel != ConceptMapRelationship.EQUIVALENT) tgt.setRelationship(rel);
tgt.setRelationship(rel);
lexer.token(":"); lexer.token(":");
tgt.setCode(lexer.take()); tgt.setCode(lexer.take());
if (tgt.getCode().startsWith("\"")) if (tgt.getCode().startsWith("\""))