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 displays for some codes in ConceptMap.relationship when rendering + Add Publication Version to rendering context for future use.

This commit is contained in:
Grahame Grieve 2021-05-14 12:24:57 +10:00
parent 1b1b564682
commit 278916ba97
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RELEASE_NOTES.md
View File

@ -0,0 +1,9 @@
Validator:
* Added parameter -want-invariants-in-messages
* fix issue with dependencies on IGs that have uppercase in package IDs
Other Code Changes
* Fix displays for some codes in ConceptMap.relationship when rendering
* Add Publication Version to rendering context for future use.

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java
View File

@ -327,9 +327,9 @@ public class ConceptMapRenderer extends TerminologyRenderer {
} else if ("equivalent".equals(code)) { } else if ("equivalent".equals(code)) {
return "is equivalent to"; return "is equivalent to";
} else if ("source-is-narrower-than-target".equals(code)) { } else if ("source-is-narrower-than-target".equals(code)) {
return "maps to wider concept"; return "is narrower then";
} else if ("source-is-broader-than-target".equals(code)) { } else if ("source-is-broader-than-target".equals(code)) {
return "maps to narrower target"; return "is broader than";
} else if ("not-related-to".equals(code)) { } else if ("not-related-to".equals(code)) {
return "is not related to"; return "is not related to";
} else { } else {

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

@ -21,8 +21,6 @@ import org.hl7.fhir.utilities.xhtml.XhtmlNode;
public class PatientRenderer extends ResourceRenderer { public class PatientRenderer extends ResourceRenderer {
public PatientRenderer(RenderingContext context) { public PatientRenderer(RenderingContext context) {
super(context); super(context);
} }

10
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java
View File

@ -11,6 +11,8 @@ import org.hl7.fhir.r5.conformance.ProfileUtilities.ProfileKnowledgeProvider;
import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.context.IWorkerContext;
import org.hl7.fhir.r5.model.Base; import org.hl7.fhir.r5.model.Base;
import org.hl7.fhir.r5.model.DomainResource; import org.hl7.fhir.r5.model.DomainResource;
import org.hl7.fhir.r5.model.Enumerations.FHIRVersion;
import org.hl7.fhir.r5.model.FhirPublication;
import org.hl7.fhir.r5.renderers.utils.Resolver.IReferenceResolver; import org.hl7.fhir.r5.renderers.utils.Resolver.IReferenceResolver;
import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceContext; import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceContext;
import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext; import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext;
@ -96,6 +98,7 @@ public class RenderingContext {
private QuestionnaireRendererMode questionnaireMode = QuestionnaireRendererMode.FORM; private QuestionnaireRendererMode questionnaireMode = QuestionnaireRendererMode.FORM;
private boolean addGeneratedNarrativeHeader = true; private boolean addGeneratedNarrativeHeader = true;
private FhirPublication targetVersion;
/** /**
* *
* @param context - access to all related resources that might be needed * @param context - access to all related resources that might be needed
@ -392,7 +395,12 @@ public class RenderingContext {
return this; return this;
} }
public FhirPublication getTargetVersion() {
return targetVersion;
}
public void setTargetVersion(FhirPublication targetVersion) {
this.targetVersion = targetVersion;
}
} }