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

rendering fixes for R6 build

This commit is contained in:
Grahame Grieve 2024-08-03 19:32:46 +08:00
parent b248eb7d67
commit 2f1f59d5f9
5 changed files with 62 additions and 5 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/DataRenderer.java
View File

@ -1841,7 +1841,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
else
x.tx("?");
if (q.has("low") && q.child("low").has("unit"))
x.tx(" "+q.child("low").child("unit"));
x.tx(" "+q.child("low").primitiveValue("unit"));
}
public String displayPeriod(ResourceWrapper p) {

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

@ -149,13 +149,13 @@ public class DiagnosticReportRenderer extends ResourceRenderer {
if (r == null)
container.tx(context.formatPhrase(RenderingContext.DIAG_REP_REND_UNABLE));
else if (r.getResource().fhirType().equals("Patient"))
generatePatientSummary(container, r.getResource());
generatePatientSummary(status, container, r.getResource());
else
container.tx(context.formatPhrase(RenderingContext.GENERAL_TODO));
}
private void generatePatientSummary(XhtmlNode c, ResourceWrapper r) throws FHIRFormatError, DefinitionException, FHIRException, IOException, EOperationOutcome {
new PatientRenderer(context).describe(c, r);
private void generatePatientSummary(RenderingStatus status, XhtmlNode c, ResourceWrapper r) throws FHIRFormatError, DefinitionException, FHIRException, IOException, EOperationOutcome {
new PatientRenderer(context).buildSummary(status, c, r);
}
private List<ObservationNode> fetchObservations(List<ResourceWrapper> list) throws UnsupportedEncodingException, FHIRException, IOException {

5
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java
View File

@ -150,6 +150,9 @@ public abstract class ResourceRenderer extends DataRenderer {
public abstract void buildNarrative(RenderingStatus status, XhtmlNode x, ResourceWrapper r) throws FHIRFormatError, DefinitionException, IOException, FHIRException, EOperationOutcome;
public abstract String buildSummary(ResourceWrapper r) throws UnsupportedEncodingException, IOException;
public void buildSummary(RenderingStatus status, XhtmlNode x, ResourceWrapper r) throws UnsupportedEncodingException, IOException {
x.tx(buildSummary(r));
}
public String canonicalTitle(ResourceWrapper r) {
if (r.has("title")) {
@ -870,7 +873,7 @@ public abstract class ResourceRenderer extends DataRenderer {
boolean sfirst = true;
p = plateStyle(div.para());
if (versionId != null) {
p.tx(context.formatPhrase(RenderingContext.RES_REND_VER, versionId));
p.tx(context.formatPhrase(RenderingContext.RES_REND_VER, versionId.primitiveValue()));
sfirst = false;
}
if (lastUpdated != null) {

8
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java
View File

@ -545,6 +545,14 @@ public class XMLUtil {
return res;
}
public static Element addChild(Document doc, Element element, String name, String namespace, int indent) {
Node node = doc.createTextNode("\n"+Utilities.padLeft("", ' ', indent));
Element child = doc.createElementNS(namespace, name);
element.appendChild(child);
element.appendChild(node);
return child;
}
public static Element insertChild(Document doc, Element element, String name, String namespace, int indent) {
Node node = doc.createTextNode("\n"+Utilities.padLeft("", ' ', indent));
Element child = doc.createElementNS(namespace, name);

46
org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache
View File

@ -7545,6 +7545,52 @@ v: {
"system" : "http://loinc.org",
"version" : "2.77",
"server" : "http://tx-dev.fhir.org/r4",
"issues" : {
"resourceType" : "OperationOutcome"
}
}
-------------------------------------------------------------------------------------
{"code" : {
"system" : "http://loinc.org",
"code" : "58410-2",
"display" : "CBC panel - Blood by Automated count"
}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
"resourceType" : "Parameters",
"parameter" : [{
"name" : "profile-url",
"valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
}]
}}####
v: {
"display" : "CBC panel - Blood by Automated count",
"code" : "58410-2",
"system" : "http://loinc.org",
"version" : "2.77",
"server" : "http://tx-dev.fhir.org/r4",
"unknown-systems" : "",
"issues" : {
"resourceType" : "OperationOutcome"
}
}
-------------------------------------------------------------------------------------
{"code" : {
"system" : "http://loinc.org",
"code" : "58410-2"
}, "url": "http://hl7.org/fhir/ValueSet/report-codes--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "activeOnly":"false", "membershipOnly":"false", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
"resourceType" : "Parameters",
"parameter" : [{
"name" : "profile-url",
"valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
}]
}}####
v: {
"display" : "CBC panel - Blood by Automated count",
"code" : "58410-2",
"system" : "http://loinc.org",
"version" : "2.77",
"server" : "http://tx-dev.fhir.org/r4",
"unknown-systems" : "",
"issues" : {
"resourceType" : "OperationOutcome"