diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java index d026fcab5..7e51886a1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DiagnosticReportRenderer.java @@ -125,8 +125,9 @@ public class DiagnosticReportRenderer extends ResourceRenderer { } pw = getProperty(dr, "conclusion"); - if (valued(pw)) + if (valued(pw)) { render(x.para(), pw.value()); + } pw = getProperty(dr, "conclusionCode"); if (!valued(pw)) { diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java index 6fab3a623..75d298867 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java @@ -1080,12 +1080,15 @@ public class NpmPackage { return false; } - public boolean canLazyLoad() { + public boolean canLazyLoad() throws IOException { for (NpmPackageFolder folder : folders.values()) { if (folder.folder == null) { return false; } } + if (!hasFile("other", "spec.internals")) { + return false; + } return true; } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageHacker.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageHacker.java index b9b7bb05c..62ad4dd1c 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageHacker.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageHacker.java @@ -25,7 +25,7 @@ import com.google.gson.JsonObject; public class PackageHacker { public static void main(String[] args) throws FileNotFoundException, IOException { - new PackageHacker().edit("M:\\web\\terminology.hl7.org\\hl7.terminology.r3.tgz"); + new PackageHacker().edit("M:\\web\\hl7.org\\fhir\\us\\davinci-pdex-plan-net\\2020Feb\\package.tgz"); } private void edit(String name) throws FileNotFoundException, IOException { @@ -57,16 +57,17 @@ public class PackageHacker { private void change(JsonObject npm, Map content) throws FileNotFoundException, IOException { // fixVersions(npm); -// npm.remove("name"); -// npm.addProperty("name", "hl7.terminology.r5"); - npm.remove("version"); - npm.addProperty("version", "1.0.0"); +// npm.remove("url"); +// npm.addProperty("url", url); +// npm.remove("version"); +// npm.addProperty("version", "1.0.0"); // npm.remove("canonical"); // npm.addProperty("canonical", "http://hl7.org/fhir/us/davinci-drug-formulary"); //// npm.remove("description"); //// npm.addProperty("description", "Group Wrapper that includes all the R4 packages"); // npm.remove("url"); // npm.addProperty("url", "https://terminology.hl7.org/1.0.0/"); +// npm.remove("dependencies"); // JsonObject dep = new JsonObject(); // npm.add("dependencies", dep); // dep.addProperty("hl7.fhir.r4.core", "4.0.1"); diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index 0b97f42b9..744a00ec7 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -4527,10 +4527,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat msg = ex.getMessage(); } if (!ok) { - if (!Utilities.noString(msg)) + if (!Utilities.noString(msg)) { msg = " (" + msg + ")"; - if (debug) { - System.out.println(" failed! "+msg); } if (inv.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice") && ToolingExtensions.readBooleanExtension(inv, "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice")) {