From e854f016fe9d966e102c10329f9f50f99dacb89b Mon Sep 17 00:00:00 2001 From: Oliver Egger Date: Tue, 16 Aug 2022 17:45:04 +0200 Subject: [PATCH 01/49] PatientRenderer #896 --- .../main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java index a89517303..75d30d1ab 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/PatientRenderer.java @@ -101,6 +101,9 @@ public class PatientRenderer extends ResourceRenderer { if (newUse == null) { return true; } + if (oldUse == null) { + return existsInList(newUse, NameUse.OFFICIAL, NameUse.USUAL); + } switch (oldUse) { case ANONYMOUS: return existsInList(newUse, NameUse.OFFICIAL, NameUse.USUAL); case MAIDEN: return existsInList(newUse, NameUse.OFFICIAL, NameUse.USUAL); From dd7b44d3d886bac5a7ed86917e39c4ef2c081b4c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sun, 11 Sep 2022 07:30:41 +1000 Subject: [PATCH 02/49] more type characteristic fixes --- .../instance/type/StructureDefinitionValidator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java index a33279035..7efe2fc26 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java @@ -224,7 +224,6 @@ public class StructureDefinitionValidator extends BaseValidator { } } // if we see fixed[x] or pattern[x] applied to a repeating element, we'll give the user a hint - } } @@ -236,7 +235,7 @@ public class StructureDefinitionValidator extends BaseValidator { case "decimal" :return addCharacteristicsForType(set, "has-range", "is-continuous", "has-length"); case "base64Binary" : return addCharacteristicsForType(set, "has-size"); case "instant" : return addCharacteristicsForType(set, "has-range", "is-continuous", "has-length"); - case "string" : return addCharacteristicsForType(set, "has-length", "do-translations"); + case "string" : return addCharacteristicsForType(set, "has-length", "do-translations", "can-bind"); case "uri" : return addCharacteristicsForType(set, "has-length", "can-bind"); case "date" :return addCharacteristicsForType(set, "has-range", "has-length"); case "dateTime" : return addCharacteristicsForType(set, "has-range", "is-continuous", "has-length"); @@ -244,7 +243,7 @@ public class StructureDefinitionValidator extends BaseValidator { case "canonical" :return addCharacteristicsForType(set, "has-target", "has-length"); case "code" :return addCharacteristicsForType(set, "has-length", "can-bind"); case "id" :return addCharacteristicsForType(set, "has-length"); - case "markdown" :return addCharacteristicsForType(set, "do-translations"); + case "markdown" :return addCharacteristicsForType(set, "do-translations", "has-length"); case "oid" :return addCharacteristicsForType(set, "has-length", "can-bind"); case "positiveInt" :return addCharacteristicsForType(set, "has-range", "has-length"); case "unsignedInt" :return addCharacteristicsForType(set, "has-range", "has-length"); @@ -299,10 +298,10 @@ public class StructureDefinitionValidator extends BaseValidator { case "BackboneElement" :return addCharacteristicsForType(set); default: - if (context.getResourceNames().contains(tc)) - return addCharacteristicsForType(set); - else - throw new Error("Unhandled data type in addCharacterstics: "+tc); + if (!context.getResourceNames().contains(tc)) { + System.out.println("Unhandled data type in addCharacteristics: "+tc); + } + return addCharacteristicsForType(set); } } From a8dbcd4f72d3a348fd9ba1d126e5b670a8bafbdf Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 12 Sep 2022 10:57:35 -0400 Subject: [PATCH 03/49] Update RELEASE_NOTES.md ***NO_CI*** --- RELEASE_NOTES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..9a02f862c 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,4 +4,6 @@ ## Other code changes -* no changes \ No newline at end of file +* Fix NPE ValueSetRenderer +* More fixes in StructureDefinition validation type characteristic +* Fix typo in ImplementationGuideDefinitionParameterComponent `Value` From 2cef00dfb1256b5f67c0a69b27af736f42e6586c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Mon, 12 Sep 2022 23:16:06 +0800 Subject: [PATCH 04/49] fix NPE (#923) Co-authored-by: Grahame Grieve --- .../main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java index 5cd90ccdc..01a6a812e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java @@ -666,6 +666,9 @@ public class ValueSetRenderer extends TerminologyRenderer { } private String getCsRef(T cs) { + if (cs == null) { + return "?cs-n?"; + } String ref = (String) cs.getUserData("filename"); if (ref == null) ref = (String) cs.getUserData("path"); From 0e2ad40b05d21a7bfc3b781fb9eb645f75e8b88d Mon Sep 17 00:00:00 2001 From: markiantorno Date: Mon, 12 Sep 2022 16:09:27 +0000 Subject: [PATCH 05/49] Release: v5.6.63 ## Validator Changes * no changes ## Other code changes * Fix NPE ValueSetRenderer * More fixes in StructureDefinition validation type characteristic * Fix typo in ImplementationGuideDefinitionParameterComponent `Value` ***NO_CI*** --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 00e52923c..69f531f06 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 222c64b9e..1d7b5cb2b 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 83f348b2f..acf83a317 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 14c8f1640..95fda202a 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index cf592d7e5..c7142afb9 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 881600e62..c142e94ab 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index bd16b450a..6ea11fb54 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 70ae92996..0c51f5c1f 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 6faa45280..1f06d815b 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 5cf9b9a10..d9623a338 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index d6ee82315..0ab449614 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 ../pom.xml diff --git a/pom.xml b/pom.xml index d69242031..b2c3de76b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.63-SNAPSHOT + 5.6.63 pom From 09125cbaa4c00905306123afee188d94a15fe1da Mon Sep 17 00:00:00 2001 From: markiantorno Date: Mon, 12 Sep 2022 16:58:38 +0000 Subject: [PATCH 06/49] Updating version to: 5.6.64-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 4 +--- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 15 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 9a02f862c..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -4,6 +4,4 @@ ## Other code changes -* Fix NPE ValueSetRenderer -* More fixes in StructureDefinition validation type characteristic -* Fix typo in ImplementationGuideDefinitionParameterComponent `Value` +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 69f531f06..cd8c7c6a7 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 1d7b5cb2b..b56df7e64 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index acf83a317..9d57a4016 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 95fda202a..4b6ffd1e9 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index c7142afb9..6e2a8b0c7 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index c142e94ab..f9cfe03c0 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 6ea11fb54..fcd570858 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 0c51f5c1f..5a3c0c14d 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 1f06d815b..3d18af6a1 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index d9623a338..bb3347461 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 0ab449614..29f8518ba 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index b2c3de76b..77854586d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.63 + 5.6.64-SNAPSHOT pom From 35233ee1e5ca404284189050d6b4b72dfaa6a324 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 15 Sep 2022 08:41:37 +0200 Subject: [PATCH 07/49] R5 updates for IG publisher --- .../ExtensionDefinitionGenerator.java | 18 +- .../resources40_50/Enumerations40_50.java | 37 + .../ImplementationGuide40_50.java | 42 +- .../fhir/r4/conformance/ProfileUtilities.java | 3 +- .../org/hl7/fhir/r4/model/Enumerations.java | 590 +++++++++++++++- .../org/hl7/fhir/r4b/model/Enumerations.java | 650 ++++++++++++++++-- .../org/hl7/fhir/r5/model/Enumerations.java | 43 +- 7 files changed, 1262 insertions(+), 121 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java index 0e79da9bf..175b5d3fe 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java @@ -183,12 +183,12 @@ public class ExtensionDefinitionGenerator { private StructureDefinition generateExtension(StructureDefinition type, ElementDefinition ed) throws FHIRException { StructureDefinition ext = new StructureDefinition(); ext.setId("extension-" + ed.getPath().replace("[x]", "")); - ext.setUrl("http://hl7.org/fhir/" + sourceVersion.toCode(3) + "/StructureDefinition/" + ext.getId()); + ext.setUrl("http://hl7.org/fhir/" + sourceVersion.toCode().substring(0, 3) + "/StructureDefinition/" + ext.getId()); if (ext.getId().length() > 64) ext.setId(contract(ext.getId())); ext.setVersion(sourceVersion.toCode()); - ext.setName("ExtensionR" + sourceVersion.toCode(1) + ed.getPath().replace(".", "")); - ext.setTitle("Extension definition for R" + sourceVersion.toCode(1) + " element " + ed.getPath()); + ext.setName("ExtensionR" + sourceVersion.toCode().substring(0, 1) + ed.getPath().replace(".", "")); + ext.setTitle("Extension definition for R" + sourceVersion.toCode().substring(0, 1) + " element " + ed.getPath()); ext.setStatus(PublicationStatus.ACTIVE); ext.setDate(type.getDate()); ext.setFhirVersion(type.getFhirVersion()); @@ -212,7 +212,7 @@ public class ExtensionDefinitionGenerator { v.setSliceName(n); v.getType().clear(); v.setIsSummaryElement(null); - v.addType().setCode("Extension").addProfile("http://hl7.org/fhir/" + sourceVersion.toCode(3) + "/StructureDefinition/extension-" + child.getPath().replace("[x]", "")); + v.addType().setCode("Extension").addProfile("http://hl7.org/fhir/" + sourceVersion.toCode().substring(0, 3) + "/StructureDefinition/extension-" + child.getPath().replace("[x]", "")); ext.getDifferential().addElement(v); } } @@ -237,7 +237,7 @@ public class ExtensionDefinitionGenerator { v.setSliceName(n); v.getType().clear(); v.setIsSummaryElement(null); - v.addType().setCode("Extension").addProfile("http://hl7.org/fhir/" + sourceVersion.toCode(3) + "/StructureDefinition/extension-" + child.getPath().replace("[x]", "")); + v.addType().setCode("Extension").addProfile("http://hl7.org/fhir/" + sourceVersion.toCode().substring(0, 3) + "/StructureDefinition/extension-" + child.getPath().replace("[x]", "")); ext.getDifferential().addElement(v); } } @@ -357,13 +357,13 @@ public class ExtensionDefinitionGenerator { private void savePackage(List extensions) throws FHIRException, IOException { JsonObject npm = new JsonObject(); - npm.addProperty("name", "hl7.fhir.extensions.r" + sourceVersion.toCode(1)); - npm.addProperty("version", targetVersion.toCode(3)); + npm.addProperty("name", "hl7.fhir.extensions.r" + sourceVersion.toCode().substring(0, 1)); + npm.addProperty("version", targetVersion.toCode().substring(0, 3)); npm.addProperty("tools-version", ToolsVersion.TOOLS_VERSION); npm.addProperty("type", PackageType.IG.getCode()); npm.addProperty("license", SPDXLicense.CC01_0.toCode()); - npm.addProperty("canonical", "http://hl7.org/fhir/" + sourceVersion.toCode(3) + "/extensions/" + targetVersion.toCode(3)); - npm.addProperty("url", "http://hl7.org/fhir/" + sourceVersion.toCode(3) + "/extensions/" + targetVersion.toCode(3)); + npm.addProperty("canonical", "http://hl7.org/fhir/" + sourceVersion.toCode().substring(0, 3) + "/extensions/" + targetVersion.toCode().substring(0, 3)); + npm.addProperty("url", "http://hl7.org/fhir/" + sourceVersion.toCode().substring(0, 3) + "/extensions/" + targetVersion.toCode().substring(0, 3)); npm.addProperty("title", "Extension Definitions for representing elements from " + sourceVersion.toCode() + " in " + targetVersion.toCode()); npm.addProperty("description", "Extension Definitions for representing elements from " + sourceVersion.toCode() + " in " + targetVersion.toCode() + " built " + new SimpleDateFormat("EEE, MMM d, yyyy HH:mmZ", new Locale("en", "US")).format(Calendar.getInstance().getTime()) + timezone() + ")"); JsonObject dep = new JsonObject(); diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java index 8bf970061..cf4d8b5a8 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java @@ -230,6 +230,24 @@ public class Enumerations40_50 { case _4_3_0: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0); break; + case _4_3_0_CIBUILD: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0_CIBUILD); + break; + case _4_3_0_SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0_SNAPSHOT1); + break; + case _5_0_0: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0); + break; + case _5_0_0SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT1); + break; + case _5_0_0SNAPSHOT2: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT2); + break; + case _5_0_0BALLOT: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0BALLOT); + break; default: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL); break; @@ -318,6 +336,25 @@ public class Enumerations40_50 { case _4_3_0: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0); break; + case _4_3_0_CIBUILD: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_CIBUILD); + break; + case _4_3_0_SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_SNAPSHOT1); + break; + case _5_0_0: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0); + break; + case _5_0_0SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT1); + break; + case _5_0_0SNAPSHOT2: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0SNAPSHOT2); + break; + case _5_0_0BALLOT: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0BALLOT); + break; + default: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL); break; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ImplementationGuide40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ImplementationGuide40_50.java index d4f4cd33b..133099991 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ImplementationGuide40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ImplementationGuide40_50.java @@ -17,6 +17,7 @@ import org.hl7.fhir.convertors.conv40_50.datatypes40_50.primitive40_50.Uri40_50; import org.hl7.fhir.convertors.conv40_50.datatypes40_50.primitive40_50.Url40_50; import org.hl7.fhir.convertors.conv40_50.datatypes40_50.special40_50.Reference40_50; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r4.model.UrlType; import org.hl7.fhir.r5.model.ImplementationGuide; import org.hl7.fhir.utilities.Utilities; @@ -51,7 +52,10 @@ import org.hl7.fhir.utilities.Utilities; // Generated on Sun, Feb 24, 2019 11:37+1100 for FHIR v4.0.0 public class ImplementationGuide40_50 { + static final String EXT_IG_DEFINITION_PAGE_NAME = "http://hl7.org/fhir/tools/StructureDefinition/ig-page-name"; static final String EXT_IG_DEFINITION_PARAMETER = "http://hl7.org/fhir/tools/StructureDefinition/ig-parameter"; + static final String EXT_IG_DEFINITION_PARAM_URL_EXT = "http://hl7.org/fhir/tools/CodeSystem/ig-parameters"; + static final String EXT_IG_DEFINITION_PARAM_URL_BASE = "http://hl7.org/fhir/guide-parameter-code"; public static org.hl7.fhir.r5.model.ImplementationGuide convertImplementationGuide(org.hl7.fhir.r4.model.ImplementationGuide src) throws FHIRException { if (src == null) @@ -2321,6 +2325,7 @@ public class ImplementationGuide40_50 { for (org.hl7.fhir.r4.model.Extension e : org.hl7.fhir.r4.utils.ToolingExtensions.getExtensions(src, EXT_IG_DEFINITION_PARAMETER)) { org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionParameterComponent p = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionParameterComponent(); p.getCode().setCode(org.hl7.fhir.r4.utils.ToolingExtensions.readStringExtension(e, "code")); + p.getCode().setSystem(EXT_IG_DEFINITION_PARAM_URL_EXT); p.setValue(org.hl7.fhir.r4.utils.ToolingExtensions.readStringExtension(e, "value")); tgt.addParameter(p); } @@ -2428,11 +2433,22 @@ public class ImplementationGuide40_50 { if (src == null) return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionPageComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionPageComponent(); - ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt); - if (src.hasNameReference()) - tgt.setName(src.getNameReference().getReference()); - if (src.hasNameUrlType()) - tgt.setName(src.getNameUrlType().getValue()); + ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt, EXT_IG_DEFINITION_PAGE_NAME); + if (src.hasExtension(EXT_IG_DEFINITION_PAGE_NAME)) { + tgt.setNameElement(Url40_50.convertUrl((UrlType) src.getExtensionByUrl(EXT_IG_DEFINITION_PAGE_NAME).getValue())); + } + if (src.hasNameReference()) { + tgt.setSource(new org.hl7.fhir.r5.model.UrlType(src.getNameReference().getReference())); + if (!tgt.hasName()) { + tgt.setName(tgt.getSourceUrlType().asStringValue()); + } + } + if (src.hasNameUrlType()) { + tgt.setSource(Url40_50.convertUrl(src.getNameUrlType())); + if (!tgt.hasName()) { + tgt.setName(tgt.getSourceUrlType().asStringValue()); + } + } if (src.hasTitle()) tgt.setTitleElement(String40_50.convertString(src.getTitleElement())); if (src.hasGeneration()) @@ -2447,8 +2463,12 @@ public class ImplementationGuide40_50 { return null; org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDefinitionPageComponent tgt = new org.hl7.fhir.r4.model.ImplementationGuide.ImplementationGuideDefinitionPageComponent(); ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt); - if (src.hasName()) - tgt.setName(new org.hl7.fhir.r4.model.UrlType(src.getName())); + if (src.hasName()) { + tgt.addExtension().setUrl(EXT_IG_DEFINITION_PAGE_NAME).setValue(Url40_50.convertUrl(src.getNameElement())); + } + if (src.hasSourceUrlType()) { + tgt.setName(Url40_50.convertUrl(src.getSourceUrlType())); + } if (src.hasTitle()) tgt.setTitleElement(String40_50.convertString(src.getTitleElement())); if (src.hasGeneration()) @@ -2513,8 +2533,14 @@ public class ImplementationGuide40_50 { return null; org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionParameterComponent tgt = new org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionParameterComponent(); ConversionContext40_50.INSTANCE.getVersionConvertor_40_50().copyBackboneElement(src, tgt); - if (src.hasCode()) + if (src.hasCode()) { tgt.getCode().setCode(src.getCode()); + if (Utilities.existsInList(tgt.getCode().getCode(), "apply", "path-resource", "path-pages", "path-tx-cache", "expansion-parameter", "rule-broken-links", "generate-xml", "generate-json", "generate-turtle", "html-template")) { + tgt.getCode().setSystem(EXT_IG_DEFINITION_PARAM_URL_BASE); + } else { + tgt.getCode().setSystem(EXT_IG_DEFINITION_PARAM_URL_EXT); + } + } if (src.hasValue()) tgt.setValueElement(String40_50.convertString(src.getValueElement())); return tgt; diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileUtilities.java index 76412361f..e831a773a 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/conformance/ProfileUtilities.java @@ -103,6 +103,7 @@ import org.hl7.fhir.r4.utils.formats.XLSXWriter; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.TerminologyServiceOptions; import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.utilities.VersionUtilities; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.Source; import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator; @@ -776,7 +777,7 @@ public class ProfileUtilities extends TranslatingUtilities { if (typeList.get(0).type != null) { // this is the short cut method, we've just dived in and specified a type slice. // in R3 (and unpatched R4, as a workaround right now... - if (!FHIRVersion.isR4Plus(context.getVersion()) || !newSlicingProcessing) { // newSlicingProcessing is a work around for editorial loop dependency + if (!VersionUtilities.isR4Plus(context.getVersion()) || !newSlicingProcessing) { // newSlicingProcessing is a work around for editorial loop dependency // we insert a cloned element with the right types at the start of the diffMatches ElementDefinition ed = new ElementDefinition(); ed.setPath(determineTypeSlicePath(diffMatches.get(0).getPath(), cpath)); diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java index 5e85cd4bd..830497399 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java @@ -9957,6 +9957,10 @@ The primary difference between a medication statement and a medication administr */ _0_11, /** + * DSTU 1 version. + */ + _0_0, + /** * DSTU 1 Official version. */ _0_0_80, @@ -9969,14 +9973,26 @@ The primary difference between a medication statement and a medication administr */ _0_0_82, /** + * January 2015 Ballot. + */ + _0_4, + /** * Draft For Comment (January 2015 Ballot). */ _0_4_0, /** + * May 2015 Ballot. + */ + _0_5, + /** * DSTU 2 Ballot version (May 2015 Ballot). */ _0_5_0, /** + * DSTU 2 version. + */ + _1_0, + /** * DSTU 2 QA Preview + CQIF Ballot (Sep 2015). */ _1_0_0, @@ -9989,22 +10005,42 @@ The primary difference between a medication statement and a medication administr */ _1_0_2, /** + * GAO Ballot version. + */ + _1_1, + /** * GAO Ballot + draft changes to main FHIR standard. */ _1_1_0, /** + * Connectathon 12 (Montreal) version. + */ + _1_4, + /** * CQF on FHIR Ballot + Connectathon 12 (Montreal). */ _1_4_0, /** + * Connectathon 13 (Baltimore) version. + */ + _1_6, + /** * FHIR STU3 Ballot + Connectathon 13 (Baltimore). */ _1_6_0, /** + * Connectathon 14 (San Antonio) version. + */ + _1_8, + /** * FHIR STU3 Candidate + Connectathon 14 (San Antonio). */ _1_8_0, /** + * STU3 version. + */ + _3_0, + /** * FHIR Release 3 (STU). */ _3_0_0, @@ -10017,28 +10053,110 @@ The primary difference between a medication statement and a medication administr */ _3_0_2, /** - * R4 Ballot #1. + * R4 Ballot #1 version. + */ + _3_3, + /** + * R4 Ballot #1 + Connectaton 18 (Cologne). */ _3_3_0, /** - * R4 Ballot #2. + * R4 Ballot #2 version. + */ + _3_5, + /** + * R4 Ballot #2 + Connectathon 19 (Baltimore). */ _3_5_0, /** + * R4 version. + */ + _4_0, + /** * FHIR Release 4 (Normative + STU). */ _4_0_0, /** - * added to help the parsers + * FHIR Release 4 (Normative + STU) with 1 technical errata. */ _4_0_1, /** - * R4B - manually added + * R4B Ballot #1 version. + */ + _4_1, + /** + * R4B Ballot #1 + Connectathon 27 (Virtual). */ _4_1_0, _4_3_0_SNAPSHOT1, _4_3_0_CIBUILD, + /** + * R5 Preview #1 version. + */ + _4_2, + /** + * R5 Preview #1 + Connectathon 23 (Sydney). + */ + _4_2_0, + /** + * R4B version. + */ + _4_3, + /** + * FHIR Release 4B (Normative + STU). + */ _4_3_0, + /** + * R5 Preview #2 version. + */ + _4_4, + /** + * R5 Preview #2 + Connectathon 24 (Virtual). + */ + _4_4_0, + /** + * R5 Preview #3 version. + */ + _4_5, + /** + * R5 Preview #3 + Connectathon 25 (Virtual). + */ + _4_5_0, + /** + * R5 Draft Ballot version. + */ + _4_6, + /** + * R5 Draft Ballot + Connectathon 27 (Virtual). + */ + _4_6_0, + /** + * R5 Versions. + */ + _5_0, + /** + * R5 Final Version. + */ + _5_0_0, + /** + * R5 Rolling ci-build. + */ + _5_0_0CIBUILD, + /** + * R5 Preview #2. + */ + _5_0_0SNAPSHOT1, + /** + * R5 Interim tooling stage. + */ + _5_0_0SNAPSHOT2, + /** + * R5 Ballot. + */ + _5_0_0BALLOT, + /** + * added to help the parsers + */ NULL; public static FHIRVersion fromCode(String codeString) throws FHIRException { if (codeString == null || "".equals(codeString)) @@ -10051,57 +10169,220 @@ The primary difference between a medication statement and a medication administr return _0_06; if ("0.11".equals(codeString)) return _0_11; + if ("0.0".equals(codeString)) + return _0_0; if ("0.0.80".equals(codeString)) return _0_0_80; if ("0.0.81".equals(codeString)) return _0_0_81; if ("0.0.82".equals(codeString)) return _0_0_82; + if ("0.4".equals(codeString)) + return _0_4; if ("0.4.0".equals(codeString)) return _0_4_0; + if ("0.5".equals(codeString)) + return _0_5; if ("0.5.0".equals(codeString)) return _0_5_0; + if ("1.0".equals(codeString)) + return _1_0; if ("1.0.0".equals(codeString)) return _1_0_0; if ("1.0.1".equals(codeString)) return _1_0_1; if ("1.0.2".equals(codeString)) return _1_0_2; + if ("1.1".equals(codeString)) + return _1_1; if ("1.1.0".equals(codeString)) return _1_1_0; + if ("1.4".equals(codeString)) + return _1_4; if ("1.4.0".equals(codeString)) return _1_4_0; + if ("1.6".equals(codeString)) + return _1_6; if ("1.6.0".equals(codeString)) return _1_6_0; + if ("1.8".equals(codeString)) + return _1_8; if ("1.8.0".equals(codeString)) return _1_8_0; + if ("3.0".equals(codeString)) + return _3_0; if ("3.0.0".equals(codeString)) return _3_0_0; if ("3.0.1".equals(codeString)) return _3_0_1; if ("3.0.2".equals(codeString)) return _3_0_2; + if ("3.3".equals(codeString)) + return _3_3; if ("3.3.0".equals(codeString)) return _3_3_0; + if ("3.5".equals(codeString)) + return _3_5; if ("3.5.0".equals(codeString)) return _3_5_0; + if ("4.0".equals(codeString)) + return _4_0; if ("4.0.0".equals(codeString)) return _4_0_0; if ("4.0.1".equals(codeString)) return _4_0_1; + if ("4.1".equals(codeString)) + return _4_1; if ("4.1.0".equals(codeString)) return _4_1_0; if ("4.3.0-snapshot1".equals(codeString)) return _4_3_0_SNAPSHOT1; if ("4.3.0-cibuild".equals(codeString)) return _4_3_0_CIBUILD; + if ("4.2".equals(codeString)) + return _4_2; + if ("4.2.0".equals(codeString)) + return _4_2_0; + if ("4.3".equals(codeString)) + return _4_3; if ("4.3.0".equals(codeString)) return _4_3_0; + if ("4.4".equals(codeString)) + return _4_4; + if ("4.4.0".equals(codeString)) + return _4_4_0; + if ("4.5".equals(codeString)) + return _4_5; + if ("4.5.0".equals(codeString)) + return _4_5_0; + if ("4.6".equals(codeString)) + return _4_6; + if ("4.6.0".equals(codeString)) + return _4_6_0; + if ("5.0".equals(codeString)) + return _5_0; + if ("5.0.0".equals(codeString)) + return _5_0_0; + if ("5.0.0-cibuild".equals(codeString)) + return _5_0_0CIBUILD; + if ("5.0.0-snapshot1".equals(codeString)) + return _5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return _5_0_0SNAPSHOT2; + if ("5.0.0-ballot".equals(codeString)) + return _5_0_0BALLOT; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } - @Override - public String toString() { - return toCode(); + public static boolean isValidCode(String codeString) { + if (codeString == null || "".equals(codeString)) + return false; + if ("0.01".equals(codeString)) + return true; + if ("0.05".equals(codeString)) + return true; + if ("0.06".equals(codeString)) + return true; + if ("0.11".equals(codeString)) + return true; + if ("0.0".equals(codeString)) + return true; + if ("0.0.80".equals(codeString)) + return true; + if ("0.0.81".equals(codeString)) + return true; + if ("0.0.82".equals(codeString)) + return true; + if ("0.4".equals(codeString)) + return true; + if ("0.4.0".equals(codeString)) + return true; + if ("0.5".equals(codeString)) + return true; + if ("0.5.0".equals(codeString)) + return true; + if ("1.0".equals(codeString)) + return true; + if ("1.0.0".equals(codeString)) + return true; + if ("1.0.1".equals(codeString)) + return true; + if ("1.0.2".equals(codeString)) + return true; + if ("1.1".equals(codeString)) + return true; + if ("1.1.0".equals(codeString)) + return true; + if ("1.4".equals(codeString)) + return true; + if ("1.4.0".equals(codeString)) + return true; + if ("1.6".equals(codeString)) + return true; + if ("1.6.0".equals(codeString)) + return true; + if ("1.8".equals(codeString)) + return true; + if ("1.8.0".equals(codeString)) + return true; + if ("3.0".equals(codeString)) + return true; + if ("3.0.0".equals(codeString)) + return true; + if ("3.0.1".equals(codeString)) + return true; + if ("3.0.2".equals(codeString)) + return true; + if ("3.3".equals(codeString)) + return true; + if ("3.3.0".equals(codeString)) + return true; + if ("3.5".equals(codeString)) + return true; + if ("3.5.0".equals(codeString)) + return true; + if ("4.0".equals(codeString)) + return true; + if ("4.0.0".equals(codeString)) + return true; + if ("4.0.1".equals(codeString)) + return true; + if ("4.1".equals(codeString)) + return true; + if ("4.1.0".equals(codeString)) + return true; + if ("4.2".equals(codeString)) + return true; + if ("4.2.0".equals(codeString)) + return true; + if ("4.3".equals(codeString)) + return true; + if ("4.3.0".equals(codeString)) + return true; + if ("4.4".equals(codeString)) + return true; + if ("4.4.0".equals(codeString)) + return true; + if ("4.5".equals(codeString)) + return true; + if ("4.5.0".equals(codeString)) + return true; + if ("4.6".equals(codeString)) + return true; + if ("4.6.0".equals(codeString)) + return true; + if ("5.0".equals(codeString)) + return true; + if ("5.0.0".equals(codeString)) + return true; + if ("5.0.0-cibuild".equals(codeString)) + return true; + if ("5.0.0-snapshot1".equals(codeString)) + return true; + if ("5.0.0-snapshot2".equals(codeString)) + return true; + if ("5.0.0-ballot".equals(codeString)) + return true; + return false; } public String toCode() { switch (this) { @@ -10109,30 +10390,57 @@ The primary difference between a medication statement and a medication administr case _0_05: return "0.05"; case _0_06: return "0.06"; case _0_11: return "0.11"; + case _0_0: return "0.0"; case _0_0_80: return "0.0.80"; case _0_0_81: return "0.0.81"; case _0_0_82: return "0.0.82"; + case _0_4: return "0.4"; case _0_4_0: return "0.4.0"; + case _0_5: return "0.5"; case _0_5_0: return "0.5.0"; + case _1_0: return "1.0"; case _1_0_0: return "1.0.0"; case _1_0_1: return "1.0.1"; case _1_0_2: return "1.0.2"; + case _1_1: return "1.1"; case _1_1_0: return "1.1.0"; + case _1_4: return "1.4"; case _1_4_0: return "1.4.0"; + case _1_6: return "1.6"; case _1_6_0: return "1.6.0"; + case _1_8: return "1.8"; case _1_8_0: return "1.8.0"; + case _3_0: return "3.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; case _3_0_2: return "3.0.2"; + case _3_3: return "3.3"; case _3_3_0: return "3.3.0"; + case _3_5: return "3.5"; case _3_5_0: return "3.5.0"; + case _4_0: return "4.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; + case _4_1: return "4.1"; case _4_1_0: return "4.1.0"; case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot1"; case _4_3_0_CIBUILD: return "4.3.0-cibuild"; + case _4_2: return "4.2"; + case _4_2_0: return "4.2.0"; + case _4_3: return "4.3"; case _4_3_0: return "4.3.0"; - + case _4_4: return "4.4"; + case _4_4_0: return "4.4.0"; + case _4_5: return "4.5"; + case _4_5_0: return "4.5.0"; + case _4_6: return "4.6"; + case _4_6_0: return "4.6.0"; + case _5_0: return "5.0"; + case _5_0_0: return "5.0.0"; + case _5_0_0CIBUILD: return "5.0.0-cibuild"; + case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; + case _5_0_0BALLOT: return "5.0.0-ballot"; case NULL: return null; default: return "?"; } @@ -10143,29 +10451,57 @@ The primary difference between a medication statement and a medication administr case _0_05: return "http://hl7.org/fhir/FHIR-version"; case _0_06: return "http://hl7.org/fhir/FHIR-version"; case _0_11: return "http://hl7.org/fhir/FHIR-version"; + case _0_0: return "http://hl7.org/fhir/FHIR-version"; case _0_0_80: return "http://hl7.org/fhir/FHIR-version"; case _0_0_81: return "http://hl7.org/fhir/FHIR-version"; case _0_0_82: return "http://hl7.org/fhir/FHIR-version"; + case _0_4: return "http://hl7.org/fhir/FHIR-version"; case _0_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _0_5: return "http://hl7.org/fhir/FHIR-version"; case _0_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_0: return "http://hl7.org/fhir/FHIR-version"; case _1_0_0: return "http://hl7.org/fhir/FHIR-version"; case _1_0_1: return "http://hl7.org/fhir/FHIR-version"; case _1_0_2: return "http://hl7.org/fhir/FHIR-version"; + case _1_1: return "http://hl7.org/fhir/FHIR-version"; case _1_1_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_4: return "http://hl7.org/fhir/FHIR-version"; case _1_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_6: return "http://hl7.org/fhir/FHIR-version"; case _1_6_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_8: return "http://hl7.org/fhir/FHIR-version"; case _1_8_0: return "http://hl7.org/fhir/FHIR-version"; + case _3_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_1: return "http://hl7.org/fhir/FHIR-version"; case _3_0_2: return "http://hl7.org/fhir/FHIR-version"; + case _3_3: return "http://hl7.org/fhir/FHIR-version"; case _3_3_0: return "http://hl7.org/fhir/FHIR-version"; + case _3_5: return "http://hl7.org/fhir/FHIR-version"; case _3_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_1: return "http://hl7.org/fhir/FHIR-version"; + case _4_1: return "http://hl7.org/fhir/FHIR-version"; case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0_SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0_CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_2: return "http://hl7.org/fhir/FHIR-version"; + case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_3: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_4: return "http://hl7.org/fhir/FHIR-version"; + case _4_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_5: return "http://hl7.org/fhir/FHIR-version"; + case _4_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_6: return "http://hl7.org/fhir/FHIR-version"; + case _4_6_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT2: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0BALLOT: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -10176,29 +10512,57 @@ The primary difference between a medication statement and a medication administr case _0_05: return "1st Draft for Comment (Sept 2012 Ballot)."; case _0_06: return "2nd Draft for Comment (January 2013 Ballot)."; case _0_11: return "DSTU 1 Ballot version."; + case _0_0: return "DSTU 1 version."; case _0_0_80: return "DSTU 1 Official version."; case _0_0_81: return "DSTU 1 Official version Technical Errata #1."; case _0_0_82: return "DSTU 1 Official version Technical Errata #2."; + case _0_4: return "January 2015 Ballot."; case _0_4_0: return "Draft For Comment (January 2015 Ballot)."; + case _0_5: return "May 2015 Ballot."; case _0_5_0: return "DSTU 2 Ballot version (May 2015 Ballot)."; + case _1_0: return "DSTU 2 version."; case _1_0_0: return "DSTU 2 QA Preview + CQIF Ballot (Sep 2015)."; case _1_0_1: return "DSTU 2 (Official version)."; case _1_0_2: return "DSTU 2 (Official version) with 1 technical errata."; + case _1_1: return "GAO Ballot version."; case _1_1_0: return "GAO Ballot + draft changes to main FHIR standard."; + case _1_4: return "Connectathon 12 (Montreal) version."; case _1_4_0: return "CQF on FHIR Ballot + Connectathon 12 (Montreal)."; + case _1_6: return "Connectathon 13 (Baltimore) version."; case _1_6_0: return "FHIR STU3 Ballot + Connectathon 13 (Baltimore)."; + case _1_8: return "Connectathon 14 (San Antonio) version."; case _1_8_0: return "FHIR STU3 Candidate + Connectathon 14 (San Antonio)."; + case _3_0: return "STU3 version."; case _3_0_0: return "FHIR Release 3 (STU)."; case _3_0_1: return "FHIR Release 3 (STU) with 1 technical errata."; case _3_0_2: return "FHIR Release 3 (STU) with 2 technical errata."; - case _3_3_0: return "R4 Ballot #1."; - case _3_5_0: return "R4 Ballot #2."; + case _3_3: return "R4 Ballot #1 version."; + case _3_3_0: return "R4 Ballot #1 + Connectaton 18 (Cologne)."; + case _3_5: return "R4 Ballot #2 version."; + case _3_5_0: return "R4 Ballot #2 + Connectathon 19 (Baltimore)."; + case _4_0: return "R4 version."; case _4_0_0: return "FHIR Release 4 (Normative + STU)."; - case _4_0_1: return "FHIR Release 4 Technical Correction #1."; - case _4_1_0: return "FHIR Release 4B Ballot #1"; + case _4_0_1: return "FHIR Release 4 (Normative + STU) with 1 technical errata."; + case _4_1: return "R4B Ballot #1 version."; + case _4_1_0: return "R4B Ballot #1 + Connectathon 27 (Virtual)."; + case _4_2: return "R5 Preview #1 version."; + case _4_2_0: return "R5 Preview #1 + Connectathon 23 (Sydney)."; case _4_3_0_SNAPSHOT1: return "FHIR Release 4B Snapshot #1"; case _4_3_0_CIBUILD: return "FHIR Release 4B CI-Builld"; - case _4_3_0: return "FHIR Release 4B"; + case _4_3: return "R4B version."; + case _4_3_0: return "FHIR Release 4B (Normative + STU)."; + case _4_4: return "R5 Preview #2 version."; + case _4_4_0: return "R5 Preview #2 + Connectathon 24 (Virtual)."; + case _4_5: return "R5 Preview #3 version."; + case _4_5_0: return "R5 Preview #3 + Connectathon 25 (Virtual)."; + case _4_6: return "R5 Draft Ballot version."; + case _4_6_0: return "R5 Draft Ballot + Connectathon 27 (Virtual)."; + case _5_0: return "R5 Versions."; + case _5_0_0: return "R5 Final Version."; + case _5_0_0CIBUILD: return "R5 Rolling ci-build."; + case _5_0_0SNAPSHOT1: return "R5 Preview #2."; + case _5_0_0SNAPSHOT2: return "R5 Interim tooling stage."; + case _5_0_0BALLOT: return "R5 Ballot."; case NULL: return null; default: return "?"; } @@ -10209,39 +10573,61 @@ The primary difference between a medication statement and a medication administr case _0_05: return "0.05"; case _0_06: return "0.06"; case _0_11: return "0.11"; + case _0_0: return "0.0"; case _0_0_80: return "0.0.80"; case _0_0_81: return "0.0.81"; case _0_0_82: return "0.0.82"; + case _0_4: return "0.4"; case _0_4_0: return "0.4.0"; + case _0_5: return "0.5"; case _0_5_0: return "0.5.0"; + case _1_0: return "1.0"; case _1_0_0: return "1.0.0"; case _1_0_1: return "1.0.1"; case _1_0_2: return "1.0.2"; + case _1_1: return "1.1"; case _1_1_0: return "1.1.0"; + case _1_4: return "1.4"; case _1_4_0: return "1.4.0"; + case _1_6: return "1.6"; case _1_6_0: return "1.6.0"; + case _1_8: return "1.8"; case _1_8_0: return "1.8.0"; + case _3_0: return "3.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; case _3_0_2: return "3.0.2"; + case _3_3: return "3.3"; case _3_3_0: return "3.3.0"; + case _3_5: return "3.5"; case _3_5_0: return "3.5.0"; + case _4_0: return "4.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; + case _4_1: return "4.1"; case _4_1_0: return "4.1.0"; + case _4_2: return "4.2"; + case _4_2_0: return "4.2.0"; + case _4_3: return "4.3"; case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot"; case _4_3_0_CIBUILD: return "4.3.0-cibuild"; case _4_3_0: return "4.3.0"; + case _4_4: return "4.4"; + case _4_4_0: return "4.4.0"; + case _4_5: return "4.5"; + case _4_5_0: return "4.5.0"; + case _4_6: return "4.6"; + case _4_6_0: return "4.6.0"; + case _5_0: return "5.0"; + case _5_0_0: return "5.0.0"; + case _5_0_0CIBUILD: return "5.0.0-cibuild"; + case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; + case _5_0_0BALLOT: return "5.0.0-ballot"; case NULL: return null; default: return "?"; } } - public String toCode(int len) { - return toCode().substring(0, len); - } - public static boolean isR4Plus(String version) { - return false; - } } public static class FHIRVersionEnumFactory implements EnumFactory { @@ -10265,44 +10651,96 @@ The primary difference between a medication statement and a medication administr return FHIRVersion._0_0_82; if ("0.4.0".equals(codeString)) return FHIRVersion._0_4_0; + if ("0.5".equals(codeString)) + return FHIRVersion._0_5; if ("0.5.0".equals(codeString)) return FHIRVersion._0_5_0; + if ("1.0".equals(codeString)) + return FHIRVersion._1_0; if ("1.0.0".equals(codeString)) return FHIRVersion._1_0_0; if ("1.0.1".equals(codeString)) return FHIRVersion._1_0_1; if ("1.0.2".equals(codeString)) return FHIRVersion._1_0_2; + if ("1.1".equals(codeString)) + return FHIRVersion._1_1; if ("1.1.0".equals(codeString)) return FHIRVersion._1_1_0; + if ("1.4".equals(codeString)) + return FHIRVersion._1_4; if ("1.4.0".equals(codeString)) return FHIRVersion._1_4_0; + if ("1.6".equals(codeString)) + return FHIRVersion._1_6; if ("1.6.0".equals(codeString)) return FHIRVersion._1_6_0; + if ("1.8".equals(codeString)) + return FHIRVersion._1_8; if ("1.8.0".equals(codeString)) return FHIRVersion._1_8_0; + if ("3.0".equals(codeString)) + return FHIRVersion._3_0; if ("3.0.0".equals(codeString)) return FHIRVersion._3_0_0; if ("3.0.1".equals(codeString)) return FHIRVersion._3_0_1; if ("3.0.2".equals(codeString)) return FHIRVersion._3_0_2; + if ("3.3".equals(codeString)) + return FHIRVersion._3_3; if ("3.3.0".equals(codeString)) return FHIRVersion._3_3_0; + if ("3.5".equals(codeString)) + return FHIRVersion._3_5; if ("3.5.0".equals(codeString)) return FHIRVersion._3_5_0; + if ("4.0".equals(codeString)) + return FHIRVersion._4_0; if ("4.0.0".equals(codeString)) return FHIRVersion._4_0_0; if ("4.0.1".equals(codeString)) return FHIRVersion._4_0_1; + if ("4.1".equals(codeString)) + return FHIRVersion._4_1; if ("4.1.0".equals(codeString)) return FHIRVersion._4_1_0; + if ("4.2".equals(codeString)) + return FHIRVersion._4_2; + if ("4.2.0".equals(codeString)) + return FHIRVersion._4_2_0; if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0_SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0_CIBUILD; - if ("4.3.0".equalsIgnoreCase(codeString)) + if ("4.3".equals(codeString)) + return FHIRVersion._4_3; + if ("4.3.0".equals(codeString)) return FHIRVersion._4_3_0; + if ("4.4".equals(codeString)) + return FHIRVersion._4_4; + if ("4.4.0".equals(codeString)) + return FHIRVersion._4_4_0; + if ("4.5".equals(codeString)) + return FHIRVersion._4_5; + if ("4.5.0".equals(codeString)) + return FHIRVersion._4_5_0; + if ("4.6".equals(codeString)) + return FHIRVersion._4_6; + if ("4.6.0".equals(codeString)) + return FHIRVersion._4_6_0; + if ("5.0".equals(codeString)) + return FHIRVersion._5_0; + if ("5.0.0".equals(codeString)) + return FHIRVersion._5_0_0; + if ("5.0.0-cibuild".equals(codeString)) + return FHIRVersion._5_0_0CIBUILD; + if ("5.0.0-snapshot1".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT2; + if ("5.0.0-ballot".equals(codeString)) + return FHIRVersion._5_0_0BALLOT; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -10321,52 +10759,108 @@ The primary difference between a medication statement and a medication administr return new Enumeration(this, FHIRVersion._0_06); if ("0.11".equals(codeString)) return new Enumeration(this, FHIRVersion._0_11); + if ("0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_0); if ("0.0.80".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_80); if ("0.0.81".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_81); if ("0.0.82".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_82); + if ("0.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_4); if ("0.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._0_4_0); + if ("0.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_5); if ("0.5.0".equals(codeString)) return new Enumeration(this, FHIRVersion._0_5_0); + if ("1.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_0); if ("1.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_0); if ("1.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_1); if ("1.0.2".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_2); + if ("1.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_1); if ("1.1.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_1_0); + if ("1.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_4); if ("1.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_4_0); + if ("1.6".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_6); if ("1.6.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_6_0); + if ("1.8".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_8); if ("1.8.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_8_0); + if ("3.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0); if ("3.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_0); if ("3.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_1); if ("3.0.2".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_2); + if ("3.3".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_3); if ("3.3.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_3_0); + if ("3.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_5); if ("3.5.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_5_0); + if ("4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_0); if ("4.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_0_0); if ("4.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._4_0_1); + if ("4.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_1); if ("4.1.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_1_0); + if ("4.2".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_2); + if ("4.2.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_2_0); if ("4.3.0-snapshot1".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3_0_SNAPSHOT1); if ("4.3.0-cibuild".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3_0_CIBUILD); + if ("4.3".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3); if ("4.3.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3_0); + if ("4.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_4); + if ("4.4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_4_0); + if ("4.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5); + if ("4.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5_0); + if ("4.6".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_6); + if ("4.6.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_6_0); + if ("5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0); + if ("5.0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0); + if ("5.0.0-cibuild".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0CIBUILD); + if ("5.0.0-snapshot1".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT1); + if ("5.0.0-snapshot2".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT2); + if ("5.0.0-ballot".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0BALLOT); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -10378,52 +10872,108 @@ The primary difference between a medication statement and a medication administr return "0.06"; if (code == FHIRVersion._0_11) return "0.11"; + if (code == FHIRVersion._0_0) + return "0.0"; if (code == FHIRVersion._0_0_80) return "0.0.80"; if (code == FHIRVersion._0_0_81) return "0.0.81"; if (code == FHIRVersion._0_0_82) return "0.0.82"; + if (code == FHIRVersion._0_4) + return "0.4"; if (code == FHIRVersion._0_4_0) return "0.4.0"; + if (code == FHIRVersion._0_5) + return "0.5"; if (code == FHIRVersion._0_5_0) return "0.5.0"; + if (code == FHIRVersion._1_0) + return "1.0"; if (code == FHIRVersion._1_0_0) return "1.0.0"; if (code == FHIRVersion._1_0_1) return "1.0.1"; if (code == FHIRVersion._1_0_2) return "1.0.2"; + if (code == FHIRVersion._1_1) + return "1.1"; if (code == FHIRVersion._1_1_0) return "1.1.0"; + if (code == FHIRVersion._1_4) + return "1.4"; if (code == FHIRVersion._1_4_0) return "1.4.0"; + if (code == FHIRVersion._1_6) + return "1.6"; if (code == FHIRVersion._1_6_0) return "1.6.0"; + if (code == FHIRVersion._1_8) + return "1.8"; if (code == FHIRVersion._1_8_0) return "1.8.0"; + if (code == FHIRVersion._3_0) + return "3.0"; if (code == FHIRVersion._3_0_0) return "3.0.0"; if (code == FHIRVersion._3_0_1) return "3.0.1"; if (code == FHIRVersion._3_0_2) return "3.0.2"; + if (code == FHIRVersion._3_3) + return "3.3"; if (code == FHIRVersion._3_3_0) return "3.3.0"; + if (code == FHIRVersion._3_5) + return "3.5"; if (code == FHIRVersion._3_5_0) return "3.5.0"; + if (code == FHIRVersion._4_0) + return "4.0"; if (code == FHIRVersion._4_0_0) return "4.0.0"; if (code == FHIRVersion._4_0_1) return "4.0.1"; + if (code == FHIRVersion._4_1) + return "4.1"; if (code == FHIRVersion._4_1_0) return "4.1.0"; + if (code == FHIRVersion._4_2) + return "4.2"; + if (code == FHIRVersion._4_2_0) + return "4.2.0"; + if (code == FHIRVersion._4_3) + return "4.3"; if (code == FHIRVersion._4_3_0_SNAPSHOT1) return "4.3.0-snapshot1"; if (code == FHIRVersion._4_3_0_CIBUILD) return "4.3.0-cibuild"; if (code == FHIRVersion._4_3_0) return "4.3.0"; + if (code == FHIRVersion._4_4) + return "4.4"; + if (code == FHIRVersion._4_4_0) + return "4.4.0"; + if (code == FHIRVersion._4_5) + return "4.5"; + if (code == FHIRVersion._4_5_0) + return "4.5.0"; + if (code == FHIRVersion._4_6) + return "4.6"; + if (code == FHIRVersion._4_6_0) + return "4.6.0"; + if (code == FHIRVersion._5_0) + return "5.0"; + if (code == FHIRVersion._5_0_0) + return "5.0.0"; + if (code == FHIRVersion._5_0_0CIBUILD) + return "5.0.0-cibuild"; + if (code == FHIRVersion._5_0_0SNAPSHOT1) + return "5.0.0-snapshot1"; + if (code == FHIRVersion._5_0_0SNAPSHOT2) + return "5.0.0-snapshot2"; + if (code == FHIRVersion._5_0_0BALLOT) + return "5.0.0-ballot"; return "?"; } public String toSystem(FHIRVersion code) { diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java index 66c65675c..dbd70ca33 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java @@ -6027,6 +6027,10 @@ The primary difference between a medication statement and a medication administr * DSTU 1 Ballot version. */ _0_11, + /** + * DSTU 1 version. + */ + _0_0, /** * DSTU 1 Official version. */ @@ -6039,14 +6043,26 @@ The primary difference between a medication statement and a medication administr * DSTU 1 Official version Technical Errata #2. */ _0_0_82, + /** + * January 2015 Ballot. + */ + _0_4, /** * Draft For Comment (January 2015 Ballot). */ _0_4_0, + /** + * May 2015 Ballot. + */ + _0_5, /** * DSTU 2 Ballot version (May 2015 Ballot). */ _0_5_0, + /** + * DSTU 2 version. + */ + _1_0, /** * DSTU 2 QA Preview + CQIF Ballot (Sep 2015). */ @@ -6059,22 +6075,42 @@ The primary difference between a medication statement and a medication administr * DSTU 2 (Official version) with 1 technical errata. */ _1_0_2, + /** + * GAO Ballot version. + */ + _1_1, /** * GAO Ballot + draft changes to main FHIR standard. */ _1_1_0, + /** + * Connectathon 12 (Montreal) version. + */ + _1_4, /** * CQF on FHIR Ballot + Connectathon 12 (Montreal). */ _1_4_0, + /** + * Connectathon 13 (Baltimore) version. + */ + _1_6, /** * FHIR STU3 Ballot + Connectathon 13 (Baltimore). */ _1_6_0, + /** + * Connectathon 14 (San Antonio) version. + */ + _1_8, /** * FHIR STU3 Candidate + Connectathon 14 (San Antonio). */ _1_8_0, + /** + * STU3 version. + */ + _3_0, /** * FHIR Release 3 (STU). */ @@ -6083,40 +6119,112 @@ The primary difference between a medication statement and a medication administr * FHIR Release 3 (STU) with 1 technical errata. */ _3_0_1, + /** + * FHIR Release 3 (STU) with 2 technical errata. + */ _3_0_2, /** - * R4 Ballot #1. + * R4 Ballot #1 version. + */ + _3_3, + /** + * R4 Ballot #1 + Connectaton 18 (Cologne). */ _3_3_0, /** - * R4 Ballot #2. + * R4 Ballot #2 version. + */ + _3_5, + /** + * R4 Ballot #2 + Connectathon 19 (Baltimore). */ _3_5_0, + /** + * R4 version. + */ + _4_0, /** * FHIR Release 4 (Normative + STU). */ _4_0_0, /** - * FHIR Release 4 Technical Correction. + * FHIR Release 4 (Normative + STU) with 1 technical errata. */ _4_0_1, /** - * FHIR Release 4B Ballot #1. + * R4B Ballot #1 version. + */ + _4_1, + /** + * R4B Ballot #1 + Connectathon 27 (Virtual). */ _4_1_0, + _4_3_0_SNAPSHOT1, + _4_3_0_CIBUILD, + /** + * R5 Preview #1 version. + */ + _4_2, + /** + * R5 Preview #1 + Connectathon 23 (Sydney). + */ _4_2_0, /** - * FHIR Release 4B Snapshot #1. + * R4B version. */ - _4_3_0SNAPSHOT1, + _4_3, /** - * FHIR Release 4B CI-Build. - */ - _4_3_0CIBUILD, - /** - * FHIR Release 4B + * FHIR Release 4B (Normative + STU). */ _4_3_0, + /** + * R5 Preview #2 version. + */ + _4_4, + /** + * R5 Preview #2 + Connectathon 24 (Virtual). + */ + _4_4_0, + /** + * R5 Preview #3 version. + */ + _4_5, + /** + * R5 Preview #3 + Connectathon 25 (Virtual). + */ + _4_5_0, + /** + * R5 Draft Ballot version. + */ + _4_6, + /** + * R5 Draft Ballot + Connectathon 27 (Virtual). + */ + _4_6_0, + /** + * R5 Versions. + */ + _5_0, + /** + * R5 Final Version. + */ + _5_0_0, + /** + * R5 Rolling ci-build. + */ + _5_0_0CIBUILD, + /** + * R5 Preview #2. + */ + _5_0_0SNAPSHOT1, + /** + * R5 Interim tooling stage. + */ + _5_0_0SNAPSHOT2, + /** + * R5 Ballot. + */ + _5_0_0BALLOT, /** * added to help the parsers */ @@ -6132,86 +6240,279 @@ The primary difference between a medication statement and a medication administr return _0_06; if ("0.11".equals(codeString)) return _0_11; + if ("0.0".equals(codeString)) + return _0_0; if ("0.0.80".equals(codeString)) return _0_0_80; if ("0.0.81".equals(codeString)) return _0_0_81; if ("0.0.82".equals(codeString)) return _0_0_82; + if ("0.4".equals(codeString)) + return _0_4; if ("0.4.0".equals(codeString)) return _0_4_0; + if ("0.5".equals(codeString)) + return _0_5; if ("0.5.0".equals(codeString)) return _0_5_0; + if ("1.0".equals(codeString)) + return _1_0; if ("1.0.0".equals(codeString)) return _1_0_0; if ("1.0.1".equals(codeString)) return _1_0_1; if ("1.0.2".equals(codeString)) return _1_0_2; + if ("1.1".equals(codeString)) + return _1_1; if ("1.1.0".equals(codeString)) return _1_1_0; + if ("1.4".equals(codeString)) + return _1_4; if ("1.4.0".equals(codeString)) return _1_4_0; + if ("1.6".equals(codeString)) + return _1_6; if ("1.6.0".equals(codeString)) return _1_6_0; + if ("1.8".equals(codeString)) + return _1_8; if ("1.8.0".equals(codeString)) return _1_8_0; + if ("3.0".equals(codeString)) + return _3_0; if ("3.0.0".equals(codeString)) return _3_0_0; if ("3.0.1".equals(codeString)) return _3_0_1; if ("3.0.2".equals(codeString)) return _3_0_2; + if ("3.3".equals(codeString)) + return _3_3; if ("3.3.0".equals(codeString)) return _3_3_0; + if ("3.5".equals(codeString)) + return _3_5; if ("3.5.0".equals(codeString)) return _3_5_0; + if ("4.0".equals(codeString)) + return _4_0; if ("4.0.0".equals(codeString)) return _4_0_0; if ("4.0.1".equals(codeString)) return _4_0_1; + if ("4.1".equals(codeString)) + return _4_1; if ("4.1.0".equals(codeString)) return _4_1_0; + if ("4.3.0-snapshot1".equals(codeString)) + return _4_3_0_SNAPSHOT1; + if ("4.3.0-cibuild".equals(codeString)) + return _4_3_0_CIBUILD; + if ("4.2".equals(codeString)) + return _4_2; if ("4.2.0".equals(codeString)) return _4_2_0; - if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) - return _4_3_0SNAPSHOT1; - if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) - return _4_3_0CIBUILD; - if ("4.3.0".equalsIgnoreCase(codeString)) + if ("4.3".equals(codeString)) + return _4_3; + if ("4.3.0".equals(codeString)) return _4_3_0; + if ("4.4".equals(codeString)) + return _4_4; + if ("4.4.0".equals(codeString)) + return _4_4_0; + if ("4.5".equals(codeString)) + return _4_5; + if ("4.5.0".equals(codeString)) + return _4_5_0; + if ("4.6".equals(codeString)) + return _4_6; + if ("4.6.0".equals(codeString)) + return _4_6_0; + if ("5.0".equals(codeString)) + return _5_0; + if ("5.0.0".equals(codeString)) + return _5_0_0; + if ("5.0.0-cibuild".equals(codeString)) + return _5_0_0CIBUILD; + if ("5.0.0-snapshot1".equals(codeString)) + return _5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return _5_0_0SNAPSHOT2; + if ("5.0.0-ballot".equals(codeString)) + return _5_0_0BALLOT; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } + public static boolean isValidCode(String codeString) { + if (codeString == null || "".equals(codeString)) + return false; + if ("0.01".equals(codeString)) + return true; + if ("0.05".equals(codeString)) + return true; + if ("0.06".equals(codeString)) + return true; + if ("0.11".equals(codeString)) + return true; + if ("0.0".equals(codeString)) + return true; + if ("0.0.80".equals(codeString)) + return true; + if ("0.0.81".equals(codeString)) + return true; + if ("0.0.82".equals(codeString)) + return true; + if ("0.4".equals(codeString)) + return true; + if ("0.4.0".equals(codeString)) + return true; + if ("0.5".equals(codeString)) + return true; + if ("0.5.0".equals(codeString)) + return true; + if ("1.0".equals(codeString)) + return true; + if ("1.0.0".equals(codeString)) + return true; + if ("1.0.1".equals(codeString)) + return true; + if ("1.0.2".equals(codeString)) + return true; + if ("1.1".equals(codeString)) + return true; + if ("1.1.0".equals(codeString)) + return true; + if ("1.4".equals(codeString)) + return true; + if ("1.4.0".equals(codeString)) + return true; + if ("1.6".equals(codeString)) + return true; + if ("1.6.0".equals(codeString)) + return true; + if ("1.8".equals(codeString)) + return true; + if ("1.8.0".equals(codeString)) + return true; + if ("3.0".equals(codeString)) + return true; + if ("3.0.0".equals(codeString)) + return true; + if ("3.0.1".equals(codeString)) + return true; + if ("3.0.2".equals(codeString)) + return true; + if ("3.3".equals(codeString)) + return true; + if ("3.3.0".equals(codeString)) + return true; + if ("3.5".equals(codeString)) + return true; + if ("3.5.0".equals(codeString)) + return true; + if ("4.0".equals(codeString)) + return true; + if ("4.0.0".equals(codeString)) + return true; + if ("4.0.1".equals(codeString)) + return true; + if ("4.1".equals(codeString)) + return true; + if ("4.1.0".equals(codeString)) + return true; + if ("4.2".equals(codeString)) + return true; + if ("4.2.0".equals(codeString)) + return true; + if ("4.3".equals(codeString)) + return true; + if ("4.3.0".equals(codeString)) + return true; + if ("4.4".equals(codeString)) + return true; + if ("4.4.0".equals(codeString)) + return true; + if ("4.5".equals(codeString)) + return true; + if ("4.5.0".equals(codeString)) + return true; + if ("4.6".equals(codeString)) + return true; + if ("4.6.0".equals(codeString)) + return true; + if ("5.0".equals(codeString)) + return true; + if ("5.0.0".equals(codeString)) + return true; + if ("5.0.0-cibuild".equals(codeString)) + return true; + if ("5.0.0-snapshot1".equals(codeString)) + return true; + if ("5.0.0-snapshot2".equals(codeString)) + return true; + if ("5.0.0-ballot".equals(codeString)) + return true; + return false; + } + public String toCode() { switch (this) { case _0_01: return "0.01"; case _0_05: return "0.05"; case _0_06: return "0.06"; case _0_11: return "0.11"; + case _0_0: return "0.0"; case _0_0_80: return "0.0.80"; case _0_0_81: return "0.0.81"; case _0_0_82: return "0.0.82"; + case _0_4: return "0.4"; case _0_4_0: return "0.4.0"; + case _0_5: return "0.5"; case _0_5_0: return "0.5.0"; + case _1_0: return "1.0"; case _1_0_0: return "1.0.0"; case _1_0_1: return "1.0.1"; case _1_0_2: return "1.0.2"; + case _1_1: return "1.1"; case _1_1_0: return "1.1.0"; + case _1_4: return "1.4"; case _1_4_0: return "1.4.0"; + case _1_6: return "1.6"; case _1_6_0: return "1.6.0"; + case _1_8: return "1.8"; case _1_8_0: return "1.8.0"; + case _3_0: return "3.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; case _3_0_2: return "3.0.2"; + case _3_3: return "3.3"; case _3_3_0: return "3.3.0"; + case _3_5: return "3.5"; case _3_5_0: return "3.5.0"; + case _4_0: return "4.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; + case _4_1: return "4.1"; case _4_1_0: return "4.1.0"; + case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot1"; + case _4_3_0_CIBUILD: return "4.3.0-cibuild"; + case _4_2: return "4.2"; case _4_2_0: return "4.2.0"; - case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; - case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3: return "4.3"; case _4_3_0: return "4.3.0"; + case _4_4: return "4.4"; + case _4_4_0: return "4.4.0"; + case _4_5: return "4.5"; + case _4_5_0: return "4.5.0"; + case _4_6: return "4.6"; + case _4_6_0: return "4.6.0"; + case _5_0: return "5.0"; + case _5_0_0: return "5.0.0"; + case _5_0_0CIBUILD: return "5.0.0-cibuild"; + case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; + case _5_0_0BALLOT: return "5.0.0-ballot"; case NULL: return null; default: return "?"; } @@ -6222,30 +6523,57 @@ The primary difference between a medication statement and a medication administr case _0_05: return "http://hl7.org/fhir/FHIR-version"; case _0_06: return "http://hl7.org/fhir/FHIR-version"; case _0_11: return "http://hl7.org/fhir/FHIR-version"; + case _0_0: return "http://hl7.org/fhir/FHIR-version"; case _0_0_80: return "http://hl7.org/fhir/FHIR-version"; case _0_0_81: return "http://hl7.org/fhir/FHIR-version"; case _0_0_82: return "http://hl7.org/fhir/FHIR-version"; + case _0_4: return "http://hl7.org/fhir/FHIR-version"; case _0_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _0_5: return "http://hl7.org/fhir/FHIR-version"; case _0_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_0: return "http://hl7.org/fhir/FHIR-version"; case _1_0_0: return "http://hl7.org/fhir/FHIR-version"; case _1_0_1: return "http://hl7.org/fhir/FHIR-version"; case _1_0_2: return "http://hl7.org/fhir/FHIR-version"; + case _1_1: return "http://hl7.org/fhir/FHIR-version"; case _1_1_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_4: return "http://hl7.org/fhir/FHIR-version"; case _1_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_6: return "http://hl7.org/fhir/FHIR-version"; case _1_6_0: return "http://hl7.org/fhir/FHIR-version"; + case _1_8: return "http://hl7.org/fhir/FHIR-version"; case _1_8_0: return "http://hl7.org/fhir/FHIR-version"; + case _3_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_0: return "http://hl7.org/fhir/FHIR-version"; case _3_0_1: return "http://hl7.org/fhir/FHIR-version"; case _3_0_2: return "http://hl7.org/fhir/FHIR-version"; + case _3_3: return "http://hl7.org/fhir/FHIR-version"; case _3_3_0: return "http://hl7.org/fhir/FHIR-version"; + case _3_5: return "http://hl7.org/fhir/FHIR-version"; case _3_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_0: return "http://hl7.org/fhir/FHIR-version"; case _4_0_1: return "http://hl7.org/fhir/FHIR-version"; + case _4_1: return "http://hl7.org/fhir/FHIR-version"; case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0_SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0_CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_2: return "http://hl7.org/fhir/FHIR-version"; case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; - case _4_3_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; - case _4_3_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _4_3: return "http://hl7.org/fhir/FHIR-version"; case _4_3_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_4: return "http://hl7.org/fhir/FHIR-version"; + case _4_4_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_5: return "http://hl7.org/fhir/FHIR-version"; + case _4_5_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_6: return "http://hl7.org/fhir/FHIR-version"; + case _4_6_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0SNAPSHOT2: return "http://hl7.org/fhir/FHIR-version"; + case _5_0_0BALLOT: return "http://hl7.org/fhir/FHIR-version"; case NULL: return null; default: return "?"; } @@ -6256,30 +6584,57 @@ The primary difference between a medication statement and a medication administr case _0_05: return "1st Draft for Comment (Sept 2012 Ballot)."; case _0_06: return "2nd Draft for Comment (January 2013 Ballot)."; case _0_11: return "DSTU 1 Ballot version."; + case _0_0: return "DSTU 1 version."; case _0_0_80: return "DSTU 1 Official version."; case _0_0_81: return "DSTU 1 Official version Technical Errata #1."; case _0_0_82: return "DSTU 1 Official version Technical Errata #2."; + case _0_4: return "January 2015 Ballot."; case _0_4_0: return "Draft For Comment (January 2015 Ballot)."; + case _0_5: return "May 2015 Ballot."; case _0_5_0: return "DSTU 2 Ballot version (May 2015 Ballot)."; + case _1_0: return "DSTU 2 version."; case _1_0_0: return "DSTU 2 QA Preview + CQIF Ballot (Sep 2015)."; case _1_0_1: return "DSTU 2 (Official version)."; case _1_0_2: return "DSTU 2 (Official version) with 1 technical errata."; + case _1_1: return "GAO Ballot version."; case _1_1_0: return "GAO Ballot + draft changes to main FHIR standard."; + case _1_4: return "Connectathon 12 (Montreal) version."; case _1_4_0: return "CQF on FHIR Ballot + Connectathon 12 (Montreal)."; + case _1_6: return "Connectathon 13 (Baltimore) version."; case _1_6_0: return "FHIR STU3 Ballot + Connectathon 13 (Baltimore)."; + case _1_8: return "Connectathon 14 (San Antonio) version."; case _1_8_0: return "FHIR STU3 Candidate + Connectathon 14 (San Antonio)."; + case _3_0: return "STU3 version."; case _3_0_0: return "FHIR Release 3 (STU)."; case _3_0_1: return "FHIR Release 3 (STU) with 1 technical errata."; case _3_0_2: return "FHIR Release 3 (STU) with 2 technical errata."; - case _3_3_0: return "R4 Ballot #1."; - case _3_5_0: return "R4 Ballot #2."; + case _3_3: return "R4 Ballot #1 version."; + case _3_3_0: return "R4 Ballot #1 + Connectaton 18 (Cologne)."; + case _3_5: return "R4 Ballot #2 version."; + case _3_5_0: return "R4 Ballot #2 + Connectathon 19 (Baltimore)."; + case _4_0: return "R4 version."; case _4_0_0: return "FHIR Release 4 (Normative + STU)."; - case _4_0_1: return "FHIR Release 4 Technical Correction."; - case _4_1_0: return "FHIR Release 4B Ballot #1."; - case _4_2_0: return "FHIR Release 5 Draft #1."; - case _4_3_0SNAPSHOT1: return "FHIR Release 4B Snapshot #1."; - case _4_3_0CIBUILD: return "FHIR Release 4B CI-Build."; - case _4_3_0: return "FHIR Release 4B"; + case _4_0_1: return "FHIR Release 4 (Normative + STU) with 1 technical errata."; + case _4_1: return "R4B Ballot #1 version."; + case _4_1_0: return "R4B Ballot #1 + Connectathon 27 (Virtual)."; + case _4_2: return "R5 Preview #1 version."; + case _4_2_0: return "R5 Preview #1 + Connectathon 23 (Sydney)."; + case _4_3_0_SNAPSHOT1: return "FHIR Release 4B Snapshot #1"; + case _4_3_0_CIBUILD: return "FHIR Release 4B CI-Builld"; + case _4_3: return "R4B version."; + case _4_3_0: return "FHIR Release 4B (Normative + STU)."; + case _4_4: return "R5 Preview #2 version."; + case _4_4_0: return "R5 Preview #2 + Connectathon 24 (Virtual)."; + case _4_5: return "R5 Preview #3 version."; + case _4_5_0: return "R5 Preview #3 + Connectathon 25 (Virtual)."; + case _4_6: return "R5 Draft Ballot version."; + case _4_6_0: return "R5 Draft Ballot + Connectathon 27 (Virtual)."; + case _5_0: return "R5 Versions."; + case _5_0_0: return "R5 Final Version."; + case _5_0_0CIBUILD: return "R5 Rolling ci-build."; + case _5_0_0SNAPSHOT1: return "R5 Preview #2."; + case _5_0_0SNAPSHOT2: return "R5 Interim tooling stage."; + case _5_0_0BALLOT: return "R5 Ballot."; case NULL: return null; default: return "?"; } @@ -6290,60 +6645,61 @@ The primary difference between a medication statement and a medication administr case _0_05: return "0.05"; case _0_06: return "0.06"; case _0_11: return "0.11"; + case _0_0: return "0.0"; case _0_0_80: return "0.0.80"; case _0_0_81: return "0.0.81"; case _0_0_82: return "0.0.82"; + case _0_4: return "0.4"; case _0_4_0: return "0.4.0"; + case _0_5: return "0.5"; case _0_5_0: return "0.5.0"; + case _1_0: return "1.0"; case _1_0_0: return "1.0.0"; case _1_0_1: return "1.0.1"; case _1_0_2: return "1.0.2"; + case _1_1: return "1.1"; case _1_1_0: return "1.1.0"; + case _1_4: return "1.4"; case _1_4_0: return "1.4.0"; + case _1_6: return "1.6"; case _1_6_0: return "1.6.0"; + case _1_8: return "1.8"; case _1_8_0: return "1.8.0"; + case _3_0: return "3.0"; case _3_0_0: return "3.0.0"; case _3_0_1: return "3.0.1"; case _3_0_2: return "3.0.2"; + case _3_3: return "3.3"; case _3_3_0: return "3.3.0"; + case _3_5: return "3.5"; case _3_5_0: return "3.5.0"; + case _4_0: return "4.0"; case _4_0_0: return "4.0.0"; case _4_0_1: return "4.0.1"; + case _4_1: return "4.1"; case _4_1_0: return "4.1.0"; + case _4_2: return "4.2"; case _4_2_0: return "4.2.0"; - case _4_3_0SNAPSHOT1: return "4.3.0-snapshot1"; - case _4_3_0CIBUILD: return "4.3.0-cibuild"; + case _4_3: return "4.3"; + case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot"; + case _4_3_0_CIBUILD: return "4.3.0-cibuild"; case _4_3_0: return "4.3.0"; + case _4_4: return "4.4"; + case _4_4_0: return "4.4.0"; + case _4_5: return "4.5"; + case _4_5_0: return "4.5.0"; + case _4_6: return "4.6"; + case _4_6_0: return "4.6.0"; + case _5_0: return "5.0"; + case _5_0_0: return "5.0.0"; + case _5_0_0CIBUILD: return "5.0.0-cibuild"; + case _5_0_0SNAPSHOT1: return "5.0.0-snapshot1"; + case _5_0_0SNAPSHOT2: return "5.0.0-snapshot2"; + case _5_0_0BALLOT: return "5.0.0-ballot"; case NULL: return null; default: return "?"; } } -// manual code from configuration.txt: -//public String toCode(int len) { -// return toCode().substring(0, len); -// } - -// public static boolean isR4Plus(String version) { -// return version != null && (version.startsWith("4.") || version.startsWith("5.") || "current".equals(version)); -// } -// - public static boolean isValidCode(String codeString) { - return Utilities.existsInList(codeString, "0.01", "0.05", "0.06", "0.11", "0.0.80", "0.0.81" ,"0.0.82", "0.4.0", "0.5.0", - "1.0.0", "1.0.1", "1.0.2", "1.1.0", "1.4.0", "1.6.0", "1.8.0", "3.0.0", "3.0.1", "3.0.2", "3.3.0", "3.5.0", - "4.0.0", "4.0.1", "4.1.0" ,"4.2.0" ,"4.3.0-snapshot1" ,"4.3.0-cibuild" ,"4.3.0"); - } - - @Override - public String toString() { - return toCode(); - } - -// -// public boolean isR4B() { -// return toCode().startsWith("4.1"); -// } - -// end addition } public static class FHIRVersionEnumFactory implements EnumFactory { @@ -6359,54 +6715,108 @@ The primary difference between a medication statement and a medication administr return FHIRVersion._0_06; if ("0.11".equals(codeString)) return FHIRVersion._0_11; + if ("0.0".equals(codeString)) + return FHIRVersion._0_0; if ("0.0.80".equals(codeString)) return FHIRVersion._0_0_80; if ("0.0.81".equals(codeString)) return FHIRVersion._0_0_81; if ("0.0.82".equals(codeString)) return FHIRVersion._0_0_82; + if ("0.4".equals(codeString)) + return FHIRVersion._0_4; if ("0.4.0".equals(codeString)) return FHIRVersion._0_4_0; + if ("0.5".equals(codeString)) + return FHIRVersion._0_5; if ("0.5.0".equals(codeString)) return FHIRVersion._0_5_0; + if ("1.0".equals(codeString)) + return FHIRVersion._1_0; if ("1.0.0".equals(codeString)) return FHIRVersion._1_0_0; if ("1.0.1".equals(codeString)) return FHIRVersion._1_0_1; if ("1.0.2".equals(codeString)) return FHIRVersion._1_0_2; + if ("1.1".equals(codeString)) + return FHIRVersion._1_1; if ("1.1.0".equals(codeString)) return FHIRVersion._1_1_0; + if ("1.4".equals(codeString)) + return FHIRVersion._1_4; if ("1.4.0".equals(codeString)) return FHIRVersion._1_4_0; + if ("1.6".equals(codeString)) + return FHIRVersion._1_6; if ("1.6.0".equals(codeString)) return FHIRVersion._1_6_0; + if ("1.8".equals(codeString)) + return FHIRVersion._1_8; if ("1.8.0".equals(codeString)) return FHIRVersion._1_8_0; + if ("3.0".equals(codeString)) + return FHIRVersion._3_0; if ("3.0.0".equals(codeString)) return FHIRVersion._3_0_0; if ("3.0.1".equals(codeString)) return FHIRVersion._3_0_1; if ("3.0.2".equals(codeString)) return FHIRVersion._3_0_2; + if ("3.3".equals(codeString)) + return FHIRVersion._3_3; if ("3.3.0".equals(codeString)) return FHIRVersion._3_3_0; + if ("3.5".equals(codeString)) + return FHIRVersion._3_5; if ("3.5.0".equals(codeString)) return FHIRVersion._3_5_0; + if ("4.0".equals(codeString)) + return FHIRVersion._4_0; if ("4.0.0".equals(codeString)) return FHIRVersion._4_0_0; if ("4.0.1".equals(codeString)) return FHIRVersion._4_0_1; + if ("4.1".equals(codeString)) + return FHIRVersion._4_1; if ("4.1.0".equals(codeString)) return FHIRVersion._4_1_0; + if ("4.2".equals(codeString)) + return FHIRVersion._4_2; if ("4.2.0".equals(codeString)) return FHIRVersion._4_2_0; if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) - return FHIRVersion._4_3_0SNAPSHOT1; + return FHIRVersion._4_3_0_SNAPSHOT1; if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) - return FHIRVersion._4_3_0CIBUILD; - if ("4.3.0".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0_CIBUILD; + if ("4.3".equals(codeString)) + return FHIRVersion._4_3; + if ("4.3.0".equals(codeString)) return FHIRVersion._4_3_0; + if ("4.4".equals(codeString)) + return FHIRVersion._4_4; + if ("4.4.0".equals(codeString)) + return FHIRVersion._4_4_0; + if ("4.5".equals(codeString)) + return FHIRVersion._4_5; + if ("4.5.0".equals(codeString)) + return FHIRVersion._4_5_0; + if ("4.6".equals(codeString)) + return FHIRVersion._4_6; + if ("4.6.0".equals(codeString)) + return FHIRVersion._4_6_0; + if ("5.0".equals(codeString)) + return FHIRVersion._5_0; + if ("5.0.0".equals(codeString)) + return FHIRVersion._5_0_0; + if ("5.0.0-cibuild".equals(codeString)) + return FHIRVersion._5_0_0CIBUILD; + if ("5.0.0-snapshot1".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT1; + if ("5.0.0-snapshot2".equals(codeString)) + return FHIRVersion._5_0_0SNAPSHOT2; + if ("5.0.0-ballot".equals(codeString)) + return FHIRVersion._5_0_0BALLOT; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } public Enumeration fromType(Base code) throws FHIRException { @@ -6425,54 +6835,108 @@ The primary difference between a medication statement and a medication administr return new Enumeration(this, FHIRVersion._0_06); if ("0.11".equals(codeString)) return new Enumeration(this, FHIRVersion._0_11); + if ("0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_0); if ("0.0.80".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_80); if ("0.0.81".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_81); if ("0.0.82".equals(codeString)) return new Enumeration(this, FHIRVersion._0_0_82); + if ("0.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_4); if ("0.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._0_4_0); + if ("0.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_5); if ("0.5.0".equals(codeString)) return new Enumeration(this, FHIRVersion._0_5_0); + if ("1.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_0); if ("1.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_0); if ("1.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_1); if ("1.0.2".equals(codeString)) return new Enumeration(this, FHIRVersion._1_0_2); + if ("1.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_1); if ("1.1.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_1_0); + if ("1.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_4); if ("1.4.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_4_0); + if ("1.6".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_6); if ("1.6.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_6_0); + if ("1.8".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_8); if ("1.8.0".equals(codeString)) return new Enumeration(this, FHIRVersion._1_8_0); + if ("3.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0); if ("3.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_0); if ("3.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_1); if ("3.0.2".equals(codeString)) return new Enumeration(this, FHIRVersion._3_0_2); + if ("3.3".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_3); if ("3.3.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_3_0); + if ("3.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_5); if ("3.5.0".equals(codeString)) return new Enumeration(this, FHIRVersion._3_5_0); + if ("4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_0); if ("4.0.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_0_0); if ("4.0.1".equals(codeString)) return new Enumeration(this, FHIRVersion._4_0_1); + if ("4.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_1); if ("4.1.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_1_0); + if ("4.2".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_2); if ("4.2.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_2_0); - if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._4_3_0SNAPSHOT1); - if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._4_3_0CIBUILD); - if ("4.3.0".equalsIgnoreCase(codeString)) + if ("4.3.0-snapshot1".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0_SNAPSHOT1); + if ("4.3.0-cibuild".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0_CIBUILD); + if ("4.3".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3); + if ("4.3.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3_0); + if ("4.4".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_4); + if ("4.4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_4_0); + if ("4.5".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5); + if ("4.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5_0); + if ("4.6".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_6); + if ("4.6.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_6_0); + if ("5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0); + if ("5.0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0); + if ("5.0.0-cibuild".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0CIBUILD); + if ("5.0.0-snapshot1".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT1); + if ("5.0.0-snapshot2".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT2); + if ("5.0.0-ballot".equals(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0BALLOT); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { @@ -6484,54 +6948,108 @@ The primary difference between a medication statement and a medication administr return "0.06"; if (code == FHIRVersion._0_11) return "0.11"; + if (code == FHIRVersion._0_0) + return "0.0"; if (code == FHIRVersion._0_0_80) return "0.0.80"; if (code == FHIRVersion._0_0_81) return "0.0.81"; if (code == FHIRVersion._0_0_82) return "0.0.82"; + if (code == FHIRVersion._0_4) + return "0.4"; if (code == FHIRVersion._0_4_0) return "0.4.0"; + if (code == FHIRVersion._0_5) + return "0.5"; if (code == FHIRVersion._0_5_0) return "0.5.0"; + if (code == FHIRVersion._1_0) + return "1.0"; if (code == FHIRVersion._1_0_0) return "1.0.0"; if (code == FHIRVersion._1_0_1) return "1.0.1"; if (code == FHIRVersion._1_0_2) return "1.0.2"; + if (code == FHIRVersion._1_1) + return "1.1"; if (code == FHIRVersion._1_1_0) return "1.1.0"; + if (code == FHIRVersion._1_4) + return "1.4"; if (code == FHIRVersion._1_4_0) return "1.4.0"; + if (code == FHIRVersion._1_6) + return "1.6"; if (code == FHIRVersion._1_6_0) return "1.6.0"; + if (code == FHIRVersion._1_8) + return "1.8"; if (code == FHIRVersion._1_8_0) return "1.8.0"; + if (code == FHIRVersion._3_0) + return "3.0"; if (code == FHIRVersion._3_0_0) return "3.0.0"; if (code == FHIRVersion._3_0_1) return "3.0.1"; if (code == FHIRVersion._3_0_2) return "3.0.2"; + if (code == FHIRVersion._3_3) + return "3.3"; if (code == FHIRVersion._3_3_0) return "3.3.0"; + if (code == FHIRVersion._3_5) + return "3.5"; if (code == FHIRVersion._3_5_0) return "3.5.0"; + if (code == FHIRVersion._4_0) + return "4.0"; if (code == FHIRVersion._4_0_0) return "4.0.0"; if (code == FHIRVersion._4_0_1) return "4.0.1"; + if (code == FHIRVersion._4_1) + return "4.1"; if (code == FHIRVersion._4_1_0) return "4.1.0"; + if (code == FHIRVersion._4_2) + return "4.2"; if (code == FHIRVersion._4_2_0) return "4.2.0"; - if (code == FHIRVersion._4_3_0SNAPSHOT1) + if (code == FHIRVersion._4_3) + return "4.3"; + if (code == FHIRVersion._4_3_0_SNAPSHOT1) return "4.3.0-snapshot1"; - if (code == FHIRVersion._4_3_0CIBUILD) + if (code == FHIRVersion._4_3_0_CIBUILD) return "4.3.0-cibuild"; if (code == FHIRVersion._4_3_0) return "4.3.0"; + if (code == FHIRVersion._4_4) + return "4.4"; + if (code == FHIRVersion._4_4_0) + return "4.4.0"; + if (code == FHIRVersion._4_5) + return "4.5"; + if (code == FHIRVersion._4_5_0) + return "4.5.0"; + if (code == FHIRVersion._4_6) + return "4.6"; + if (code == FHIRVersion._4_6_0) + return "4.6.0"; + if (code == FHIRVersion._5_0) + return "5.0"; + if (code == FHIRVersion._5_0_0) + return "5.0.0"; + if (code == FHIRVersion._5_0_0CIBUILD) + return "5.0.0-cibuild"; + if (code == FHIRVersion._5_0_0SNAPSHOT1) + return "5.0.0-snapshot1"; + if (code == FHIRVersion._5_0_0SNAPSHOT2) + return "5.0.0-snapshot2"; + if (code == FHIRVersion._5_0_0BALLOT) + return "5.0.0-ballot"; return "?"; } public String toSystem(FHIRVersion code) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java index 81e7deaa3..e9580f214 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java @@ -12628,6 +12628,8 @@ The primary difference between a medicationusage and a medicationadministration * R4B Ballot #1 + Connectathon 27 (Virtual). */ _4_1_0, + _4_3_0_SNAPSHOT1, + _4_3_0_CIBUILD, /** * R5 Preview #1 version. */ @@ -12773,6 +12775,10 @@ The primary difference between a medicationusage and a medicationadministration return _4_1; if ("4.1.0".equals(codeString)) return _4_1_0; + if ("4.3.0-snapshot1".equals(codeString)) + return _4_3_0_SNAPSHOT1; + if ("4.3.0-cibuild".equals(codeString)) + return _4_3_0_CIBUILD; if ("4.2".equals(codeString)) return _4_2; if ("4.2.0".equals(codeString)) @@ -12958,6 +12964,8 @@ The primary difference between a medicationusage and a medicationadministration case _4_0_1: return "4.0.1"; case _4_1: return "4.1"; case _4_1_0: return "4.1.0"; + case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot1"; + case _4_3_0_CIBUILD: return "4.3.0-cibuild"; case _4_2: return "4.2"; case _4_2_0: return "4.2.0"; case _4_3: return "4.3"; @@ -13017,6 +13025,8 @@ The primary difference between a medicationusage and a medicationadministration case _4_0_1: return "http://hl7.org/fhir/FHIR-version"; case _4_1: return "http://hl7.org/fhir/FHIR-version"; case _4_1_0: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0_SNAPSHOT1: return "http://hl7.org/fhir/FHIR-version"; + case _4_3_0_CIBUILD: return "http://hl7.org/fhir/FHIR-version"; case _4_2: return "http://hl7.org/fhir/FHIR-version"; case _4_2_0: return "http://hl7.org/fhir/FHIR-version"; case _4_3: return "http://hl7.org/fhir/FHIR-version"; @@ -13078,6 +13088,8 @@ The primary difference between a medicationusage and a medicationadministration case _4_1_0: return "R4B Ballot #1 + Connectathon 27 (Virtual)."; case _4_2: return "R5 Preview #1 version."; case _4_2_0: return "R5 Preview #1 + Connectathon 23 (Sydney)."; + case _4_3_0_SNAPSHOT1: return "FHIR Release 4B Snapshot #1"; + case _4_3_0_CIBUILD: return "FHIR Release 4B CI-Builld"; case _4_3: return "R4B version."; case _4_3_0: return "FHIR Release 4B (Normative + STU)."; case _4_4: return "R5 Preview #2 version."; @@ -13138,6 +13150,8 @@ The primary difference between a medicationusage and a medicationadministration case _4_2: return "4.2"; case _4_2_0: return "4.2.0"; case _4_3: return "4.3"; + case _4_3_0_SNAPSHOT1: return "4.3.0-snapshot"; + case _4_3_0_CIBUILD: return "4.3.0-cibuild"; case _4_3_0: return "4.3.0"; case _4_4: return "4.4"; case _4_4_0: return "4.4.0"; @@ -13155,23 +13169,6 @@ The primary difference between a medicationusage and a medicationadministration default: return "?"; } } -// manual code from configuration.txt: -//public String toCode(int len) { -// return toCode().substring(0, len); -// } -// -// -// @Override -// public String toString() { -// return toCode(); -// } -// -// -// public boolean isR4B() { -// return toCode().startsWith("4.1"); -// } -// -// end addition } public static class FHIRVersionEnumFactory implements EnumFactory { @@ -13257,6 +13254,10 @@ The primary difference between a medicationusage and a medicationadministration return FHIRVersion._4_2; if ("4.2.0".equals(codeString)) return FHIRVersion._4_2_0; + if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0_SNAPSHOT1; + if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) + return FHIRVersion._4_3_0_CIBUILD; if ("4.3".equals(codeString)) return FHIRVersion._4_3; if ("4.3.0".equals(codeString)) @@ -13373,6 +13374,10 @@ The primary difference between a medicationusage and a medicationadministration return new Enumeration(this, FHIRVersion._4_2); if ("4.2.0".equals(codeString)) return new Enumeration(this, FHIRVersion._4_2_0); + if ("4.3.0-snapshot1".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0_SNAPSHOT1); + if ("4.3.0-cibuild".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0_CIBUILD); if ("4.3".equals(codeString)) return new Enumeration(this, FHIRVersion._4_3); if ("4.3.0".equals(codeString)) @@ -13484,6 +13489,10 @@ The primary difference between a medicationusage and a medicationadministration return "4.2.0"; if (code == FHIRVersion._4_3) return "4.3"; + if (code == FHIRVersion._4_3_0_SNAPSHOT1) + return "4.3.0-snapshot1"; + if (code == FHIRVersion._4_3_0_CIBUILD) + return "4.3.0-cibuild"; if (code == FHIRVersion._4_3_0) return "4.3.0"; if (code == FHIRVersion._4_4) From f4aed6f2a2c9585c772055d8105a4df6de0b2555 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 15 Sep 2022 08:58:52 +0200 Subject: [PATCH 08/49] Fix bug in RDF generation in R4B --- .../src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java index 2f61f2e0a..2a37bd43a 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/RdfParser.java @@ -242,7 +242,7 @@ public class RdfParser extends RdfParserBase { } protected void composeDataType(Complex t, String parentType, String name, DataType element, int index) { - composeDataType(t, parentType, name, element, index); + composeElement(t, parentType, name, element, index); } From 03722bf7826a77e6d0593bedf5c260fa946b013c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 15 Sep 2022 08:59:18 +0200 Subject: [PATCH 09/49] Suppress display when generating narrative for code systems if display is always the same as the code --- .../main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java index 55151f29d..c1f3299a8 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CodeSystemRenderer.java @@ -284,7 +284,7 @@ public class CodeSystemRenderer extends TerminologyRenderer { } private boolean conceptsHaveDisplay(ConceptDefinitionComponent c) { - if (c.hasDisplay()) + if (c.hasDisplay() && !c.getDisplay().equals(c.getCode())) return true; for (ConceptDefinitionComponent g : c.getConcept()) if (conceptsHaveDisplay(g)) From 37982f2af392e852b02976148c61678b20e41c21 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 15 Sep 2022 08:59:38 +0200 Subject: [PATCH 10/49] Fix error with double escaping rendering code system markdown --- .../src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java index bd67caa5e..3d2c9573f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java @@ -134,7 +134,7 @@ public class DataRenderer extends Renderer { } // 2. markdown - String s = getContext().getMarkdown().process(Utilities.escapeXml(text), "narrative generator"); + String s = getContext().getMarkdown().process(text, "narrative generator"); XhtmlParser p = new XhtmlParser(); XhtmlNode m; try { From 43420db7567bd9b0c5a86872fd201d95ae62e020 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 15 Sep 2022 09:00:51 +0200 Subject: [PATCH 11/49] fix error with IG constraint --- .../org/hl7/fhir/utilities/npm/PackageHacker.java | 12 ++++++------ .../instance/utils/FHIRPathExpressionFixer.java | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageHacker.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageHacker.java index 8af672e06..507792cb2 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageHacker.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageHacker.java @@ -71,8 +71,8 @@ public class PackageHacker { } private void change(JsonObject npm) throws FileNotFoundException, IOException { - fixVersions(npm); -// npm.remove("notForPublication"); +// fixVersions(npm); + npm.remove("notForPublication"); // npm.addProperty("url", "http://hl7.org/fhir/us/carin-rtpbc/STU1"); // npm.remove("name"); // npm.addProperty("name", "hl7.fhir.uv.smart-app-launch"); @@ -80,10 +80,10 @@ public class PackageHacker { // 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", "http://hl7.org/fhir/R4B"); - npm.remove("homepage"); - npm.addProperty("homepage", "http://hl7.org/fhir/R4B"); +// npm.remove("url"); +// npm.addProperty("url", "http://hl7.org/fhir/R4B"); +// npm.remove("homepage"); +// npm.addProperty("homepage", "http://hl7.org/fhir/R4B"); // npm.remove("dependencies"); // JsonObject dep = new JsonObject(); // npm.add("dependencies", dep); diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/FHIRPathExpressionFixer.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/FHIRPathExpressionFixer.java index fad76a3de..be2590646 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/FHIRPathExpressionFixer.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/FHIRPathExpressionFixer.java @@ -19,7 +19,9 @@ public class FHIRPathExpressionFixer { if ("txt-2".equals(key)) { return "htmlChecks2()"; } - + if ("generated='generated' implies source.empty()".equals(expr)) { + return "generation='generated' implies source.empty()"; + } // fixes to string functions in FHIRPath // ref-1 if (expr.equals("reference.startsWith('#').not() or (reference.substring(1).trace('url') in %rootResource.contained.id.trace('ids')) or (reference='#' and %rootResource!=%resource)")) { // R5 From ccc38e48df58ec3d6cb66da8fed53d1991ab013c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 16 Sep 2022 23:49:26 -0400 Subject: [PATCH 12/49] Fix NPE processing constraints without keys + fix for R5 terminology package problem --- .../java/org/hl7/fhir/r4b/conformance/ProfileUtilities.java | 6 ++++++ .../fhir/utilities/npm/FilesystemPackageCacheManager.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/conformance/ProfileUtilities.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/conformance/ProfileUtilities.java index 746bce8ee..cb77745ea 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/conformance/ProfileUtilities.java @@ -4439,7 +4439,13 @@ public class ProfileUtilities extends TranslatingUtilities { } private boolean isBaseConstraint(ElementDefinitionConstraintComponent con) { + if (con == null) { + return false; + } String key = con.getKey(); + if (key == null) { + return false; + } return key != null && key.startsWith("ele-") || key.startsWith("res-") || key.startsWith("ext-") || key.startsWith("dom-") || key.startsWith("dr-"); } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java index 04f29c1b3..a7b452e04 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java @@ -227,7 +227,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple public String getLatestVersion(String id) throws IOException { for (String nextPackageServer : getPackageServers()) { // special case: - if (!(CommonPackages.ID_PUBPACK.equals(id) && PackageClient.PRIMARY_SERVER.equals(nextPackageServer))) { + if (!(Utilities.existsInList(id,CommonPackages.ID_PUBPACK, "hl7.terminology.r5") && PackageClient.PRIMARY_SERVER.equals(nextPackageServer))) { CachingPackageClient pc = new CachingPackageClient(nextPackageServer); try { return pc.getLatestVersion(id); From 53a6036d52e9e1474c64a0c11ce914fb7c316c82 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 01:02:27 -0400 Subject: [PATCH 13/49] set up release --- RELEASE_NOTES.md | 7 +++++-- pom.xml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..cce0ee342 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,10 @@ ## Validator Changes -* no changes +* Support for R5 terminology ## Other code changes -* no changes \ No newline at end of file +* fix error with R5 IG constraint +* fix error with double escaping rendering code system markdown +* Suppress display when generating narrative for code systems if display matches code +* Fix bug in RDF generation in R4B diff --git a/pom.xml b/pom.xml index 77854586d..5be3eba10 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.107 + 1.1.108 5.7.1 1.8.2 3.0.0-M5 From 68910ee95c842ed2e5ce5d300a1a196550733611 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 06:15:32 -0400 Subject: [PATCH 14/49] minor updates for R5 --- .../fhir/r5/test/utils/TestingUtilities.java | 4 ++-- .../txCache/org.hl7.fhir.r5/iso4217.cache | 5 ++++ .../txCache/org.hl7.fhir.r5/mimetypes.cache | 5 ++++ .../txCache/org.hl7.fhir.r5/ucum.cache | 23 +++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java index 1dc560741..a355aa930 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java @@ -112,8 +112,8 @@ public class TestingUtilities extends BaseTestingUtilities { IWorkerContext fcontext = getWorkerContext(pcm.loadPackage(VersionUtilities.packageForVersion(version), version)); fcontext.setUcumService(new UcumEssenceService(TestingUtilities.loadTestResourceStream("ucum", "ucum-essence.xml"))); fcontext.setExpansionProfile(new Parameters()); - if (!fcontext.hasPackage("hl7.terminology", null)) { - NpmPackage utg = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage("hl7.terminology"); + if (!fcontext.hasPackage("hl7.terminology.r5", null)) { + NpmPackage utg = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION).loadPackage("hl7.terminology.r5"); System.out.println("Loading THO: "+utg.name()+"#"+utg.version()); fcontext.loadFromPackage(utg, new TestPackageLoader(new String[]{"CodeSystem", "ValueSet"})); } diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache index e8c660bfa..84e8d085d 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache @@ -22,3 +22,8 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache index 98bb594d4..cd3d2dcfe 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache @@ -22,3 +22,8 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache index 450ee33a8..c68360c06 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache @@ -203,3 +203,26 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "http://unitsofmeasure.org" + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- From 0338899eef14fa8f4700008633ede4d23cb9f910 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 06:23:44 -0400 Subject: [PATCH 15/49] update tests --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5be3eba10..ef3b125dd 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.108 + 1.1.109 5.7.1 1.8.2 3.0.0-M5 From 15af005fbc00324aa62ea45acf6884db7d0412ea Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 07:59:15 -0400 Subject: [PATCH 16/49] update test cases --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef3b125dd..2a0420d76 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.109 + 1.1.110 5.7.1 1.8.2 3.0.0-M5 From 2045b8eee64ec03a9fa53342f2386983a8319948 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 09:17:11 -0400 Subject: [PATCH 17/49] update tests again --- .../txCache/org.hl7.fhir.r5/iso4217.cache | 5 + .../txCache/org.hl7.fhir.r5/mimetypes.cache | 5 + .../txCache/org.hl7.fhir.r5/ucum.cache | 23 +++ .../org.hl7.fhir.validation/4.0.1/loinc.cache | 57 +++++++ .../4.0.1/measure-population.cache | 11 ++ .../5.0.0/all-systems.cache | 65 ++++++++ .../org.hl7.fhir.validation/5.0.0/loinc.cache | 156 ++++++++++++++++++ .../5.0.0/measure-population.cache | 11 ++ .../5.0.0/observation-category.cache | 21 +++ .../5.0.0/snomed.cache | 30 ++++ .../org.hl7.fhir.validation/5.0.0/ucum.cache | 10 ++ .../5.0.0/v2-0203.cache | 29 ++++ .../5.0.0/v3-ObservationInterpretation.cache | 42 +++++ pom.xml | 2 +- 14 files changed, 466 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache index e8c660bfa..84e8d085d 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache @@ -22,3 +22,8 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache index 98bb594d4..cd3d2dcfe 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache @@ -22,3 +22,8 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache index 450ee33a8..c68360c06 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache @@ -203,3 +203,26 @@ e: { "error" : "java.lang.NullPointerException" } ------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "http://unitsofmeasure.org" + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache index 05d3bce2f..444f3bbfc 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache @@ -1477,3 +1477,60 @@ v: { "system" : "http://loinc.org" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "56445-0" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "48765-2", + "display" : "Allergies and adverse reactions" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '48765-2'). ValidVersions = [2.73]; The code provided (http://loinc.org#48765-2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "2.73", + "code" : "57852-6", + "display" : "Problem list Narrative - Reported" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Problem list Narrative - Reported", + "code" : "57852-6", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/measure-population.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/measure-population.cache index 1ad19edde..f74382241 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/measure-population.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/measure-population.cache @@ -23,3 +23,14 @@ v: { "class" : "CODESYSTEM_UNSUPPORTED" } ------------------------------------------------------------------------------------- +{"code" : { + "coding" : [{ + "code" : "initial-population" + }] +}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### +v: { + "severity" : "error", + "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache index 607a33d30..486e0761e 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache @@ -156,3 +156,68 @@ v: { "system" : "urn:ietf:bcp:47" } ------------------------------------------------------------------------------------- +{"code" : { + "code" : "text/plain" +}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "text/plain", + "code" : "text/plain", + "system" : "urn:ietf:bcp:13" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "271649006", + "display" : "Systolic blood pressure" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Systolic blood pressure", + "code" : "271649006", + "system" : "http://snomed.info/sct" +} +------------------------------------------------------------------------------------- +{"code" : { + "code" : "nl-NL" +}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-ballot", "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Nederlands (Nederland)", + "code" : "nl-NL", + "system" : "urn:ietf:bcp:47" +} +------------------------------------------------------------------------------------- +{"code" : { + "code" : "text/cql" +}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "CQL", + "code" : "text/cql", + "system" : "urn:ietf:bcp:13" +} +------------------------------------------------------------------------------------- +{"code" : { + "code" : "text/fhirpath" +}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "FHIRPath", + "code" : "text/fhirpath", + "system" : "urn:ietf:bcp:13" +} +------------------------------------------------------------------------------------- +{"code" : { + "code" : "en-AU" +}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-ballot", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "English (Australia)", + "code" : "en-AU", + "system" : "urn:ietf:bcp:47" +} +------------------------------------------------------------------------------------- +{"code" : { + "code" : "en" +}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "English", + "code" : "en", + "system" : "urn:ietf:bcp:47" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache index 279d15dfa..6cb027de3 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache @@ -623,3 +623,159 @@ v: { "system" : "http://loinc.org" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "85354-9" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Blood pressure panel with all children optional", + "code" : "85354-9", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "85354-9", + "display" : "Blood pressure panel with all children optional" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Blood pressure panel with all children optional", + "code" : "85354-9", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8480-6" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Systolic blood pressure", + "code" : "8480-6", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8480-6", + "display" : "Systolic blood pressure" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Systolic blood pressure", + "code" : "8480-6", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8462-4" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Diastolic blood pressure", + "code" : "8462-4", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8462-4", + "display" : "Diastolic blood pressure" +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Diastolic blood pressure", + "code" : "8462-4", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "56445-0" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "2.72", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version '2.72' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "56445-0" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "2.73", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "2.73", + "code" : "56445-0" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "2.73", + "code" : "48765-2", + "display" : "Allergies and adverse reactions" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Allergies and adverse reactions Document", + "code" : "48765-2", + "system" : "http://loinc.org", + "severity" : "warning", + "error" : "The display \"Allergies and adverse reactions\" is not a valid display for the code {http://loinc.org}48765-2 - should be one of ['Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 变态反应与不良反应 文档.其他' (zh-CN), '杂项类文档' (zh-CN), '其他文档 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 杂项' (zh-CN), '杂项类' (zh-CN), '杂项试验 过敏反应' (zh-CN), '过敏' (zh-CN), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache index 275a8a4ac..3ee93fe17 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache @@ -21,3 +21,14 @@ v: { "class" : "CODESYSTEM_UNSUPPORTED" } ------------------------------------------------------------------------------------- +{"code" : { + "coding" : [{ + "code" : "initial-population" + }] +}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### +v: { + "severity" : "error", + "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache index dd0eb5519..2cc9c3b6d 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache @@ -51,3 +51,24 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/observation-category" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/observation-category", + "code" : "vital-signs" +}, "url": "http://hl7.org/fhir/ValueSet/observation-category--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Vital Signs", + "code" : "vital-signs", + "system" : "http://terminology.hl7.org/CodeSystem/observation-category" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/observation-category", + "code" : "vital-signs", + "display" : "Vital Signs" +}, "url": "http://hl7.org/fhir/ValueSet/observation-category", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Vital Signs", + "code" : "vital-signs", + "system" : "http://terminology.hl7.org/CodeSystem/observation-category" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache index d4de476c1..4468966e5 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache @@ -245,3 +245,33 @@ v: { "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "109006" +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Anxiety disorder of childhood OR adolescence", + "code" : "109006", + "system" : "http://snomed.info/sct" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "109006", + "display" : "Anxiety disorder of childhood OR adolescence" +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Anxiety disorder of childhood OR adolescence", + "code" : "109006", + "system" : "http://snomed.info/sct" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "106004" +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache index 6979b8d88..de6ac0095 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache @@ -49,3 +49,13 @@ v: { "system" : "http://unitsofmeasure.org" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://unitsofmeasure.org", + "code" : "mm[Hg]" +}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "millimeter of mercury", + "code" : "mm[Hg]", + "system" : "http://unitsofmeasure.org" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache index e44a6bb7f..8c4537315 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache @@ -88,3 +88,32 @@ v: { "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", + "code" : "MR" +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Medical record number", + "code" : "MR", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", + "code" : "MR" +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Medical record number", + "code" : "MR", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", + "code" : "MC" +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache index 427921b69..ad14c6921 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache @@ -268,3 +268,45 @@ e: { "error" : "" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", + "code" : "L" +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Low", + "code" : "L", + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", + "code" : "L", + "display" : "low" +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Low", + "code" : "L", + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", + "code" : "N" +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Normal", + "code" : "N", + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", + "code" : "N", + "display" : "normal" +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Normal", + "code" : "N", + "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" +} +------------------------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2a0420d76..3a9b1913e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.110 + 1.1.111 5.7.1 1.8.2 3.0.0-M5 From 5cf7e2c3bd930f29a11724573ab0667b0de2736e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 09:51:59 -0400 Subject: [PATCH 18/49] fix html parser for comments that end with ---> --- .../main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java index c18d55df6..1f685f26b 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java @@ -803,8 +803,10 @@ public class XhtmlParser { readChar(); if (peekChar() == '>') { done = true; - } else - s.append("--"); + } else { + pushChar('-'); + s.append("-"); + } } else s.append('-'); } else if (doctypeEntities && c == ']') { From 917f65d66047dd7f3f1e66f866413aafdb84260e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 09:53:20 -0400 Subject: [PATCH 19/49] release notes --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index cce0ee342..d1874730b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -8,3 +8,4 @@ * fix error with double escaping rendering code system markdown * Suppress display when generating narrative for code systems if display matches code * Fix bug in RDF generation in R4B +* fix bug in html parser - misses end of comments when end is ---> From 7cce3ef810a28ee96dd6fde9806d08447a4c5b4c Mon Sep 17 00:00:00 2001 From: markiantorno Date: Sat, 17 Sep 2022 14:17:42 +0000 Subject: [PATCH 20/49] Release: v5.6.64 ## Validator Changes * Support for R5 terminology ## Other code changes * fix error with R5 IG constraint * fix error with double escaping rendering code system markdown * Suppress display when generating narrative for code systems if display matches code * Fix bug in RDF generation in R4B * fix bug in html parser - misses end of comments when end is ---> ***NO_CI*** --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index cd8c7c6a7..ce53da280 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index b56df7e64..c61ef534a 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 9d57a4016..051ec5458 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 4b6ffd1e9..3862c700a 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 6e2a8b0c7..9bd8c1c0a 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index f9cfe03c0..384959661 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index fcd570858..59092211d 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 5a3c0c14d..d781a6bd5 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 3d18af6a1..427eabd06 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index bb3347461..e4e5755a0 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 29f8518ba..ecdc57aee 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 ../pom.xml diff --git a/pom.xml b/pom.xml index 3a9b1913e..8f91b685f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.64-SNAPSHOT + 5.6.64 pom From 45a4ad77adb8bc16b253fa76730b21b424735eed Mon Sep 17 00:00:00 2001 From: markiantorno Date: Sat, 17 Sep 2022 14:49:41 +0000 Subject: [PATCH 21/49] Updating version to: 5.6.65-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 8 ++------ org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 14 insertions(+), 18 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d1874730b..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,11 +1,7 @@ ## Validator Changes -* Support for R5 terminology +* no changes ## Other code changes -* fix error with R5 IG constraint -* fix error with double escaping rendering code system markdown -* Suppress display when generating narrative for code systems if display matches code -* Fix bug in RDF generation in R4B -* fix bug in html parser - misses end of comments when end is ---> +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index ce53da280..06fb96f8e 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index c61ef534a..b59c69ed2 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 051ec5458..4bcf7a0ab 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 3862c700a..47a9d7783 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 9bd8c1c0a..99b70a2da 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 384959661..c4ea775a5 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 59092211d..cd2541978 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index d781a6bd5..bdd7a2fa1 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 427eabd06..1010b144f 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index e4e5755a0..9a6529572 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index ecdc57aee..748515d81 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 8f91b685f..4df335777 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.64 + 5.6.65-SNAPSHOT pom From df0bc26d47b6f24ab7f5b30200f5cfeabb23d6fb Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 17 Sep 2022 14:54:20 -0400 Subject: [PATCH 22/49] rationalise extensions --- org.hl7.fhir.r4b/.classpath | 19 +- .../java/org/hl7/fhir/r4b/utils/IGHelper.java | 2 +- .../hl7/fhir/r4b/utils/ToolingExtensions.java | 4 +- .../CapabilityStatementComparer.java | 9 +- .../fhir/r5/conformance/ProfileUtilities.java | 4 +- .../r5/conformance/XmlSchemaGenerator.java | 4 +- .../hl7/fhir/r5/elementmodel/Property.java | 4 +- .../hl7/fhir/r5/renderers/DataRenderer.java | 2 +- .../r5/renderers/QuestionnaireRenderer.java | 54 +-- .../QuestionnaireResponseRenderer.java | 6 +- .../fhir/r5/utils/GraphQLSchemaGenerator.java | 5 +- .../java/org/hl7/fhir/r5/utils/IGHelper.java | 12 +- .../hl7/fhir/r5/utils/ToolingExtensions.java | 366 +++++++++--------- .../instance/InstanceValidator.java | 68 ++-- .../instance/type/MeasureValidator.java | 5 +- .../type/StructureDefinitionValidator.java | 9 +- 16 files changed, 278 insertions(+), 295 deletions(-) diff --git a/org.hl7.fhir.r4b/.classpath b/org.hl7.fhir.r4b/.classpath index 15f02af33..8131be0e5 100644 --- a/org.hl7.fhir.r4b/.classpath +++ b/org.hl7.fhir.r4b/.classpath @@ -19,7 +19,7 @@ - + @@ -29,22 +29,5 @@ - - - - - - - - - - - - - - - - - diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/IGHelper.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/IGHelper.java index 78073f581..253c749ec 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/IGHelper.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/IGHelper.java @@ -40,7 +40,7 @@ public class IGHelper { public static final String EXT_MAPPING_CSV = ToolingExtensions.EXT_IGP_MAPPING_CSV; public static final String EXT_BUNDLE = ToolingExtensions.EXT_IGP_BUNDLE; public static final String EXT_RESOURCE_INFO = ToolingExtensions.EXT_IGP_RESOURCE_INFO; - public static final String EXT_CONTAINED_RESOURCE_INFO = ToolingExtensions.EXT_IGP_CONTAINED_RESOURCE_INFO; +// public static final String EXT_CONTAINED_RESOURCE_INFO = ToolingExtensions.EXT_IGP_CONTAINED_RESOURCE_INFO; public static final String EXT_PRIVATE_BASE = ToolingExtensions.EXT_PRIVATE_BASE; public static String readStringParameter(ImplementationGuideDefinitionComponent ig, String name) { diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/ToolingExtensions.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/ToolingExtensions.java index 77df48205..ced403850 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/ToolingExtensions.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/ToolingExtensions.java @@ -169,8 +169,8 @@ public class ToolingExtensions { public static final String EXT_IGP_MAPPING_CSV = "http://hl7.org/fhir/StructureDefinition/igpublisher-mapping-csv"; public static final String EXT_IGP_BUNDLE = "http://hl7.org/fhir/StructureDefinition/igpublisher-bundle"; public static final String EXT_IGP_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/resource-information"; - public static final String EXT_IGP_CONTAINED_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/contained-resource-information"; - public static final String EXT_IGP_LOADVERSION = "http://hl7.org/fhir/StructureDefinition/igpublisher-loadversion"; +// public static final String EXT_IGP_CONTAINED_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/contained-resource-information"; +// public static final String EXT_IGP_LOADVERSION = "http://hl7.org/fhir/StructureDefinition/igpublisher-loadversion"; public static final String EXT_MAX_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"; public static final String EXT_MIN_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-minValueSet"; public static final String EXT_PROFILE_ELEMENT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-profile-element"; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CapabilityStatementComparer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CapabilityStatementComparer.java index bc8044a78..dd0825825 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CapabilityStatementComparer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/CapabilityStatementComparer.java @@ -35,6 +35,7 @@ import org.hl7.fhir.r5.model.Extension; import org.hl7.fhir.r5.model.PrimitiveType; import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.model.StructureDefinition; +import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; @@ -263,8 +264,8 @@ public class CapabilityStatementComparer extends CanonicalResourceComparer { } private void compareExpectations(StructuralMatch combined, Element left, Element right, String path, CapabilityStatementComparison res, Element union, Element intersection) { - Extension l = left.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"); - Extension r = right.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"); + Extension l = left.getExtensionByUrl(ToolingExtensions.EXT_CAP_STMT_EXPECT); + Extension r = right.getExtensionByUrl(ToolingExtensions.EXT_CAP_STMT_EXPECT); if (l != null || r != null) { if (l == null) { union.addExtension(r.copy()); @@ -284,8 +285,8 @@ public class CapabilityStatementComparer extends CanonicalResourceComparer { sm.getMessages().add(new ValidationMessage(Source.ProfileComparer, IssueType.INFORMATIONAL, path+".extension('http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation')", "Changed value for expectation: '"+ls+"' vs '"+rs+"'", IssueSeverity.WARNING)); String lowest = lower(ls, rs) ? ls : rs; String highest = lower(ls, rs) ? rs : ls; - union.addExtension("http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", new CodeType(lowest)); - intersection.addExtension("http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", new CodeType(highest)); + union.addExtension(ToolingExtensions.EXT_CAP_STMT_EXPECT, new CodeType(lowest)); + intersection.addExtension(ToolingExtensions.EXT_CAP_STMT_EXPECT, new CodeType(highest)); } } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index 0bdff4535..50e4f7585 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -5218,8 +5218,8 @@ public class ProfileUtilities extends TranslatingUtilities { for (ElementDefinitionConstraintComponent inv : definition.getConstraint()) { if (!c.getPieces().isEmpty()) { c.addPiece(gen.new Piece("br")); } c.getPieces().add(checkForNoChange(inv, gen.new Piece(null, inv.getKey()+": ", null).addStyle("font-weight:bold"))); - if (inv.getHumanElement().hasExtension("http://hl7.org/fhir/StructureDefinition/rendering-markdown")) { - c.addMarkdown(inv.getHumanElement().getExtensionString("http://hl7.org/fhir/StructureDefinition/rendering-markdown")); + if (inv.getHumanElement().hasExtension(ToolingExtensions.EXT_REND_MD)) { + c.addMarkdown(inv.getHumanElement().getExtensionString(ToolingExtensions.EXT_REND_MD)); } else { c.getPieces().add(checkForNoChange(inv, gen.new Piece(null, inv.getHuman(), null))); } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/XmlSchemaGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/XmlSchemaGenerator.java index 752db3acc..98d65de64 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/XmlSchemaGenerator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/XmlSchemaGenerator.java @@ -238,8 +238,8 @@ public class XmlSchemaGenerator { private String getNs(StructureDefinition sd) { String ns = "http://hl7.org/fhir"; - if (sd.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace")) - ns = ToolingExtensions.readStringExtension(sd, "http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace"); + if (sd.hasExtension(ToolingExtensions.EXT_XML_NAMESPACE)) + ns = ToolingExtensions.readStringExtension(sd, ToolingExtensions.EXT_XML_NAMESPACE); return ns; } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java index 84b8e2482..d9d6a052e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Property.java @@ -74,8 +74,8 @@ public class Property { } public String getXmlName() { - if (definition.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name")) { - return ToolingExtensions.readStringExtension(definition, "http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"); + if (definition.hasExtension(ToolingExtensions.EXT_XML_NAME)) { + return ToolingExtensions.readStringExtension(definition, ToolingExtensions.EXT_XML_NAME); } else { return getName(); } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java index 3d2c9573f..d807089b6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java @@ -346,7 +346,7 @@ public class DataRenderer extends Renderer { "ExampleScenario", "GraphDefinition", "ImplementationGuide", "Library", "Measure", "MessageDefinition", "NamingSystem", "PlanDefinition" )) return true; - return sd.getBaseDefinitionElement().hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-codegen-super"); + return false; } // -- 4. Language support ------------------------------------------------------ diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java index a4edd2bd8..c4092eb5c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireRenderer.java @@ -175,26 +175,28 @@ public class QuestionnaireRenderer extends TerminologyRenderer { if (i.getReadOnly()) { return true; } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_IS_SUBJ)) { return true; } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_HIDDEN)) { return true; } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_OTP_DISP)) { return true; } - if (i.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod")) { + if (i.hasExtension(ToolingExtensions.EXT_O_LINK_PERIOD)) { return true; } - if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation")) { + if (i.hasExtension(ToolingExtensions.EXT_Q_CHOICE_ORIENT)) { return true; } - if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory")) { + if (i.hasExtension(ToolingExtensions.EXT_Q_DISPLAY_CAT)) { return true; } return checkForFlags(i.getItem()); } + + private Row addTreeRoot(HierarchicalTableGenerator gen, List rows, Questionnaire q, boolean hasFlags) throws IOException { Row r = gen.new Row(); @@ -249,21 +251,21 @@ public class QuestionnaireRenderer extends TerminologyRenderer { if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject")) { flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-isSubject.html"), null, "Can change the subject of the questionnaire").addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png")))); } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_HIDDEN)) { flags.addPiece(gen.new Piece(getSpecLink("extension-questionnaire-hidden.html"), null, "Is a hidden item").addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-hidden.png")))); } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_OTP_DISP)) { flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-optionalDisplay.html"), null, "Is optional to display").addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png")))); } if (i.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod")) { flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-observationLinkPeriod"), null, "Is linked to an observation").addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-observation.png")))); } - if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation")) { - String code = ToolingExtensions.readStringExtension(i, "http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation"); + if (i.hasExtension(ToolingExtensions.EXT_Q_CHOICE_ORIENT)) { + String code = ToolingExtensions.readStringExtension(i, ToolingExtensions.EXT_Q_CHOICE_ORIENT); flags.addPiece(gen.new Piece(getSpecLink("extension-questionnaire-choiceorientation.html"), null, "Orientation: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); } - if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory")) { - CodeableConcept cc = i.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory").getValueCodeableConcept(); + if (i.hasExtension(ToolingExtensions.EXT_Q_DISPLAY_CAT)) { + CodeableConcept cc = i.getExtensionByUrl(ToolingExtensions.EXT_Q_DISPLAY_CAT).getValueCodeableConcept(); String code = cc.getCode("http://hl7.org/fhir/questionnaire-display-category"); flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-displayCategory"), null, "Category: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); } @@ -666,8 +668,8 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } } -// if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation")) { -// String code = ToolingExtensions.readStringExtension(i, "http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation"); +// if (i.hasExtension(ToolingExtensions.EXT_Q_CHOICE_ORIENT)) { +// String code = ToolingExtensions.readStringExtension(i, ToolingExtensions.EXT_Q_CHOICE_ORIENT); // flags.addPiece(gen.new Piece("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod", null, "Orientation: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); //} @@ -681,21 +683,21 @@ public class QuestionnaireRenderer extends TerminologyRenderer { hasFlag = true; flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject", "Can change the subject of the questionnaire").img(Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png"), "icon"); } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_HIDDEN)) { hasFlag = true; flags.ah(Utilities.pathURL(context.getSpecificationLink(), "extension-questionnaire-hidden.html"), "Is a hidden item").img(Utilities.path(context.getLocalPrefix(), "icon-qi-hidden.png"), "icon"); d.style("background-color: #eeeeee"); } - if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay")) { + if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_OTP_DISP)) { hasFlag = true; - flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay", "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png"), "icon"); + flags.ah(ToolingExtensions.EXT_Q_OTP_DISP, "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png"), "icon"); } if (i.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod")) { hasFlag = true; flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod", "Is linked to an observation").img(Utilities.path(context.getLocalPrefix(), "icon-qi-observation.png"), "icon"); } - if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory")) { - CodeableConcept cc = i.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory").getValueCodeableConcept(); + if (i.hasExtension(ToolingExtensions.EXT_Q_DISPLAY_CAT)) { + CodeableConcept cc = i.getExtensionByUrl(ToolingExtensions.EXT_Q_DISPLAY_CAT).getValueCodeableConcept(); String code = cc.getCode("http://hl7.org/fhir/questionnaire-display-category"); hasFlag = true; flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-displayCategory", "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png"), "icon"); @@ -958,16 +960,16 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } // appearance - if (qi.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory")) { + if (qi.hasExtension(ToolingExtensions.EXT_Q_DISPLAY_CAT)) { XhtmlNode tr = tbl.tr(); - tr.td().ah("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory").tx("Display Category"); - render(tr.td(), qi.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory").getValue()); + tr.td().ah(ToolingExtensions.EXT_Q_DISPLAY_CAT).tx("Display Category"); + render(tr.td(), qi.getExtensionByUrl(ToolingExtensions.EXT_Q_DISPLAY_CAT).getValue()); } - if (ToolingExtensions.readBoolExtension(qi, "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden")) { - defn(tbl, "Hidden Item", "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory", "This item is a hidden question", null); + if (ToolingExtensions.readBoolExtension(qi, ToolingExtensions.EXT_Q_HIDDEN)) { + defn(tbl, "Hidden Item", ToolingExtensions.EXT_Q_DISPLAY_CAT, "This item is a hidden question", null); } - if (ToolingExtensions.readBoolExtension(qi, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay")) { - defn(tbl, "Hidden Item", "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay", "This item is optional to display", null); + if (ToolingExtensions.readBoolExtension(qi, ToolingExtensions.EXT_Q_OTP_DISP)) { + defn(tbl, "Hidden Item", ToolingExtensions.EXT_Q_OTP_DISP, "This item is optional to display", null); } // formal definitions diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireResponseRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireResponseRenderer.java index 768f5573f..9384e23eb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireResponseRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/QuestionnaireResponseRenderer.java @@ -429,7 +429,7 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // } // } // -//// if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-choiceOrientation")) { +//// if (i.hasExtension(" http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-choiceOrientation")) { //// String code = ToolingExtensions.readStringExtension(i, "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-choiceOrientation"); //// flags.addPiece(gen.new Piece("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod", null, "Orientation: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); ////} @@ -457,7 +457,7 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // hasFlag = true; // flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod", "Is linked to an observation").img(Utilities.path(context.getLocalPrefix(), "icon-qi-observation.png")); // } -// if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory")) { +// if (i.hasExtension(" http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory")) { // CodeableConcept cc = i.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory").getValueCodeableConcept(); // String code = cc.getCode("http://hl7.org/fhir/QuestionnaireResponse-display-category"); // hasFlag = true; @@ -727,7 +727,7 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // } // // // appearance -// if (qi.hasExtension("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory")) { +// if (qi.hasExtension(" http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory")) { // XhtmlNode tr = tbl.tr(); // tr.td().ah("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory").tx("Display Category"); // render(tr.td(), qi.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-displayCategory").getValue()); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java index 9819f0098..5b0d1d717 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java @@ -491,8 +491,9 @@ public class GraphQLSchemaGenerator { private String getJsonFormat(StructureDefinition sd) throws FHIRException { for (ElementDefinition ed : sd.getSnapshot().getElement()) { - if (!ed.getType().isEmpty() && ed.getType().get(0).getCodeElement().hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) - return ed.getType().get(0).getCodeElement().getExtensionString("http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type"); + throw new Error("What is this code doing?"); +// if (!ed.getType().isEmpty() && ed.getType().get(0).getCodeElement().hasExtension(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) +// return ed.getType().get(0).getCodeElement().getExtensionString(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type"); } // all primitives but JSON_NUMBER_TYPES are represented as JSON strings if (JSON_NUMBER_TYPES.contains(sd.getName())) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IGHelper.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IGHelper.java index e447f7dec..923282be2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IGHelper.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/IGHelper.java @@ -36,12 +36,12 @@ import org.hl7.fhir.r5.model.ImplementationGuide.ImplementationGuideDefinitionPa public class IGHelper { - public static final String EXT_SPREADSHEET = ToolingExtensions.EXT_IGP_SPREADSHEET; - public static final String EXT_MAPPING_CSV = ToolingExtensions.EXT_IGP_MAPPING_CSV; - public static final String EXT_BUNDLE = ToolingExtensions.EXT_IGP_BUNDLE; - public static final String EXT_RESOURCE_INFO = ToolingExtensions.EXT_IGP_RESOURCE_INFO; - public static final String EXT_CONTAINED_RESOURCE_INFO = ToolingExtensions.EXT_IGP_CONTAINED_RESOURCE_INFO; - public static final String EXT_PRIVATE_BASE = ToolingExtensions.EXT_PRIVATE_BASE; +// public static final String EXT_SPREADSHEET = ToolingExtensions.EXT_IGP_SPREADSHEET; +// public static final String EXT_MAPPING_CSV = ToolingExtensions.EXT_IGP_MAPPING_CSV; +// public static final String EXT_BUNDLE = ToolingExtensions.EXT_IGP_BUNDLE; +// public static final String EXT_RESOURCE_INFO = ToolingExtensions.EXT_IGP_RESOURCE_INFO; +// public static final String EXT_CONTAINED_RESOURCE_INFO = ToolingExtensions.EXT_IGP_CONTAINED_RESOURCE_INFO; +// public static final String EXT_PRIVATE_BASE = ToolingExtensions.EXT_PRIVATE_BASE; public static String readStringParameter(ImplementationGuideDefinitionComponent ig, String name) { for (ImplementationGuideDefinitionParameterComponent p : ig.getParameter()) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java index c0dd89535..6d21e8277 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java @@ -6,19 +6,19 @@ import java.lang.reflect.Modifier; /* Copyright (c) 2011+, HL7, Inc. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to + * Neither the name of HL7 nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. @@ -29,7 +29,7 @@ import java.lang.reflect.Modifier; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + */ @@ -112,105 +112,99 @@ import org.hl7.fhir.utilities.validation.ValidationMessage.Source; public class ToolingExtensions { - // validated -// private static final String EXT_OID = "http://hl7.org/fhir/StructureDefinition/valueset-oid"; -// public static final String EXT_DEPRECATED = "http://hl7.org/fhir/StructureDefinition/codesystem-deprecated"; - public static final String EXT_DEFINITION = "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition"; - public static final String EXT_CS_COMMENT = "http://hl7.org/fhir/StructureDefinition/codesystem-concept-comments"; - public static final String EXT_VS_COMMENT = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments"; - public static final String EXT_CS_KEYWORD = "http://hl7.org/fhir/StructureDefinition/codesystem-keyWord"; - public static final String EXT_VS_KEYWORD = "http://hl7.org/fhir/StructureDefinition/valueset-keyWord"; - private static final String EXT_IDENTIFIER = "http://hl7.org/fhir/StructureDefinition/identifier"; - public static final String EXT_TRANSLATION = "http://hl7.org/fhir/StructureDefinition/translation"; - public static final String EXT_ISSUE_SOURCE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-source"; public static final String EXT_ISSUE_MSG_ID = "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id"; public static final String EXT_ISSUE_LINE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-line"; public static final String EXT_ISSUE_COL = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col"; - public static final String EXT_DISPLAY_HINT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-display-hint"; - public static final String EXT_REPLACED_BY = "http://hl7.org/fhir/StructureDefinition/valueset-replacedby"; - public static final String EXT_REGEX = "http://hl7.org/fhir/StructureDefinition/regex"; - public static final String EXT_CONTROL = "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl"; - public static final String EXT_MINOCCURS = "http://hl7.org/fhir/StructureDefinition/questionnaire-minOccurs"; - public static final String EXT_MAXOCCURS = "http://hl7.org/fhir/StructureDefinition/questionnaire-maxOccurs"; + public static final String EXT_RESOURCE_IMPLEMENTS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-implements"; public static final String EXT_ALLOWEDRESOURCE = "http://hl7.org/fhir/StructureDefinition/questionnaire-allowedResource"; - public static final String EXT_REFERENCEFILTER = "http://hl7.org/fhir/StructureDefinition/questionnaire-referenceFilter"; - public static final String EXT_CODE_GENERATION_PARENT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-codegen-super"; - public static final String EXT_HIERARCHY = "http://hl7.org/fhir/StructureDefinition/structuredefinition-hierarchy"; - public static final String EXT_BEST_PRACTICE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice"; - public static final String EXT_BEST_PRACTICE_EXPLANATION = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice-explanation"; - // unregistered? + public static final String EXT_OO_FILE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-file"; + public static final String EXT_XML_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-xml-type"; + public static final String EXT_PATTERN = "http://hl7.org/fhir/StructureDefinition/elementdefinition-pattern"; + public static final String EXT_XML_NAME = "http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"; + public static final String EXT_BINDING_STYLE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-binding-style"; + public static final String EXT_EXPLICIT_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name"; + public static final String EXT_TIME_FORMAT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-timeformat"; + + // validated + // private static final String EXT_OID = "http://hl7.org/fhir/StructureDefinition/valueset-oid"; + // public static final String EXT_DEPRECATED = "http://hl7.org/fhir/StructureDefinition/codesystem-deprecated"; + + private static final String EXT_ALLOWABLE_UNITS = "http://hl7.org/fhir/StructureDefinition/elementdefinition-allowedUnits"; + private static final String EXT_FHIRTYPE = "http://hl7.org/fhir/StructureDefinition/questionnaire-fhirType"; + public static final String EXT_ALLOWED_TYPE = "http://hl7.org/fhir/StructureDefinition/operationdefinition-allowed-type"; + public static final String EXT_BEST_PRACTICE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice"; // Y + public static final String EXT_BEST_PRACTICE_EXPLANATION = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice-explanation"; // Y + public static final String EXT_BINDING_NAME = "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName"; + public static final String EXT_CONTROL = "http://hl7.org/fhir/StructureDefinition/questionnaire-itemControl"; // Y + public static final String EXT_CS_COMMENT = "http://hl7.org/fhir/StructureDefinition/codesystem-concept-comments"; // Y + public static final String EXT_CS_KEYWORD = "http://hl7.org/fhir/StructureDefinition/codesystem-keyWord"; // Y + public static final String EXT_DEFINITION = "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition"; // Y + public static final String EXT_DISPLAY_HINT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-display-hint"; // Y + public static final String EXT_EXPAND_GROUP = "http://hl7.org/fhir/StructureDefinition/valueset-expand-group"; + public static final String EXT_EXPAND_RULES = "http://hl7.org/fhir/StructureDefinition/valueset-expand-rules"; + public static final String EXT_EXP_TOOCOSTLY = "http://hl7.org/fhir/StructureDefinition/valueset-toocostly"; + public static final String EXT_FHIR_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type"; + public static final String EXT_FMM_DERIVED = "http://hl7.org/fhir/StructureDefinition/structuredefinition-conformance-derivedFrom"; + public static final String EXT_FMM_LEVEL = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm"; + public static final String EXT_FMM_SUPPORT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm-support"; + public static final String EXT_HIERARCHY = "http://hl7.org/fhir/StructureDefinition/structuredefinition-hierarchy"; // Y + public static final String EXT_ISSUE_SOURCE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-source"; // Y + public static final String EXT_MAXOCCURS = "http://hl7.org/fhir/StructureDefinition/questionnaire-maxOccurs"; // Y + public static final String EXT_MAX_DECIMALS = "http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces"; + public static final String EXT_MAX_SIZE = "http://hl7.org/fhir/StructureDefinition/maxSize"; + public static final String EXT_MAX_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"; + public static final String EXT_MINOCCURS = "http://hl7.org/fhir/StructureDefinition/questionnaire-minOccurs"; // Y + public static final String EXT_MIN_LENGTH = "http://hl7.org/fhir/StructureDefinition/minLength"; + public static final String EXT_MIN_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-minValueSet"; + public static final String EXT_MUST_SUPPORT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-type-must-support"; + public static final String EXT_NORMATIVE_VERSION = "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version"; + public static final String EXT_PROFILE_ELEMENT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-profile-element"; + public static final String EXT_QTYPE = "http://hl7.org/fhir/StructureDefinition/questionnnaire-baseType"; + public static final String EXT_Q_UNIT = "http://hl7.org/fhir/StructureDefinition/questionnaire-unit"; + public static final String EXT_REFERENCEFILTER = "http://hl7.org/fhir/StructureDefinition/questionnaire-referenceFilter"; // Y + public static final String EXT_REGEX = "http://hl7.org/fhir/StructureDefinition/regex"; // Y + public static final String EXT_RENDERED_VALUE = "http://hl7.org/fhir/StructureDefinition/rendered-value"; + public static final String EXT_REPLACED_BY = "http://hl7.org/fhir/StructureDefinition/codesystem-replacedby"; + public static final String EXT_RESOURCE_CATEGORY = "http://hl7.org/fhir/StructureDefinition/structuredefinition-category"; + public static final String EXT_RESOURCE_INTERFACE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-interface"; + public static final String EXT_SEC_CAT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category"; + public static final String EXT_STANDARDS_STATUS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status"; + public static final String EXT_TABLE_NAME = "http://hl7.org/fhir/StructureDefinition/structuredefinition-table-name"; + public static final String EXT_TARGET_ID = "http://hl7.org/fhir/StructureDefinition/targetElement"; + public static final String EXT_TARGET_PATH = "http://hl7.org/fhir/StructureDefinition/targetPath"; + public static final String EXT_TRANSLATABLE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-translatable"; + public static final String EXT_TRANSLATION = "http://hl7.org/fhir/StructureDefinition/translation"; // Y + public static final String EXT_UNCLOSED = "http://hl7.org/fhir/StructureDefinition/valueset-unclosed"; + public static final String EXT_VALUESET_SYSTEM = "http://hl7.org/fhir/StructureDefinition/valueset-system"; + public static final String EXT_VS_COMMENT = "http://hl7.org/fhir/StructureDefinition/valueset-concept-comments"; // Y + public static final String EXT_VS_KEYWORD = "http://hl7.org/fhir/StructureDefinition/valueset-keyWord"; // Y + public static final String EXT_WORKGROUP = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg"; + public static final String EXT_XML_NAMESPACE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace"; + public static final String EXT_OLD_CONCEPTMAP_EQUIVALENCE = "http://hl7.org/fhir/1.0/StructureDefinition/extension-ConceptMap.element.target.equivalence"; + public static final String EXT_Q_IS_SUBJ = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject"; + public static final String EXT_Q_HIDDEN = "http://hl7.org/fhir/StructureDefinition/questionnaire-hidden"; + public static final String EXT_Q_OTP_DISP = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay"; + public static final String EXT_O_LINK_PERIOD = "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod"; + public static final String EXT_Q_CHOICE_ORIENT = "http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation"; + public static final String EXT_Q_DISPLAY_CAT = "http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory"; + public static final String EXT_REND_MD = "http://hl7.org/fhir/StructureDefinition/rendering-markdown"; + public static final String EXT_CAP_STMT_EXPECT = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation"; + public static final String EXT_ED_HEIRARCHY = "http://hl7.org/fhir/StructureDefinition/elementdefinition-heirarchy"; + + // in the tooling IG + public static final String EXT_BINDING_ADDITIONAL = "http://hl7.org/fhir/tools/StructureDefinition/additional-binding"; + + // unregistered? - don't know what these are used for public static final String EXT_MAPPING_PREFIX = "http://hl7.org/fhir/tools/StructureDefinition/logical-mapping-prefix"; public static final String EXT_MAPPING_SUFFIX = "http://hl7.org/fhir/tools/StructureDefinition/logical-mapping-suffix"; -// public static final String EXT_FLYOVER = "http://hl7.org/fhir/Profile/questionnaire-extensions#flyover"; - public static final String EXT_QTYPE = "http://hl7.org/fhir/StructureDefinition/questionnnaire-baseType"; -// private static final String EXT_QREF = "http://www.healthintersections.com.au/fhir/Profile/metadata#reference"; -// private static final String EXTENSION_FILTER_ONLY = "http://www.healthintersections.com.au/fhir/Profile/metadata#expandNeedsFilter"; -// private static final String EXT_TYPE = "http://www.healthintersections.com.au/fhir/Profile/metadata#type"; -// private static final String EXT_REFERENCE = "http://www.healthintersections.com.au/fhir/Profile/metadata#reference"; - private static final String EXT_FHIRTYPE = "http://hl7.org/fhir/StructureDefinition/questionnaire-fhirType"; - private static final String EXT_ALLOWABLE_UNITS = "http://hl7.org/fhir/StructureDefinition/elementdefinition-allowedUnits"; - public static final String EXT_CIMI_REFERENCE = "http://hl7.org/fhir/StructureDefinition/cimi-reference"; - public static final String EXT_UNCLOSED = "http://hl7.org/fhir/StructureDefinition/valueset-unclosed"; - public static final String EXT_FMM_LEVEL = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm"; - public static final String EXT_FMM_SUPPORT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm-support"; - public static final String EXT_FMM_DERIVED = "http://hl7.org/fhir/StructureDefinition/structuredefinition-conformance-derivedFrom"; - public static final String EXT_SEC_CAT = "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category"; - public static final String EXT_RESOURCE_CATEGORY = "http://hl7.org/fhir/StructureDefinition/structuredefinition-category"; - public static final String EXT_RESOURCE_INTERFACE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-interface"; - public static final String EXT_RESOURCE_IMPLEMENTS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-implements"; - public static final String EXT_TABLE_NAME = "http://hl7.org/fhir/StructureDefinition/structuredefinition-table-name"; - public static final String EXT_OO_FILE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-file"; - public static final String EXT_WORKGROUP = "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg"; - public static final String EXT_STANDARDS_STATUS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status"; - public static final String EXT_NORMATIVE_VERSION = "http://hl7.org/fhir/StructureDefinition/structuredefinition-normative-version"; - public static final String EXT_IGP_BASE = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-base"; - public static final String EXT_IGP_DEFNS = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-defns"; - public static final String EXT_IGP_FORMAT = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-format"; - public static final String EXT_IGP_SOURCE = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-source"; - public static final String EXT_IGP_VERSION = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-version"; - public static final String EXT_IGP_RESOURCES = "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource"; - public static final String EXT_IGP_PAGES = "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages"; - public static final String EXT_IGP_SPREADSHEET = "http://hl7.org/fhir/StructureDefinition/igpublisher-spreadsheet"; - public static final String EXT_IGP_MAPPING_CSV = "http://hl7.org/fhir/StructureDefinition/igpublisher-mapping-csv"; - public static final String EXT_IGP_BUNDLE = "http://hl7.org/fhir/StructureDefinition/igpublisher-bundle"; - public static final String EXT_IGP_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/resource-information"; - public static final String EXT_IGP_CONTAINED_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/contained-resource-information"; - public static final String EXT_IGP_LOADVERSION = "http://hl7.org/fhir/StructureDefinition/igpublisher-loadversion"; - public static final String EXT_MAX_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"; - public static final String EXT_MIN_VALUESET = "http://hl7.org/fhir/StructureDefinition/elementdefinition-minValueSet"; - public static final String EXT_PROFILE_ELEMENT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-profile-element"; - public static final String EXT_LIST_PACKAGE = "http://hl7.org/fhir/StructureDefinition/list-packageId"; + // for the v2 mapping project public static final String EXT_MAPPING_NAME = "http://hl7.org/fhir/tools/StructureDefinition/conceptmap-source-name"; public static final String EXT_MAPPING_TYPE = "http://hl7.org/fhir/tools/StructureDefinition/conceptmap-source-type"; public static final String EXT_MAPPING_CARD = "http://hl7.org/fhir/tools/StructureDefinition/conceptmap-source-cardinality"; public static final String EXT_MAPPING_TGTTYPE = "http://hl7.org/fhir/tools/StructureDefinition/conceptmap-target-type"; public static final String EXT_MAPPING_TGTCARD = "http://hl7.org/fhir/tools/StructureDefinition/conceptmap-target-cardinality"; - public static final String EXT_PRIVATE_BASE = "http://hl7.org/fhir/tools/"; - public static final String EXT_ALLOWED_TYPE = "http://hl7.org/fhir/StructureDefinition/operationdefinition-allowed-type"; - public static final String EXT_FHIR_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type"; - public static final String EXT_XML_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-xml-type"; - public static final String EXT_RENDERED_VALUE = "http://hl7.org/fhir/StructureDefinition/rendered-value"; - public static final String EXT_OLD_CONCEPTMAP_EQUIVALENCE = "http://hl7.org/fhir/1.0/StructureDefinition/extension-ConceptMap.element.target.equivalence"; - public static final String EXT_EXP_TOOCOSTLY = "http://hl7.org/fhir/StructureDefinition/valueset-toocostly"; - public static final String EXT_MUST_SUPPORT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-type-must-support"; - public static final String EXT_TRANSLATABLE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-translatable"; - public static final String EXT_PATTERN = "http://hl7.org/fhir/StructureDefinition/elementdefinition-pattern"; - public static final String EXT_BINDING_METHOD = "http://hl7.org/fhir/StructureDefinition/elementdefinition-binding-method"; - public static final String EXT_XML_NAMESPACE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-namespace"; - public static final String EXT_XML_NAME = "http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"; - public static final String EXT_BINDING_STYLE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-binding-style"; - public static final String EXT_BINARY_FORMAT = "http://hl7.org/fhir/StructureDefinition/implementationguide-resource-format"; - public static final String EXT_TARGET_ID = "http://hl7.org/fhir/StructureDefinition/targetElement"; - public static final String EXT_TARGET_PATH = "http://hl7.org/fhir/StructureDefinition/targetPath"; - public static final String EXT_VALUESET_SYSTEM = "http://hl7.org/fhir/StructureDefinition/valueset-system"; - public static final String EXT_EXPAND_RULES = "http://hl7.org/fhir/StructureDefinition/valueset-expand-rules"; - public static final String EXT_EXPAND_GROUP = "http://hl7.org/fhir/StructureDefinition/valueset-expand-group"; - public static final String EXT_BINDING_ADDITIONAL = "http://hl7.org/fhir/tools/StructureDefinition/additional-binding"; - public static final String EXT_MIN_LENGTH = "http://hl7.org/fhir/StructureDefinition/minLength"; - public static final String EXT_MAX_DECIMALS = "http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces"; - public static final String EXT_MAX_SIZE = "http://hl7.org/fhir/StructureDefinition/maxSize"; - + // specific extension helpers public static Extension makeIssueSource(Source source) { @@ -241,15 +235,15 @@ public class ToolingExtensions { return getExtension(e, url) != null; } -// public static void addStringExtension(DomainResource dr, String url, String content) { -// if (!StringUtils.isBlank(content)) { -// Extension ex = getExtension(dr, url); -// if (ex != null) -// ex.setValue(new StringType(content)); -// else -// dr.getExtension().add(Factory.newExtension(url, new StringType(content), true)); -// } -// } + // public static void addStringExtension(DomainResource dr, String url, String content) { + // if (!StringUtils.isBlank(content)) { + // Extension ex = getExtension(dr, url); + // if (ex != null) + // ex.setValue(new StringType(content)); + // else + // dr.getExtension().add(Factory.newExtension(url, new StringType(content), true)); + // } + // } public static void addMarkdownExtension(DomainResource dr, String url, String content) { if (!StringUtils.isBlank(content)) { @@ -338,10 +332,10 @@ public class ToolingExtensions { nc.getExtension().add(Factory.newExtension(EXT_CS_COMMENT, Factory.newString_(comment), true)); } -// public static void markDeprecated(Element nc) { -// setDeprecated(nc); -// } -// + // public static void markDeprecated(Element nc) { + // setDeprecated(nc); + // } + // public static void addDefinition(Element nc, String definition) { if (!StringUtils.isBlank(definition)) @@ -477,37 +471,37 @@ public class ToolingExtensions { public static String getCSComment(ConceptDefinitionComponent c) { return readStringExtension(c, EXT_CS_COMMENT); } -// -// public static Boolean getDeprecated(Element c) { -// return readBooleanExtension(c, EXT_DEPRECATED); -// } + // + // public static Boolean getDeprecated(Element c) { + // return readBooleanExtension(c, EXT_DEPRECATED); + // } public static boolean hasCSComment(ConceptDefinitionComponent c) { return findStringExtension(c, EXT_CS_COMMENT); } -// public static boolean hasDeprecated(Element c) { -// return findBooleanExtension(c, EXT_DEPRECATED); -// } + // public static boolean hasDeprecated(Element c) { + // return findBooleanExtension(c, EXT_DEPRECATED); + // } public static void addFlyOver(QuestionnaireItemComponent item, String text, String linkId){ if (!StringUtils.isBlank(text)) { - QuestionnaireItemComponent display = item.addItem(); - display.setType(QuestionnaireItemType.DISPLAY); - display.setText(text); - display.setLinkId(linkId); - display.getExtension().add(Factory.newExtension(EXT_CONTROL, Factory.newCodeableConcept("flyover", "http://hl7.org/fhir/questionnaire-item-control", "Fly-over"), true)); + QuestionnaireItemComponent display = item.addItem(); + display.setType(QuestionnaireItemType.DISPLAY); + display.setText(text); + display.setLinkId(linkId); + display.getExtension().add(Factory.newExtension(EXT_CONTROL, Factory.newCodeableConcept("flyover", "http://hl7.org/fhir/questionnaire-item-control", "Fly-over"), true)); } } public static void addMin(QuestionnaireItemComponent item, int min) { item.getExtension().add(Factory.newExtension(EXT_MINOCCURS, Factory.newInteger(min), true)); } - + public static void addMax(QuestionnaireItemComponent item, int max) { item.getExtension().add(Factory.newExtension(EXT_MAXOCCURS, Factory.newInteger(max), true)); } - + public static void addFhirType(QuestionnaireItemComponent group, String value) { group.getExtension().add(Factory.newExtension(EXT_FHIRTYPE, Factory.newString_(value), true)); } @@ -524,9 +518,9 @@ public class ToolingExtensions { group.getExtension().add(Factory.newExtension(EXT_REFERENCEFILTER, Factory.newString_(value), true)); } - public static void addIdentifier(Element element, Identifier value) { - element.getExtension().add(Factory.newExtension(EXT_IDENTIFIER, value, true)); - } + // public static void addIdentifier(Element element, Identifier value) { + // element.getExtension().add(Factory.newExtension(EXT_IDENTIFIER, value, true)); + // } /** * @param name the identity of the extension of interest @@ -559,7 +553,7 @@ public class ToolingExtensions { public static void setStringExtension(DomainResource resource, String uri, String value) { if (Utilities.noString(value)) return; - Extension ext = getExtension(resource, uri); + Extension ext = getExtension(resource, uri); if (ext != null) ext.setValue(new StringType(value)); else @@ -569,7 +563,7 @@ public class ToolingExtensions { public static void setStringExtension(Element resource, String uri, String value) { if (Utilities.noString(value)) return; - Extension ext = getExtension(resource, uri); + Extension ext = getExtension(resource, uri); if (ext != null) ext.setValue(new StringType(value)); else @@ -579,7 +573,7 @@ public class ToolingExtensions { public static void setCodeExtension(DomainResource resource, String uri, String value) { if (Utilities.noString(value)) return; - + Extension ext = getExtension(resource, uri); if (ext != null) ext.setValue(new CodeType(value)); @@ -590,7 +584,7 @@ public class ToolingExtensions { public static void setCodeExtension(Element element, String uri, String value) { if (Utilities.noString(value)) return; - + Extension ext = getExtension(element, uri); if (ext != null) ext.setValue(new CodeType(value)); @@ -606,34 +600,34 @@ public class ToolingExtensions { resource.getExtension().add(new Extension(uri).setValue(new IntegerType(value))); } -// public static String getOID(CodeSystem define) { -// return readStringExtension(define, EXT_OID); -// } -// -// public static String getOID(ValueSet vs) { -// return readStringExtension(vs, EXT_OID); -// } -// -// public static void setOID(CodeSystem define, String oid) throws FHIRFormatError, URISyntaxException { -// if (!oid.startsWith("urn:oid:")) -// throw new FHIRFormatError("Error in OID format"); -// if (oid.startsWith("urn:oid:urn:oid:")) -// throw new FHIRFormatError("Error in OID format"); -// if (!hasExtension(define, EXT_OID)) -// define.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); -// else if (!oid.equals(readStringExtension(define, EXT_OID))) -// throw new Error("Attempt to assign multiple OIDs to a code system"); -// } -// public static void setOID(ValueSet vs, String oid) throws FHIRFormatError, URISyntaxException { -// if (!oid.startsWith("urn:oid:")) -// throw new FHIRFormatError("Error in OID format"); -// if (oid.startsWith("urn:oid:urn:oid:")) -// throw new FHIRFormatError("Error in OID format"); -// if (!hasExtension(vs, EXT_OID)) -// vs.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); -// else if (!oid.equals(readStringExtension(vs, EXT_OID))) -// throw new Error("Attempt to assign multiple OIDs to value set "+vs.getName()+" ("+vs.getUrl()+"). Has "+readStringExtension(vs, EXT_OID)+", trying to add "+oid); -// } + // public static String getOID(CodeSystem define) { + // return readStringExtension(define, EXT_OID); + // } + // + // public static String getOID(ValueSet vs) { + // return readStringExtension(vs, EXT_OID); + // } + // + // public static void setOID(CodeSystem define, String oid) throws FHIRFormatError, URISyntaxException { + // if (!oid.startsWith("urn:oid:")) + // throw new FHIRFormatError("Error in OID format"); + // if (oid.startsWith("urn:oid:urn:oid:")) + // throw new FHIRFormatError("Error in OID format"); + // if (!hasExtension(define, EXT_OID)) + // define.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); + // else if (!oid.equals(readStringExtension(define, EXT_OID))) + // throw new Error("Attempt to assign multiple OIDs to a code system"); + // } + // public static void setOID(ValueSet vs, String oid) throws FHIRFormatError, URISyntaxException { + // if (!oid.startsWith("urn:oid:")) + // throw new FHIRFormatError("Error in OID format"); + // if (oid.startsWith("urn:oid:urn:oid:")) + // throw new FHIRFormatError("Error in OID format"); + // if (!hasExtension(vs, EXT_OID)) + // vs.getExtension().add(Factory.newExtension(EXT_OID, Factory.newUri(oid), false)); + // else if (!oid.equals(readStringExtension(vs, EXT_OID))) + // throw new Error("Attempt to assign multiple OIDs to value set "+vs.getName()+" ("+vs.getUrl()+"). Has "+readStringExtension(vs, EXT_OID)+", trying to add "+oid); + // } public static boolean hasLanguageTranslation(Element element, String lang) { for (Extension e : element.getExtension()) { @@ -664,7 +658,7 @@ public class ToolingExtensions { public static void addLanguageTranslation(Element element, String lang, String value) { if (Utilities.noString(lang) || Utilities.noString(value)) return; - + Extension extension = new Extension().setUrl(EXT_TRANSLATION); extension.addExtension().setUrl("lang").setValue(new CodeType(lang)); extension.addExtension().setUrl("content").setValue(new StringType(value)); @@ -703,23 +697,23 @@ public class ToolingExtensions { return results; } -// public static void addDEReference(DataElement de, String value) { -// for (Extension e : de.getExtension()) -// if (e.getUrl().equals(EXT_CIMI_REFERENCE)) { -// e.setValue(new UriType(value)); -// return; -// } -// de.getExtension().add(new Extension().setUrl(EXT_CIMI_REFERENCE).setValue(new UriType(value))); -// } + // public static void addDEReference(DataElement de, String value) { + // for (Extension e : de.getExtension()) + // if (e.getUrl().equals(EXT_CIMI_REFERENCE)) { + // e.setValue(new UriType(value)); + // return; + // } + // de.getExtension().add(new Extension().setUrl(EXT_CIMI_REFERENCE).setValue(new UriType(value))); + // } -// public static void setDeprecated(Element nc) { -// for (Extension e : nc.getExtension()) -// if (e.getUrl().equals(EXT_DEPRECATED)) { -// e.setValue(new BooleanType(true)); -// return; -// } -// nc.getExtension().add(new Extension().setUrl(EXT_DEPRECATED).setValue(new BooleanType(true))); -// } + // public static void setDeprecated(Element nc) { + // for (Extension e : nc.getExtension()) + // if (e.getUrl().equals(EXT_DEPRECATED)) { + // e.setValue(new BooleanType(true)); + // return; + // } + // nc.getExtension().add(new Extension().setUrl(EXT_DEPRECATED).setValue(new BooleanType(true))); + // } public static void setExtension(Element focus, String url, Coding c) { for (Extension e : focus.getExtension()) @@ -739,7 +733,7 @@ public class ToolingExtensions { } } } - + public static void removeExtension(Element focus, String url) { Iterator i = focus.getExtension().iterator(); while (i.hasNext()) { @@ -876,7 +870,7 @@ public class ToolingExtensions { return readStringExtension(type, EXT_RENDERED_VALUE); return type.primitiveValue(); } - + public static String getPresentation(Element holder, PrimitiveType type) { if (holder.hasExtension(EXT_RENDERED_VALUE)) return readStringExtension(holder, EXT_RENDERED_VALUE); @@ -884,15 +878,15 @@ public class ToolingExtensions { return readStringExtension(type, EXT_RENDERED_VALUE); return type.primitiveValue(); } - -// public static boolean hasOID(ValueSet vs) { -// return hasExtension(vs, EXT_OID); -// } -// -// public static boolean hasOID(CodeSystem cs) { -// return hasExtension(cs, EXT_OID); -// } -// + + // public static boolean hasOID(ValueSet vs) { + // return hasExtension(vs, EXT_OID); + // } + // + // public static boolean hasOID(CodeSystem cs) { + // return hasExtension(cs, EXT_OID); + // } + // public static void addUrlExtension(Element e, String url, String content) { if (!StringUtils.isBlank(content)) { Extension ex = getExtension(e, url); @@ -938,7 +932,7 @@ public class ToolingExtensions { } } } - + for (Property p : base.children() ) { for (Base v : p.getValues()) { if (usesExtension(url, v)) { @@ -965,5 +959,5 @@ public class ToolingExtensions { } - + } \ No newline at end of file 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 b6cbf4cb7..5ec35c983 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 @@ -1111,8 +1111,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESET, describeValueSet(binding.getValueSet())); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESETMAX, describeReference(ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")), valueset.getUrl()); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESETMAX, describeReference(ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET)), valueset.getUrl()); else warning(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESET_EXT, describeValueSet(binding.getValueSet())); } @@ -1141,7 +1141,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (!vr.isOk()) { bindingsOk = false; if (vr.getErrorClass() != null && vr.getErrorClass() == TerminologyServiceErrorClass.NOSERVICE) { - if (binding.getStrength() == BindingStrength.REQUIRED || (binding.getStrength() == BindingStrength.EXTENSIBLE && binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"))) { + if (binding.getStrength() == BindingStrength.REQUIRED || (binding.getStrength() == BindingStrength.EXTENSIBLE && binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET))) { hint(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOSVC_BOUND_REQ, describeReference(binding.getValueSet())); } else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { hint(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOSVC_BOUND_EXT, describeReference(binding.getValueSet())); @@ -1150,8 +1150,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) txWarning(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_1_CC, describeReference(binding.getValueSet()), vr.getErrorClass().toString()); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), cc, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), cc, stack); else if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_2_CC, describeReference(binding.getValueSet()), vr.getErrorClass().toString()); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1163,8 +1163,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) { txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_1_CC, describeValueSet(binding.getValueSet()), ccSummary(cc)); } else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), cc, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), cc, stack); if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_2_CC, describeValueSet(binding.getValueSet()), ccSummary(cc)); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1243,8 +1243,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, "No code provided, and a code is required from the value set " + describeReference(binding.getValueSet()) + " (" + valueset.getUrl()); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESETMAX, describeReference(ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")), valueset.getUrl()); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + rule(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESETMAX, describeReference(ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET)), valueset.getUrl()); else warning(errors, IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CODE_VALUESET_EXT, describeValueSet(binding.getValueSet())); } @@ -1277,8 +1277,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) txWarning(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_1_CC, describeReference(binding.getValueSet()), vr.getErrorClass().toString()); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), cc, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), cc, stack); else if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_2_CC, describeReference(binding.getValueSet()), vr.getErrorClass().toString()); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1290,8 +1290,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_1_CC, describeValueSet(binding.getValueSet()), ccSummary(cc)); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), cc, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), cc, stack); if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_2_CC, describeValueSet(binding.getValueSet()), ccSummary(cc)); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1385,8 +1385,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) txWarning(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_4a, describeReference(binding.getValueSet(), valueset), vr.getMessage(), system+"#"+code); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), c, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), c, stack); else if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_5, describeReference(binding.getValueSet(), valueset)); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1397,8 +1397,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } else if (binding.getStrength() == BindingStrength.REQUIRED) txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_4, describeReference(binding.getValueSet(), valueset), (vr.getMessage() != null ? " (error message = " + vr.getMessage() + ")" : ""), system+"#"+code); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), c, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), c, stack); else txWarning(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_5, describeReference(binding.getValueSet(), valueset), (vr.getMessage() != null ? " (error message = " + vr.getMessage() + ")" : ""), system+"#"+code); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1643,8 +1643,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat if (binding.getStrength() == BindingStrength.REQUIRED) txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_4a, describeReference(binding.getValueSet(), valueset), vr.getMessage(), theSystem+"#"+theCode); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), c, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), c, stack); else if (!noExtensibleWarnings) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_CONFIRM_5, describeReference(binding.getValueSet(), valueset)); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -1655,8 +1655,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } else if (binding.getStrength() == BindingStrength.REQUIRED) txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_12, describeReference(binding.getValueSet(), valueset), getErrorMessage(vr.getMessage()), theSystem+"#"+theCode); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), c, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), c, stack); else if (!noExtensibleWarnings) { txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_13, describeReference(binding.getValueSet(), valueset), getErrorMessage(vr.getMessage()), c.getSystem()+"#"+c.getCode()); } @@ -2243,9 +2243,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat warning(errors, IssueType.INVALID, e.line(), e.col(), path, wsok, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_BASE64_NO_WS_WARNING); } } - if (ok && context.hasExtension("http://hl7.org/fhir/StructureDefinition/maxSize")) { + if (ok && context.hasExtension(ToolingExtensions.EXT_MAX_SIZE)) { int size = countBase64DecodedBytes(encoded); - long def = Long.parseLong(ToolingExtensions.readStringExtension(context, "http://hl7.org/fhir/StructureDefinition/maxSize")); + long def = Long.parseLong(ToolingExtensions.readStringExtension(context, ToolingExtensions.EXT_MAX_SIZE)); rule(errors, IssueType.STRUCTURE, e.line(), e.col(), path, size <= def, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_BASE64_TOO_LONG, size, def); } @@ -2289,9 +2289,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } } } - if (context.hasExtension("http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces")) { + if (context.hasExtension(ToolingExtensions.EXT_MAX_DECIMALS)) { int dp = e.primitiveValue().contains(".") ? e.primitiveValue().substring(e.primitiveValue().indexOf(".")+1).length() : 0; - int def = Integer.parseInt(ToolingExtensions.readStringExtension(context, "http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces")); + int def = Integer.parseInt(ToolingExtensions.readStringExtension(context, ToolingExtensions.EXT_MAX_DECIMALS)); rule(errors, IssueType.STRUCTURE, e.line(), e.col(), path, dp <= def, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_CHARS, dp, def); } } @@ -2731,8 +2731,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat else if (binding.getStrength() == BindingStrength.REQUIRED) txRule(errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_16, value, describeValueSet(binding.getValueSet()), getErrorMessage(vr.getMessage())); else if (binding.getStrength() == BindingStrength.EXTENSIBLE) { - if (binding.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet")) - checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, "http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet"), value, stack); + if (binding.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) + checkMaxValueSet(errors, path, element, profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MAX_VALUESET), value, stack); else if (!noExtensibleWarnings && !isOkExtension(value, vs)) txWarningForLaterRemoval(element, errors, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, I18nConstants.TERMINOLOGY_TX_NOVALID_17, value, describeValueSet(binding.getValueSet()), getErrorMessage(vr.getMessage())); } else if (binding.getStrength() == BindingStrength.PREFERRED) { @@ -2771,9 +2771,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat // todo: allowedUnits http://hl7.org/fhir/StructureDefinition/elementdefinition-allowedUnits - codeableConcept, or canonical(ValueSet) // todo: http://hl7.org/fhir/StructureDefinition/iso21090-PQ-translation - if (!Utilities.noString(value) && definition.hasExtension("http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces")) { + if (!Utilities.noString(value) && definition.hasExtension(ToolingExtensions.EXT_MAX_DECIMALS)) { int dp = value.contains(".") ? value.substring(value.indexOf(".")+1).length() : 0; - int def = Integer.parseInt(ToolingExtensions.readStringExtension(definition, "http://hl7.org/fhir/StructureDefinition/maxDecimalPlaces")); + int def = Integer.parseInt(ToolingExtensions.readStringExtension(definition, ToolingExtensions.EXT_MAX_DECIMALS)); rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, dp <= def, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_DECIMAL_CHARS, dp, def); } @@ -2911,7 +2911,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } } else if (element.hasChild("url")) { String url = element.getChildValue("url"); - if (definition.hasExtension("http://hl7.org/fhir/StructureDefinition/maxSize")) { + if (definition.hasExtension(ToolingExtensions.EXT_MAX_SIZE)) { try { if (url.startsWith("http://") || url.startsWith("https://")) { if (fetcher == null) { @@ -2930,9 +2930,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } } } - if (definition.hasExtension("http://hl7.org/fhir/StructureDefinition/maxSize")) { + if (definition.hasExtension(ToolingExtensions.EXT_MAX_SIZE)) { if (warning(errors, IssueType.STRUCTURE, element.line(), element.col(), path, size >= 0, fetchError)) { - long def = Long.parseLong(ToolingExtensions.readStringExtension(definition, "http://hl7.org/fhir/StructureDefinition/maxSize")); + long def = Long.parseLong(ToolingExtensions.readStringExtension(definition, ToolingExtensions.EXT_MAX_SIZE)); rule(errors, IssueType.STRUCTURE, element.line(), element.col(), path, size <= def, I18nConstants.TYPE_SPECIFIC_CHECKS_DT_ATT_TOO_LONG, size, def); } } @@ -5693,8 +5693,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } msg = context.formatMessage(I18nConstants.INV_FAILED, inv.getKey() + ": '" + inv.getHuman()+"'")+msg; - if (inv.hasExtension("http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice") && - ToolingExtensions.readBooleanExtension(inv, "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice")) { + if (inv.hasExtension(ToolingExtensions.EXT_BEST_PRACTICE) && + ToolingExtensions.readBooleanExtension(inv, ToolingExtensions.EXT_BEST_PRACTICE)) { if (bpWarnings == BestPracticeWarningLevel.Hint) hint(errors, IssueType.INVARIANT, element.line(), element.col(), path, ok, msg); else if (bpWarnings == BestPracticeWarningLevel.Warning) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/MeasureValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/MeasureValidator.java index a47484a14..b85cf50a0 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/MeasureValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/MeasureValidator.java @@ -26,6 +26,7 @@ import org.hl7.fhir.r5.model.Measure.MeasureGroupPopulationComponent; import org.hl7.fhir.r5.model.Measure.MeasureGroupStratifierComponent; import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.renderers.DataRenderer; +import org.hl7.fhir.r5.utils.ToolingExtensions; import org.hl7.fhir.r5.utils.XVerExtensionManager; import org.hl7.fhir.utilities.FhirPublication; import org.hl7.fhir.utilities.Utilities; @@ -338,7 +339,7 @@ public class MeasureValidator extends BaseValidator { // ratio - score is a number with no value constraints, and maybe with a unit (perhaps constrained by extension) if (rule(errors, IssueType.REQUIRED, ms.line(), ms.col(), ns.getLiteralPath(), v != null, I18nConstants.MEASURE_MR_SCORE_VALUE_REQUIRED, "ratio")) { Element unit = ms.getNamedChild("code"); - Coding c = m.measure().hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-unit") ? (Coding) m.measure().getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-unit").getValue() : null; + Coding c = m.measure().hasExtension(ToolingExtensions.EXT_Q_UNIT) ? (Coding) m.measure().getExtensionByUrl(ToolingExtensions.EXT_Q_UNIT).getValue() : null; if (unit != null) { if (c != null) { NodeStack nsc = ns.push(unit, -1, unit.getProperty().getDefinition(), unit.getProperty().getDefinition()); @@ -361,7 +362,7 @@ public class MeasureValidator extends BaseValidator { // continuous-variable - score is a quantity with a unit per the extension if (rule(errors, IssueType.REQUIRED, ms.line(), ms.col(), ns.getLiteralPath(), v != null, I18nConstants.MEASURE_MR_SCORE_VALUE_REQUIRED, "continuous-variable")) { Element unit = ms.getNamedChild("code"); - Coding c = m.measure().hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-unit") ? (Coding) m.measure().getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-unit").getValue() : null; + Coding c = m.measure().hasExtension(ToolingExtensions.EXT_Q_UNIT) ? (Coding) m.measure().getExtensionByUrl(ToolingExtensions.EXT_Q_UNIT).getValue() : null; if (unit != null) { if (c != null) { NodeStack nsc = ns.push(unit, -1, unit.getProperty().getDefinition(), unit.getProperty().getDefinition()); diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java index 7efe2fc26..cda40a05e 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java @@ -140,9 +140,10 @@ public class StructureDefinitionValidator extends BaseValidator { tc = type.getExtensionValue(ToolingExtensions.EXT_FHIR_TYPE).primitiveValue(); } if (Utilities.noString(tc) && type.hasChild("code")) { - if (type.getNamedChild("code").hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) { - tc = "*"; - } + throw new Error("WTF?"); +// if (type.getNamedChild("code").hasExtension(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) { +// tc = "*"; +// } } typeCodes.add(tc); Set tcharacteristics = new HashSet<>(); @@ -338,7 +339,7 @@ public class StructureDefinitionValidator extends BaseValidator { } StructureDefinition sd = context.fetchTypeDefinition(tc); if (sd != null) { - if (sd.hasExtension(ToolingExtensions.EXT_BINDING_METHOD)) { + if (sd.hasExtension(ToolingExtensions.EXT_BINDING_STYLE)) { return tc; } } From 1f7fff8d9d84dc70131a13d5ff4374fad89a0413 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Mon, 19 Sep 2022 14:54:36 +0200 Subject: [PATCH 23/49] Show display name of concepts which are not mapped --- .../main/java/org/hl7/fhir/r5/renderers/ConceptMapRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f6a2a1f5d..74e9c6c80 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 @@ -246,7 +246,7 @@ public class ConceptMapRenderer extends TerminologyRenderer { td.addText(ccl.getCode()); else td.addText(grp.getSource()+" / "+ccl.getCode()); - display = getDisplayForConcept(systemFromCanonical(grp.getSource()), versionFromCanonical(grp.getSource()), ccl.getCode()); + display = ccl.hasDisplay() ? ccl.getDisplay() : getDisplayForConcept(systemFromCanonical(grp.getSource()), versionFromCanonical(grp.getSource()), ccl.getCode()); tr.td().style("border-left-width: 0px").tx(display == null ? "" : display); tr.td().colspan("4").style("background-color: #efefef").tx("(not mapped)"); From ba56fc1a89611c40a0382f57f6314500a1e914aa Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:47:21 -0400 Subject: [PATCH 24/49] upgrade package visitor to visit all packages --- .../convertors/analytics/PackageVisitor.java | 125 +++++++++++++++--- .../analytics/SearchParameterAnalysis.java | 3 +- 2 files changed, 106 insertions(+), 22 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java index 8cb1407e2..ad445ccf2 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java @@ -2,16 +2,20 @@ package org.hl7.fhir.convertors.analytics; import java.io.IOException; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.parsers.ParserConfigurationException; import org.hl7.fhir.exceptions.FHIRException; +import org.hl7.fhir.r5.utils.EOperationOutcome; import org.hl7.fhir.utilities.SimpleHTTPClient; import org.hl7.fhir.utilities.SimpleHTTPClient.HTTPResult; import org.hl7.fhir.utilities.TextFile; +import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.json.JsonTrackingParser; import org.hl7.fhir.utilities.json.JsonUtilities; import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager; @@ -24,18 +28,21 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; public class PackageVisitor { public interface IPackageVisitorProcessor { - public void processResource(String pid, String version, String type, byte[] content) throws FHIRException; + public void processResource(String pid, NpmPackage npm, String version, String type, String id, byte[] content) throws FHIRException, IOException, EOperationOutcome; } private List resourceTypes = new ArrayList<>(); private List versions = new ArrayList<>(); private boolean corePackages; private boolean oldVersions; + private boolean current; private IPackageVisitorProcessor processor; private FilesystemPackageCacheManager pcm; private PackageClient pc; @@ -57,7 +64,13 @@ public class PackageVisitor { } + public boolean isCurrent() { + return current; + } + public void setCurrent(boolean current) { + this.current = current; + } public boolean isCorePackages() { return corePackages; @@ -99,20 +112,72 @@ public class PackageVisitor { System.out.println("Finding packages"); pc = new PackageClient(PackageClient.PRIMARY_SERVER); pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION); + + Map cpidMap = getAllCIPackages(); + Set cpidSet = new HashSet<>(); + System.out.println("Go: "+cpidMap.size()+" current packages"); + for (String s : cpidMap.keySet()) { + processCurrentPackage(s, cpidMap.get(s), cpidSet); + } Set pidList = getAllPackages(); - System.out.println("Go: "+pidList.size()+" packages"); - for (String pid : pidList) { - List vList = listVersions(pid); - if (oldVersions) { - for (String v : vList) { - processPackage(pid, v); + System.out.println("Go: "+pidList.size()+" published packages"); + for (String pid : pidList) { + if (!cpidSet.contains(pid)) { + List vList = listVersions(pid); + if (oldVersions) { + for (String v : vList) { + processPackage(pid, v); + } + } else if (vList.isEmpty()) { + System.out.println("No Packages for "+pid); + } else { + processPackage(pid, vList.get(vList.size() - 1)); } - } else if (vList.isEmpty()) { - System.out.println("No Packages for "+pid); - } else { - processPackage(pid, vList.get(vList.size() - 1)); } - } + } + } + + private void processCurrentPackage(String url, String pid, Set cpidSet) { + try { + String[] p = url.split("\\/"); + String repo = "https://build.fhir.org/ig/"+p[0]+"/"+p[1]; + NpmPackage npm = NpmPackage.fromUrl(repo+"/package.tgz"); + String fv = npm.fhirVersion(); + cpidSet.add(pid); + + if (corePackages || !corePackage(npm)) { + int c = 0; + if (fv != null && (versions.isEmpty() || versions.contains(fv))) { + for (String type : resourceTypes) { + for (String s : npm.listResources(type)) { + c++; + try { + processor.processResource(pid+"#current", npm, fv, type, s, TextFile.streamToBytes(npm.load("package", s))); + } catch (Exception e) { + System.out.println("####### Error loading "+pid+"#current["+fv+"]/"+type+" ####### "+e.getMessage()); + e.printStackTrace(); + } + } + } + } + System.out.println("Processed: "+pid+"#current: "+c+" resources"); + } + } catch (Exception e) { + System.out.println("Unable to process: "+pid+"#current: "+e.getMessage()); + } + } + + private Map getAllCIPackages() throws IOException { + Map res = new HashMap<>(); + if (current) { + JsonArray json = JsonTrackingParser.fetchJsonArray("https://build.fhir.org/ig/qas.json"); + for (JsonElement j : json) { + JsonObject o = (JsonObject) j; + String url = JsonUtilities.str(o, "repo"); + res.put(url, JsonUtilities.str(o, "package-id")); + } + } + return res; } private List listVersions(String pid) throws IOException { @@ -172,16 +237,34 @@ public class PackageVisitor { } catch (Throwable e) { System.out.println("Unable to process: "+pid+"#"+v+": "+e.getMessage()); } - int c = 0; - if (fv != null && (versions.isEmpty() || versions.contains(fv))) { - for (String type : resourceTypes) { - for (String s : npm.listResources(type)) { - c++; - processor.processResource(pid+"#"+v, fv, type, TextFile.streamToBytes(npm.load("package", s))); + if (corePackages || !corePackage(npm)) { + int c = 0; + if (fv != null && (versions.isEmpty() || versions.contains(fv))) { + for (String type : resourceTypes) { + for (String s : npm.listResources(type)) { + c++; + try { + processor.processResource(pid+"#"+v, npm, fv, type, s, TextFile.streamToBytes(npm.load("package", s))); + } catch (Exception e) { + System.out.println("####### Error loading "+pid+"#"+v +"["+fv+"]/"+type+" ####### "+e.getMessage()); + e.printStackTrace(); + } + } } - } - } - System.out.println("Processed: "+pid+"#"+v+": "+c+" resources"); + } + System.out.println("Processed: "+pid+"#"+v+": "+c+" resources"); + } + } + + private boolean corePackage(NpmPackage npm) { + return npm != null && !Utilities.noString(npm.name()) && ( + npm.name().startsWith("hl7.terminology") || + npm.name().startsWith("hl7.fhir.r2.") || + npm.name().startsWith("hl7.fhir.r2b.") || + npm.name().startsWith("hl7.fhir.r3.") || + npm.name().startsWith("hl7.fhir.r4.") || + npm.name().startsWith("hl7.fhir.r4b.") || + npm.name().startsWith("hl7.fhir.r5.")); } } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/SearchParameterAnalysis.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/SearchParameterAnalysis.java index c01fa50ba..d74b4d66c 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/SearchParameterAnalysis.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/SearchParameterAnalysis.java @@ -16,6 +16,7 @@ import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.VersionUtilities; +import org.hl7.fhir.utilities.npm.NpmPackage; import org.xml.sax.SAXException; public class SearchParameterAnalysis implements IPackageVisitorProcessor { @@ -97,7 +98,7 @@ public class SearchParameterAnalysis implements IPackageVisitorProcessor { private Map versions = new HashMap(); @Override - public void processResource(String pid, String version, String type, byte[] content) throws FHIRException { + public void processResource(String pid, NpmPackage npm, String version, String type, String id, byte[] content) throws FHIRException { // System.out.println("v"+version+" "+type+" from "+pid); boolean core = pid.startsWith("hl7.fhir.r") && (pid.contains(".core") || pid.contains(".examples")); version = VersionUtilities.getMajMin(version); From e044bf66077670ad741c3c7eaa3904c71391f24c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:47:41 -0400 Subject: [PATCH 25/49] bug fixes from loading all published packages --- .../resources14_50/OperationDefinition14_50.java | 10 +++++++++- .../resources30_50/CapabilityStatement30_50.java | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/resources14_50/OperationDefinition14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/resources14_50/OperationDefinition14_50.java index 28ce4edb3..0ad42990a 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/resources14_50/OperationDefinition14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/resources14_50/OperationDefinition14_50.java @@ -224,7 +224,7 @@ public class OperationDefinition14_50 { if (src.hasDocumentation()) tgt.setDocumentationElement(String14_50.convertStringToMarkdown(src.getDocumentationElement())); if (src.hasType()) - tgt.setType(Enumerations.FHIRTypes.fromCode(src.getType())); + tgt.setType(Enumerations.FHIRTypes.fromCode(fixTypeCode(src.getType()))); if (src.hasSearchType()) tgt.setSearchTypeElement(Enumerations14_50.convertSearchParamType(src.getSearchTypeElement())); tgt.addTargetProfile(src.getProfile().getReference()); @@ -235,6 +235,14 @@ public class OperationDefinition14_50 { return tgt; } + private static String fixTypeCode(String type) { + if ("Type".equals(type)) { + return "DataType"; + } else { + return type; + } + } + static public org.hl7.fhir.dstu2016may.model.Enumeration convertOperationKind(org.hl7.fhir.r5.model.Enumeration src) throws FHIRException { if (src == null || src.isEmpty()) return null; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/CapabilityStatement30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/CapabilityStatement30_50.java index 966d6dd86..dea8bd622 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/CapabilityStatement30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/CapabilityStatement30_50.java @@ -61,7 +61,7 @@ public class CapabilityStatement30_50 { if (src.hasImplementation()) tgt.setImplementation(convertCapabilityStatementImplementationComponent(src.getImplementation())); if (src.hasFhirVersion()) - tgt.setFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); + tgt.setFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(fixCode(src.getFhirVersion()))); if (src.hasAcceptUnknown()) tgt.addExtension().setUrl("http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown").setValue(new org.hl7.fhir.r5.model.CodeType(src.getAcceptUnknownElement().asStringValue())); for (org.hl7.fhir.dstu3.model.CodeType t : src.getFormat()) tgt.addFormat(t.getValue()); @@ -78,6 +78,14 @@ public class CapabilityStatement30_50 { return tgt; } + private static String fixCode(String v) { + if ("STU3".equals(v)) { + return "3.0.2"; + } else { + return v; + } + } + public static org.hl7.fhir.dstu3.model.CapabilityStatement convertCapabilityStatement(org.hl7.fhir.r5.model.CapabilityStatement src) throws FHIRException { if (src == null) return null; From 7f74b4521a6b56bdb888bc2100e6d303b36f3411 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:47:59 -0400 Subject: [PATCH 26/49] allow rendering additional information in a comparison --- .../hl7/fhir/r5/comparison/ComparisonRenderer.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java index 59344bac9..bfeff3609 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/comparison/ComparisonRenderer.java @@ -45,6 +45,7 @@ public class ComparisonRenderer implements IEvaluationContext { private ComparisonSession session; private Map templates = new HashMap<>(); private String folder; + private String preamble; public ComparisonRenderer(IWorkerContext contextLeft, IWorkerContext contextRight, String folder, ComparisonSession session) { super(); @@ -53,6 +54,14 @@ public class ComparisonRenderer implements IEvaluationContext { this.folder = folder; this.session = session; } + + public String getPreamble() { + return preamble; + } + + public void setPreamble(String preamble) { + this.preamble = preamble; + } public Map getTemplates() { return templates; @@ -61,6 +70,9 @@ public class ComparisonRenderer implements IEvaluationContext { public File render(String leftName, String rightName) throws IOException { dumpBinaries(); StringBuilder b = new StringBuilder(); + if (preamble != null) { + b.append(preamble); + } b.append("\r\n"); b.append(" \r\n"); b.append(" \r\n"); From b5d828b0dc3e7ac3cf1ece90a0e30cdf140987e8 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:48:56 -0400 Subject: [PATCH 27/49] suppress debug messaging if instructed and control lazy loading --- .../fhir/r5/conformance/ProfileUtilities.java | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index 50e4f7585..b85af20fe 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -408,6 +408,13 @@ public class ProfileUtilities extends TranslatingUtilities { public interface ProfileKnowledgeProvider { class BindingResolution { + public BindingResolution(String display, String url) { + this.display = display; + this.url = url; + } + public BindingResolution() { + // TODO Auto-generated constructor stub + } public String display; public String url; } @@ -735,14 +742,16 @@ public class ProfileUtilities extends TranslatingUtilities { } if (!Utilities.noString(b.toString())) { String msg = "The profile "+derived.getUrl()+" has "+ce+" "+Utilities.pluralize("element", ce)+" in the differential ("+b.toString()+") that don't have a matching element in the snapshot: check that the path and definitions are legal in the differential (including order)"; - System.out.println("Error in snapshot generation: "+msg); - if (!debug) { - System.out.println("Differential: "); - for (ElementDefinition ed : derived.getDifferential().getElement()) - System.out.println(" "+ed.getId()+" = "+ed.getPath()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed)); - System.out.println("Snapshot: "); - for (ElementDefinition ed : derived.getSnapshot().getElement()) - System.out.println(" "+ed.getId()+" = "+ed.getPath()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed)); + if (debug) { + System.out.println("Error in snapshot generation: "+msg); + if (!debug) { + System.out.println("Differential: "); + for (ElementDefinition ed : derived.getDifferential().getElement()) + System.out.println(" "+ed.getId()+" = "+ed.getPath()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed)); + System.out.println("Snapshot: "); + for (ElementDefinition ed : derived.getSnapshot().getElement()) + System.out.println(" "+ed.getId()+" = "+ed.getPath()+" : "+typeSummaryWithProfile(ed)+"["+ed.getMin()+".."+ed.getMax()+"]"+sliceSummary(ed)+" "+constraintSummary(ed)); + } } if (exception) throw new DefinitionException(msg); @@ -2507,8 +2516,12 @@ public class ProfileUtilities extends TranslatingUtilities { generateSnapshot(context.fetchTypeDefinition("Extension"), sd, sd.getUrl(), webUrl, sd.getName()); } } - if (sd == null) - System.out.println("Failed to find referenced profile: " + type.getProfile()); + if (sd == null) { + if (debug) { + System.out.println("Failed to find referenced profile: " + type.getProfile()); + } + } + } if (sd == null) sd = context.fetchTypeDefinition(type.getWorkingCode()); @@ -6694,8 +6707,9 @@ public class ProfileUtilities extends TranslatingUtilities { } - public void setNewSlicingProcessing(boolean newSlicingProcessing) { + public ProfileUtilities setNewSlicingProcessing(boolean newSlicingProcessing) { this.newSlicingProcessing = newSlicingProcessing; + return this; } From 460d12ee92949e95ede37c23733002af6fdde78f Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:49:06 -0400 Subject: [PATCH 28/49] control lazy loading --- .../fhir/r5/context/SimpleWorkerContext.java | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java index e58817c14..922380c89 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java @@ -29,8 +29,6 @@ package org.hl7.fhir.r5.context; */ - - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -146,6 +144,8 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon private final List loadedPackages = new ArrayList<>(); private boolean canNoTS; private XVerExtensionManager xverManager; + private boolean allowLazyLoading = true; + private boolean suppressDebugMessages; private SimpleWorkerContext() throws IOException, FHIRException { super(); @@ -476,7 +476,7 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon if ((types == null || types.length == 0) && loader != null) { types = loader.getTypes(); } - if (VersionUtilities.isR2Ver(pi.fhirVersion()) || !pi.canLazyLoad()) { + if (VersionUtilities.isR2Ver(pi.fhirVersion()) || !pi.canLazyLoad() || !allowLazyLoading) { // can't lazy load R2 because of valueset/codesystem implementation if (types.length == 0) { types = new String[] { "StructureDefinition", "ValueSet", "SearchParameter", "OperationDefinition", "Questionnaire", "ConceptMap", "StructureMap", "NamingSystem" }; @@ -680,9 +680,11 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon generateSnapshot(sd); // new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path("[tmp]", "snapshot", tail(sd.getUrl())+".xml")), sd); } catch (Exception e) { - System.out.println("Unable to generate snapshot for "+tail(sd.getUrl()) +" from "+tail(sd.getBaseDefinition())+" because "+e.getMessage()); - if (true) { - e.printStackTrace(); + if (!suppressDebugMessages) { + System.out.println("Unable to generate snapshot for "+tail(sd.getUrl()) +" from "+tail(sd.getBaseDefinition())+" because "+e.getMessage()); + if (true) { + e.printStackTrace(); + } } } result.add(sd); @@ -780,7 +782,9 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon generateSnapshot(p); } catch (Exception e) { // not sure what to do in this case? - System.out.println("Unable to generate snapshot for "+uri+": "+e.getMessage()); + if (!suppressDebugMessages) { + System.out.println("Unable to generate snapshot for "+uri+": "+e.getMessage()); + } } } return r; @@ -911,5 +915,22 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon return null; } + public boolean isAllowLazyLoading() { + return allowLazyLoading; + } + + public void setAllowLazyLoading(boolean allowLazyLoading) { + this.allowLazyLoading = allowLazyLoading; + } + + public boolean isSuppressDebugMessages() { + return suppressDebugMessages; + } + + public void setSuppressDebugMessages(boolean suppressDebugMessages) { + this.suppressDebugMessages = suppressDebugMessages; + } + + } From b3ae8d69e8b40f22bca27396634fe1c7b4567909 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:49:18 -0400 Subject: [PATCH 29/49] fix NPE --- org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java index c7f140781..02bc8b13b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Base.java @@ -61,7 +61,7 @@ private Map userData; if (userData == null) return false; else - return userData.containsKey(name); + return userData.containsKey(name) && (userData.get(name) != null); } public String getUserString(String name) { From 049d8a1197638f4b0425fbd7d69b5e8084b81b0e Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:49:32 -0400 Subject: [PATCH 30/49] fix bad HTML rendering SearchParameter --- .../org/hl7/fhir/r5/renderers/SearchParameterRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/SearchParameterRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/SearchParameterRenderer.java index 8ccd2dd38..dce7c2024 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/SearchParameterRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/SearchParameterRenderer.java @@ -118,7 +118,8 @@ public class SearchParameterRenderer extends TerminologyRenderer { if (spd.hasModifier()) { tr = tbl.tr(); tr.td().tx("Modifiers"); - td = tr.td().tx("Allowed: "); + td = tr.td(); + td.tx("Allowed: "); for (Enumeration t : spd.getModifier()) { td.sep(", "); td.tx(t.asStringValue()); @@ -127,7 +128,8 @@ public class SearchParameterRenderer extends TerminologyRenderer { if (spd.hasChain()) { tr = tbl.tr(); tr.td().tx("Chains"); - td = tr.td().tx("Allowed: "); + td = tr.td(); + td.tx("Allowed: "); for (StringType t : spd.getChain()) { td.sep(", "); td.tx(t.asStringValue()); From eca93b0a76625893e29c835b37aa3a8effc4b8cd Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:50:07 -0400 Subject: [PATCH 31/49] Fix NPE rendering terminology resources --- .../hl7/fhir/r5/renderers/TerminologyRenderer.java | 10 ++++++++-- .../org/hl7/fhir/r5/renderers/ValueSetRenderer.java | 2 +- .../hl7/fhir/r5/renderers/utils/RenderingContext.java | 11 ++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java index c8b2302ef..ad114701f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/TerminologyRenderer.java @@ -34,6 +34,9 @@ import org.hl7.fhir.utilities.xhtml.XhtmlNode; public abstract class TerminologyRenderer extends ResourceRenderer { + private static final boolean DEBUG = false; + + public TerminologyRenderer(RenderingContext context) { super(context); } @@ -309,8 +312,11 @@ public abstract class TerminologyRenderer extends ResourceRenderer { a.tx("SNOMED-CT"); } else { - if (value.startsWith("http://hl7.org") && !Utilities.existsInList(value, "http://hl7.org/fhir/sid/icd-10-us")) - System.out.println("Unable to resolve value set "+value); + if (value.startsWith("http://hl7.org") && !Utilities.existsInList(value, "http://hl7.org/fhir/sid/icd-10-us")) { + if (DEBUG) { + System.out.println("Unable to resolve value set "+value); + } + } li.addText(value); } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java index 01a6a812e..7333c0175 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java @@ -1292,7 +1292,7 @@ public class ValueSetRenderer extends TerminologyRenderer { for (ConceptReferenceComponent cc : inc.getConcept()) { String code = cc.getCode(); ConceptDefinitionComponent v = null; - if (e != null) { + if (e != null && code != null) { v = getConceptForCode(e.getConcept(), code); } if (v == null && vse != null) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java index 370e4a2ad..ab59b006d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/utils/RenderingContext.java @@ -134,6 +134,7 @@ public class RenderingContext { private DateTimeFormatter dateYearFormat; private DateTimeFormatter dateYearMonthFormat; private boolean copyButton; + private ProfileKnowledgeProvider pkp; /** * @@ -194,6 +195,7 @@ public class RenderingContext { res.locale = locale; res.showComments = showComments; res.copyButton = copyButton; + res.pkp = pkp; res.terminologyServiceOptions = terminologyServiceOptions.copy(); return res; @@ -210,7 +212,7 @@ public class RenderingContext { public ProfileUtilities getProfileUtilities() { if (profileUtilitiesR == null) { - profileUtilitiesR = new ProfileUtilities(worker, null, null); + profileUtilitiesR = new ProfileUtilities(worker, null, pkp); } return profileUtilitiesR; } @@ -608,5 +610,12 @@ public class RenderingContext { return this; } + public void setPkp(ProfileKnowledgeProvider pkp) { + this.pkp = pkp; + } + public ProfileKnowledgeProvider getPkp() { + return pkp; + } + } \ No newline at end of file From cfa5d39bdba373933a0739766b24ac4064a2b702 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:51:00 -0400 Subject: [PATCH 32/49] reorg extensions (clean up) --- .../fhir/r5/utils/GraphQLSchemaGenerator.java | 5 +-- .../hl7/fhir/r5/utils/ToolingExtensions.java | 16 +++++++ .../utilities/json/JsonTrackingParser.java | 43 ++++++++++++++++--- 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java index 5b0d1d717..a637231dd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java @@ -491,9 +491,8 @@ public class GraphQLSchemaGenerator { private String getJsonFormat(StructureDefinition sd) throws FHIRException { for (ElementDefinition ed : sd.getSnapshot().getElement()) { - throw new Error("What is this code doing?"); -// if (!ed.getType().isEmpty() && ed.getType().get(0).getCodeElement().hasExtension(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) -// return ed.getType().get(0).getCodeElement().getExtensionString(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type"); + if (!ed.getType().isEmpty() && ed.getType().get(0).getCodeElement().hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) + return ed.getType().get(0).getCodeElement().getExtensionString(" http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type"); } // all primitives but JSON_NUMBER_TYPES are represented as JSON strings if (JSON_NUMBER_TYPES.contains(sd.getName())) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java index 6d21e8277..2a40bd170 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java @@ -125,6 +125,22 @@ public class ToolingExtensions { public static final String EXT_EXPLICIT_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name"; public static final String EXT_TIME_FORMAT = "http://hl7.org/fhir/StructureDefinition/elementdefinition-timeformat"; + public static final String EXT_IGP_RESOURCES = "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-resource"; + public static final String EXT_IGP_PAGES = "http://hl7.org/fhir/StructureDefinition/igpublisher-folder-pages"; + public static final String EXT_IGP_SPREADSHEET = "http://hl7.org/fhir/StructureDefinition/igpublisher-spreadsheet"; + public static final String EXT_IGP_MAPPING_CSV = "http://hl7.org/fhir/StructureDefinition/igpublisher-mapping-csv"; + public static final String EXT_IGP_BUNDLE = "http://hl7.org/fhir/StructureDefinition/igpublisher-bundle"; + public static final String EXT_IGP_BASE = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-base"; + public static final String EXT_IGP_DEFNS = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-defns"; + public static final String EXT_IGP_FORMAT = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-format"; + public static final String EXT_IGP_SOURCE = "http://hl7.org/fhir/StructureDefinition/igpublisher-res-source"; + public static final String EXT_IGP_CONTAINED_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/contained-resource-information"; + public static final String EXT_PRIVATE_BASE = "http://hl7.org/fhir/tools/"; + public static final String EXT_BINARY_FORMAT = "http://hl7.org/fhir/StructureDefinition/implementationguide-resource-format"; + public static final String EXT_IGP_RESOURCE_INFO = "http://hl7.org/fhir/tools/StructureDefinition/resource-information"; + public static final String EXT_IGP_LOADVERSION = "http://hl7.org/fhir/StructureDefinition/igpublisher-loadversion"; + public static final String EXT_LIST_PACKAGE = "http://hl7.org/fhir/StructureDefinition/list-packageId"; + // validated // private static final String EXT_OID = "http://hl7.org/fhir/StructureDefinition/valueset-oid"; // public static final String EXT_DEPRECATED = "http://hl7.org/fhir/StructureDefinition/codesystem-deprecated"; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java index b37965b2c..47e5e27a8 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonTrackingParser.java @@ -1,5 +1,7 @@ package org.hl7.fhir.utilities.json; +import static org.junit.jupiter.api.DynamicContainer.dynamicContainer; + import java.io.File; /* @@ -375,6 +377,10 @@ public class JsonTrackingParser { return parse(TextFile.bytesToString(stream), null); } + public static JsonArray parseJsonArray(byte[] stream) throws IOException { + return parseArray(TextFile.bytesToString(stream), null); + } + public static JsonObject parseJson(byte[] stream, boolean allowDuplicates) throws IOException { return parse(TextFile.bytesToString(stream), null, allowDuplicates); } @@ -391,17 +397,34 @@ public class JsonTrackingParser { return parse(source, map, false); } + public static JsonArray parseArray(String source, Map map) throws IOException { + return parseArray(source, map, false); + } + + public static JsonObject parse(String source, Map map, boolean allowDuplicates) throws IOException { return parse(source, map, allowDuplicates, false); } + public static JsonArray parseArray(String source, Map map, boolean allowDuplicates) throws IOException { + return parseArray(source, map, allowDuplicates, false); + } + public static JsonObject parse(String source, Map map, boolean allowDuplicates, boolean allowComments) throws IOException { - JsonTrackingParser self = new JsonTrackingParser(); - self.map = map; - self.setErrorOnDuplicates(!allowDuplicates); - self.setAllowComments(allowComments); + JsonTrackingParser self = new JsonTrackingParser(); + self.map = map; + self.setErrorOnDuplicates(!allowDuplicates); + self.setAllowComments(allowComments); return self.parse(Utilities.stripBOM(source)); - } + } + + public static JsonArray parseArray(String source, Map map, boolean allowDuplicates, boolean allowComments) throws IOException { + JsonTrackingParser self = new JsonTrackingParser(); + self.map = map; + self.setErrorOnDuplicates(!allowDuplicates); + self.setAllowComments(allowComments); + return self.parseArray(Utilities.stripBOM(source)); + } private JsonObject parse(String source) throws IOException { lexer = new Lexer(source); @@ -421,6 +444,10 @@ public class JsonTrackingParser { return result; } + private JsonArray parseArray(String source) throws IOException { + return new Gson().fromJson(source, JsonArray.class); + } + private void readObject(JsonObject obj, boolean root) throws IOException { if (map != null) map.put(obj, lexer.location.copy()); @@ -703,5 +730,11 @@ public class JsonTrackingParser { return parseJson(res.getContent()); } + public static JsonArray fetchJsonArray(String source) throws IOException { + SimpleHTTPClient fetcher = new SimpleHTTPClient(); + HTTPResult res = fetcher.get(source+"?nocache=" + System.currentTimeMillis()); + res.checkThrowException(); + return parseJsonArray(res.getContent()); + } } \ No newline at end of file From 689b9a57b1b5097368b11f5b7a057cc7f72ec51b Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:52:01 -0400 Subject: [PATCH 33/49] check ShareableValueSet and shareableCodeSystem profiles for publishing resources --- .../utils/validation/IResourceValidator.java | 3 ++ .../fhir/utilities/i18n/I18nConstants.java | 4 +++ .../src/main/resources/Messages.properties | 4 +++ .../hl7/fhir/validation/BaseValidator.java | 5 ++- .../instance/InstanceValidator.java | 12 ++++++- .../instance/type/CodeSystemValidator.java | 35 ++++++++++++++++++- .../instance/type/ValueSetValidator.java | 24 +++++++++++++ 7 files changed, 84 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/validation/IResourceValidator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/validation/IResourceValidator.java index 8a31ee2b8..493fe1b87 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/validation/IResourceValidator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/validation/IResourceValidator.java @@ -99,6 +99,9 @@ public interface IResourceValidator { boolean isNoUnicodeBiDiControlChars(); void setNoUnicodeBiDiControlChars(boolean noUnicodeBiDiControlChars); + boolean isForPublication(); + void setForPublication(boolean forPublication); + /** * Whether being unable to resolve a profile in found in Resource.meta.profile or ElementDefinition.type.profile or targetProfile is an error or just a warning */ diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java index 47e2db330..cdc88e647 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java @@ -627,6 +627,10 @@ public class I18nConstants { public static final String VALUESET_NO_SYSTEM_WARNING = "VALUESET_NO_SYSTEM_WARNING"; public static final String VALUESET_REFERENCE_INVALID_TYPE = "VALUESET_REFERENCE_INVALID_TYPE"; public static final String VALUESET_REFERENCE_UNKNOWN = "VALUESET_REFERENCE_UNKNOWN"; + public static final String VALUESET_SHAREABLE_MISSING = "VALUESET_SHAREABLE_MISSING"; + public static final String VALUESET_SHAREABLE_MISSING_HL7 = "VALUESET_SHAREABLE_MISSING_HL7"; + public static final String VALUESET_SHAREABLE_EXTRA_MISSING_HL7 = "VALUESET_SHAREABLE_EXTRA_MISSING_HL7"; + public static final String VALUESET_SHAREABLE_EXTRA_MISSING = "VALUESET_SHAREABLE_EXTRA_MISSING"; public static final String VALUESET_UNC_SYSTEM_WARNING = "VALUESET_UNC_SYSTEM_WARNING"; public static final String VALUESET_UNC_SYSTEM_WARNING_VER = "VALUESET_UNC_SYSTEM_WARNING_VER"; public static final String VALUESET_IMPORT_UNION_INTERSECTION = "VALUESET_IMPORT_UNION_INTERSECTION"; diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index 8a982a760..a5f6ebd8f 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -722,3 +722,7 @@ BUNDLE_BUNDLE_POSSIBLE_MATCH_NO_FU = Entry {0} matches the reference {1} by type BUNDLE_BUNDLE_POSSIBLE_MATCH_WRONG_FU = Entry {0} matches the reference {1} by type and id but it''s fullUrl {2} does not match the full target URL {3} by Bundle resolution rules SD_ILLEGAL_CHARACTERISTICS = This element has a {0} but the types {1} to do not make this kind of constraint relevant SD_VALUE_COMPLEX_FIXED = For the complex type {0}, consider using a pattern rather than a fixed value to avoid over-constraining the instance +VALUESET_SHAREABLE_MISSING = The ShareableValueSet profile says that the {0} element is mandatory, but it is not present. Published value sets SHOULD conform to the ShareableValueSet profile +VALUESET_SHAREABLE_EXTRA_MISSING = The ShareableValueSet profile recommends that the {0} element is populated, but it is not present. Published value sets SHOULD conform to the ShareableValueSet profile +VALUESET_SHAREABLE_MISSING_HL7 = The ShareableValueSet profile says that the {0} element is mandatory, but it is not found. HL7 Published value sets SHALL conform to the ShareableValueSet profile +VALUESET_SHAREABLE_EXTRA_MISSING_HL7 = The ShareableValueSet profile recommends that the {0} element is populated, but it is not found. HL7 Published value sets SHALL conform to the ShareableValueSet profile diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java index 3bd9c0626..500cc7566 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java @@ -1152,5 +1152,8 @@ public class BaseValidator implements IValidationContextResourceLoader { return level; } - + protected boolean isHL7(Element cr) { + String url = cr.getChildValue("url"); + return url != null && url.contains("hl7"); + } } \ No newline at end of file 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 5ec35c983..01dadebef 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 @@ -426,6 +426,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat private ValidationOptions baseOptions = new ValidationOptions(); private Map crLookups = new HashMap<>(); private boolean logProgress; + private boolean forPublication; public InstanceValidator(IWorkerContext theContext, IEvaluationContext hostServices, XVerExtensionManager xverManager) { super(theContext, xverManager); @@ -4643,7 +4644,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } else if (element.getType().equals("CapabilityStatement")) { validateCapabilityStatement(errors, element, stack); } else if (element.getType().equals("CodeSystem")) { - new CodeSystemValidator(context, timeTracker, xverManager, jurisdiction).validateCodeSystem(errors, element, stack, baseOptions.setLanguage(stack.getWorkingLang())); + new CodeSystemValidator(context, timeTracker, this, xverManager, jurisdiction).validateCodeSystem(errors, element, stack, baseOptions.setLanguage(stack.getWorkingLang())); } else if (element.getType().equals("SearchParameter")) { new SearchParameterValidator(context, timeTracker, fpe, xverManager, jurisdiction).validateSearchParameter(errors, element, stack); } else if (element.getType().equals("StructureDefinition")) { @@ -6041,4 +6042,13 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat this.logProgress = logProgress; } + public boolean isForPublication() { + return forPublication; + } + + public void setForPublication(boolean forPublication) { + this.forPublication = forPublication; + } + + } \ No newline at end of file diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java index 4f653bca8..b482b84ec 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java @@ -17,17 +17,21 @@ import org.hl7.fhir.utilities.validation.ValidationMessage.Source; import org.hl7.fhir.utilities.validation.ValidationOptions; import org.hl7.fhir.validation.BaseValidator; import org.hl7.fhir.validation.TimeTracker; +import org.hl7.fhir.validation.instance.InstanceValidator; import org.hl7.fhir.validation.instance.utils.NodeStack; import ca.uhn.fhir.validation.ValidationResult; public class CodeSystemValidator extends BaseValidator { - public CodeSystemValidator(IWorkerContext context, TimeTracker timeTracker, XVerExtensionManager xverManager, Coding jurisdiction) { + private InstanceValidator parent; + + public CodeSystemValidator(IWorkerContext context, TimeTracker timeTracker, InstanceValidator parent, XVerExtensionManager xverManager, Coding jurisdiction) { super(context, xverManager); source = Source.InstanceValidator; this.timeTracker = timeTracker; this.jurisdiction = jurisdiction; + this.parent = parent; } @@ -79,8 +83,37 @@ public class CodeSystemValidator extends BaseValidator { } } } + + checkShareableCodeSystem(errors, cs, stack); } + + private void checkShareableCodeSystem(List errors, Element cs, NodeStack stack) { + if (parent.isForPublication()) { + if (isHL7(cs)) { + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "url"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "version"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "title"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING_HL7, "name"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "status"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "experimental"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "description"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "caseSensitive"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "content"); + } else { + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING, "url"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING, "version"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING, "title"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING, "name"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING, "status"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING, "experimental"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING, "description"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING, "caseSensitive"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING, "content"); + } + } + } + private void metaChecks(List errors, Element cs, NodeStack stack, String url, String content, String caseSensitive, String hierarchyMeaning, boolean isSupplement) { if (isSupplement) { if (!"supplement".equals(content)) { diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java index 4ecdb159e..39ce917eb 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java @@ -61,8 +61,32 @@ public class ValueSetValidator extends BaseValidator { cc++; } } + checkShareableValueSet(errors, vs, stack); } + private void checkShareableValueSet(List errors, Element vs, NodeStack stack) { + if (parent.isForPublication()) { + if (isHL7(vs)) { + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "url"); + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "version"); + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "title"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING_HL7, "name"); + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "status"); + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "experimental"); + rule(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "description"); + } else { + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING, "url"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING, "version"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING, "title"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING, "name"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING, "status"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING, "experimental"); + warning(errors, IssueType.REQUIRED, vs.line(), vs.col(), stack.getLiteralPath(), vs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING, "description"); + } + } + } + + private void validateValueSetCompose(List errors, Element compose, NodeStack stack, String vsid, boolean retired) { List includes = compose.getChildrenByName("include"); int ci = 0; From 72b3d2f6d170ca31b11e0f7c53cdf444ca9e19f4 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 04:52:20 -0400 Subject: [PATCH 34/49] escape bare html entities --- .../main/java/org/hl7/fhir/utilities/MarkDownProcessor.java | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/MarkDownProcessor.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/MarkDownProcessor.java index eb6bb9a3e..279ab2be9 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/MarkDownProcessor.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/MarkDownProcessor.java @@ -73,7 +73,7 @@ public class MarkDownProcessor { Set extensions = Collections.singleton(TablesExtension.create()); Parser parser = Parser.builder().extensions(extensions).build(); Node document = parser.parse(source); - HtmlRenderer renderer = HtmlRenderer.builder().extensions(extensions).build(); + HtmlRenderer renderer = HtmlRenderer.builder().escapeHtml(true).extensions(extensions).build(); String html = renderer.render(document); html = html.replace("
"+Utilities.escapeXml(leftName)+"
", "
"); return html; diff --git a/pom.xml b/pom.xml index 4df335777..530e52137 100644 --- a/pom.xml +++ b/pom.xml @@ -111,12 +111,12 @@ com.atlassian.commonmark commonmark - 0.12.1 + 0.17.0 com.atlassian.commonmark commonmark-ext-gfm-tables - 0.12.1 + 0.17.0 com.github.rjeschke From b387b6c268ff0e7da457a27934d7ea6b8db633e3 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 06:33:46 -0400 Subject: [PATCH 35/49] Improve conceptmap rendering --- .../fhir/r5/renderers/ConceptMapRenderer.java | 76 +++++++++++-------- 1 file changed, 43 insertions(+), 33 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 74e9c6c80..a6f7d211e 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 @@ -87,6 +87,7 @@ public class ConceptMapRenderer extends TerminologyRenderer { addMarkdown(x, cm.getDescription()); x.br(); + int gc = 0; CodeSystem cs = getContext().getWorker().fetchCodeSystem("http://hl7.org/fhir/concept-map-relationship"); if (cs == null) @@ -106,7 +107,7 @@ public class ConceptMapRenderer extends TerminologyRenderer { sources.get("code").add(grp.getSource()); targets.get("code").add(grp.getTarget()); for (SourceElementComponent ccl : grp.getElement()) { - ok = ok && ccl.getTarget().size() == 1 && ccl.getTarget().get(0).getDependsOn().isEmpty() && ccl.getTarget().get(0).getProduct().isEmpty(); + ok = ok && (ccl.getNoMap() || (ccl.getTarget().size() == 1 && ccl.getTarget().get(0).getDependsOn().isEmpty() && ccl.getTarget().get(0).getProduct().isEmpty())); for (TargetElementComponent ccm : ccl.getTarget()) { comment = comment || !Utilities.noString(ccm.getComment()); for (OtherElementComponent d : ccm.getDependsOn()) { @@ -122,6 +123,25 @@ public class ConceptMapRenderer extends TerminologyRenderer { } } + gc++; + if (gc > 1) { + x.hr(); + } + XhtmlNode pp = x.para(); + pp.b().tx("Group "+gc); + pp.tx("Mapping from "); + if (grp.hasSource()) { + renderCanonical(cm, pp, grp.getSource()); + } else { + pp.code("unspecified code system"); + } + pp.tx(" to "); + if (grp.hasTarget()) { + renderCanonical(cm, pp, grp.getTarget()); + } else { + pp.code("unspecified code system"); + } + String display; if (ok) { // simple @@ -132,45 +152,35 @@ public class ConceptMapRenderer extends TerminologyRenderer { tr.td().b().tx("Target Code"); if (comment) tr.td().b().tx("Comment"); - tr = tbl.tr(); - XhtmlNode td = tr.td().colspan(comment ? "4" : "3"); - td.tx("Mapping from "); - if (grp.hasSource()) { - renderCanonical(cm, td, grp.getSource()); - } else { - td.code("unspecified code system"); - } - td.tx(" to "); - if (grp.hasTarget()) { - renderCanonical(cm, td, grp.getTarget()); - } else { - td.code("unspecified code system"); - } for (SourceElementComponent ccl : grp.getElement()) { tr = tbl.tr(); - td = tr.td(); + XhtmlNode td = tr.td(); td.addText(ccl.getCode()); display = ccl.hasDisplay() ? ccl.getDisplay() : getDisplayForConcept(systemFromCanonical(grp.getSource()), versionFromCanonical(grp.getSource()), ccl.getCode()); if (display != null && !isSameCodeAndDisplay(ccl.getCode(), display)) td.tx(" ("+display+")"); - TargetElementComponent ccm = ccl.getTarget().get(0); - if (!ccm.hasRelationship()) - tr.td().tx(":"+"("+ConceptMapRelationship.EQUIVALENT.toCode()+")"); - 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, code).tx(presentEquivalenceCode(code)); - } else { - tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode(), ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); + if (ccl.getNoMap()) { + tr.td().colspan(comment ? "3" : "2").style("background-color: #efefef").tx("(not mapped)"); + } else { + TargetElementComponent ccm = ccl.getTarget().get(0); + if (!ccm.hasRelationship()) + tr.td().tx(":"+"("+ConceptMapRelationship.EQUIVALENT.toCode()+")"); + 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, code).tx(presentEquivalenceCode(code)); + } else { + tr.td().ah(eqpath+"#"+ccm.getRelationship().toCode(), ccm.getRelationship().toCode()).tx(presentRelationshipCode(ccm.getRelationship().toCode())); + } } + td = tr.td(); + td.addText(ccm.getCode()); + display = ccm.hasDisplay() ? ccm.getDisplay() : getDisplayForConcept(systemFromCanonical(grp.getTarget()), versionFromCanonical(grp.getTarget()), ccm.getCode()); + if (display != null && !isSameCodeAndDisplay(ccm.getCode(), display)) + td.tx(" ("+display+")"); + if (comment) + tr.td().addText(ccm.getComment()); } - td = tr.td(); - td.addText(ccm.getCode()); - display = ccm.hasDisplay() ? ccm.getDisplay() : getDisplayForConcept(systemFromCanonical(grp.getTarget()), versionFromCanonical(grp.getTarget()), ccm.getCode()); - if (display != null && !isSameCodeAndDisplay(ccm.getCode(), display)) - td.tx(" ("+display+")"); - if (comment) - tr.td().addText(ccm.getComment()); addUnmapped(tbl, grp); } } else { @@ -398,7 +408,7 @@ public class ConceptMapRenderer extends TerminologyRenderer { if (span2) { td.colspan("2"); } - td.b().tx("Code"); + td.b().tx("Codes"); td.tx(" from "); if (cs == null) td.tx(url); From 88d6ed6b93f31314db5f1519a8e03e28ceb99857 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 06:50:40 -0400 Subject: [PATCH 36/49] update tests dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 530e52137..a9b055285 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.111 + 1.1.112-SNAPSHOT 5.7.1 1.8.2 3.0.0-M5 From 204157c1ec02d7b1c8fe811bd0ba2bf740cc3f74 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 08:29:45 -0400 Subject: [PATCH 37/49] update validator rules for supplements --- .../src/main/java/org/hl7/fhir/utilities/Utilities.java | 4 ++++ .../validation/instance/type/CodeSystemValidator.java | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java index 343490142..1ef878654 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java @@ -252,6 +252,10 @@ public class Utilities { return new Inflector().camelCase(value.trim().replace(" ", "_"), false); } + public static String upperCamelCase(String value) { + return new Inflector().upperCamelCase(value.trim().replace(" ", "_")); + } + public static String escapeXml(String doco) { if (doco == null) return ""; diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java index b482b84ec..3cb045afe 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java @@ -98,8 +98,10 @@ public class CodeSystemValidator extends BaseValidator { rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "status"); rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "experimental"); rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "description"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "caseSensitive"); rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "content"); + if (!"supplement".equals(cs.getChildValue("content"))) { + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "caseSensitive"); + } } else { warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING, "url"); warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING, "version"); @@ -108,8 +110,10 @@ public class CodeSystemValidator extends BaseValidator { warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING, "status"); warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING, "experimental"); warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING, "description"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING, "caseSensitive"); warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING, "content"); + if (!"supplement".equals(cs.getChildValue("content"))) { + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING, "caseSensitive"); + } } } } From 7846ae51691a2534e3f6e11611f03de97516c189 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 20 Sep 2022 11:42:07 -0400 Subject: [PATCH 38/49] support for -forPublication parameter to validator --- RELEASE_NOTES.md | 9 +++++++-- .../org/hl7/fhir/validation/ValidationEngine.java | 2 ++ .../hl7/fhir/validation/cli/model/CliContext.java | 15 ++++++++++++++- .../cli/services/ValidationService.java | 1 + .../org/hl7/fhir/validation/cli/utils/Params.java | 3 +++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..5f74b703e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,12 @@ ## Validator Changes -* no changes +* Validator support for -forPublication parameter ## Other code changes -* no changes \ No newline at end of file +* Improved ConceptMap rendering +* Internal reorganization of extensions +* Fix NPE rendering terminology resources +* Fix bad HTML rendering SearchParameter +* Allow rendering additional information in a comparison +* bug fixes from loading all published packages ever diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java index a8e4b5a24..33c051671 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidationEngine.java @@ -156,6 +156,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP @Getter @Setter private boolean noUnicodeBiDiControlChars; @Getter @Setter private boolean securityChecks; @Getter @Setter private boolean crumbTrails; + @Getter @Setter private boolean forPublication; @Getter @Setter private boolean allowExampleUrls; @Getter @Setter private boolean showMessagesFromReferences; @Getter @Setter private boolean doImplicitFHIRPathStringConversion; @@ -614,6 +615,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP validator.setNoExtensibleWarnings(noExtensibleBindingMessages); validator.setSecurityChecks(securityChecks); validator.setCrumbTrails(crumbTrails); + validator.setForPublication(forPublication); validator.setAllowExamples(allowExampleUrls); validator.setShowMessagesFromReferences(showMessagesFromReferences); validator.getContext().setLocale(locale); diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java index 49630d9bd..ec5df3e11 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/model/CliContext.java @@ -97,6 +97,9 @@ public class CliContext { @JsonProperty("crumbTrails") private boolean crumbTrails = false; + @JsonProperty("forPublication") + private boolean forPublication = false; + @JsonProperty("allowExampleUrls") private boolean allowExampleUrls = false; @@ -548,6 +551,14 @@ public class CliContext { this.crumbTrails = crumbTrails; } + public boolean isForPublication() { + return forPublication; + } + + public void setForPublication(boolean forPublication) { + this.forPublication = forPublication; + } + public boolean isAllowExampleUrls() { return allowExampleUrls; } @@ -623,6 +634,7 @@ public class CliContext { Objects.equals(profiles, that.profiles) && Objects.equals(sources, that.sources) && Objects.equals(crumbTrails, that.crumbTrails) && + Objects.equals(forPublication, that.forPublication) && Objects.equals(allowExampleUrls, that.allowExampleUrls) && Objects.equals(showTimes, that.showTimes) && mode == that.mode && @@ -636,7 +648,7 @@ public class CliContext { public int hashCode() { return Objects.hash(doNative, extensions, hintAboutNonMustSupport, recursive, doDebug, assumeValidRestReferences, canDoNative, noInternalCaching, noExtensibleBindingMessages, noInvariants, wantInvariantsInMessages, map, output, htmlOutput, txServer, sv, txLog, txCache, mapLog, lang, fhirpath, snomedCT, - targetVer, igs, questionnaireMode, level, profiles, sources, mode, locale, locations, crumbTrails, showTimes, allowExampleUrls, outputStyle, jurisdiction, noUnicodeBiDiControlChars); + targetVer, igs, questionnaireMode, level, profiles, sources, mode, locale, locations, crumbTrails, forPublication, showTimes, allowExampleUrls, outputStyle, jurisdiction, noUnicodeBiDiControlChars); } @Override @@ -674,6 +686,7 @@ public class CliContext { ", mode=" + mode + ", securityChecks=" + securityChecks + ", crumbTrails=" + crumbTrails + + ", forPublication=" + forPublication + ", outputStyle=" + outputStyle + ", jurisdiction=" + jurisdiction + ", allowExampleUrls=" + allowExampleUrls + diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java index 104e65abe..457bd4b35 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/services/ValidationService.java @@ -378,6 +378,7 @@ public class ValidationService { validator.setWantInvariantInMessage(cliContext.isWantInvariantsInMessages()); validator.setSecurityChecks(cliContext.isSecurityChecks()); validator.setCrumbTrails(cliContext.isCrumbTrails()); + validator.setForPublication(cliContext.isForPublication()); validator.setShowTimes(cliContext.isShowTimes()); validator.setAllowExampleUrls(cliContext.isAllowExampleUrls()); StandAloneValidatorFetcher fetcher = new StandAloneValidatorFetcher(validator.getPcm(), validator.getContext(), validator); diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java index 23ba6dfa8..e80378cc0 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/utils/Params.java @@ -63,6 +63,7 @@ public class Params { public static final String WANT_INVARIANTS_IN_MESSAGES = "-want-invariants-in-messages"; public static final String SECURITY_CHECKS = "-security-checks"; public static final String CRUMB_TRAIL = "-crumb-trails"; + public static final String FOR_PUBLICATION = "-forPublication"; public static final String VERBOSE = "-verbose"; public static final String SHOW_TIMES = "-show-times"; public static final String ALLOW_EXAMPLE_URLS = "-allow-example-urls"; @@ -221,6 +222,8 @@ public class Params { cliContext.setSecurityChecks(true); } else if (args[i].equals(CRUMB_TRAIL)) { cliContext.setCrumbTrails(true); + } else if (args[i].equals(FOR_PUBLICATION)) { + cliContext.setForPublication(true); } else if (args[i].equals(VERBOSE)) { cliContext.setCrumbTrails(true); } else if (args[i].equals(ALLOW_EXAMPLE_URLS)) { From fce1d1f1fc0aab714a754611272793cf5bf31c86 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Tue, 20 Sep 2022 16:11:15 +0000 Subject: [PATCH 39/49] Release: v5.6.65 ## Validator Changes * Validator support for -forPublication parameter ## Other code changes * Improved ConceptMap rendering * Internal reorganization of extensions * Fix NPE rendering terminology resources * Fix bad HTML rendering SearchParameter * Allow rendering additional information in a comparison * bug fixes from loading all published packages ever ***NO_CI*** --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 06fb96f8e..9528d81f0 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index b59c69ed2..02ad41278 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 4bcf7a0ab..6c4c5d424 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 47a9d7783..e2594bd9d 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 99b70a2da..91a619cac 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index c4ea775a5..a59d7c2e1 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index cd2541978..05df8b6bc 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index bdd7a2fa1..1ca1d5e05 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 1010b144f..97bb27b68 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 9a6529572..12f41e4ab 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 748515d81..02b8f36d9 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 ../pom.xml diff --git a/pom.xml b/pom.xml index a9b055285..9017055d5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.65-SNAPSHOT + 5.6.65 pom From e29b3130db822880695b192b2428cf2ae8be6ad8 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Tue, 20 Sep 2022 16:29:09 +0000 Subject: [PATCH 40/49] Updating version to: 5.6.66-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 9 ++------- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 14 insertions(+), 19 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 5f74b703e..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,12 +1,7 @@ ## Validator Changes -* Validator support for -forPublication parameter +* no changes ## Other code changes -* Improved ConceptMap rendering -* Internal reorganization of extensions -* Fix NPE rendering terminology resources -* Fix bad HTML rendering SearchParameter -* Allow rendering additional information in a comparison -* bug fixes from loading all published packages ever +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 9528d81f0..81e4f8165 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 02ad41278..d1cb97cca 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 6c4c5d424..e1cb668d5 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index e2594bd9d..758c7f6ab 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 91a619cac..967801196 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index a59d7c2e1..2c45d86a8 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 05df8b6bc..2f841d192 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 1ca1d5e05..f9ad25ced 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 97bb27b68..ebdade661 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 12f41e4ab..6c40b6039 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 02b8f36d9..0a1d960be 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 9017055d5..321153256 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.65 + 5.6.66-SNAPSHOT pom From b47edc0109abf5251eeb4ee9b6b53f92e0a880bf Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 23 Sep 2022 09:32:39 -0400 Subject: [PATCH 41/49] xig publisher improvements --- .../convertors/analytics/PackageVisitor.java | 41 +++++++++++++++---- .../CapabilityStatementRenderer.java | 4 +- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java index ad445ccf2..9036ce044 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java @@ -116,28 +116,53 @@ public class PackageVisitor { Map cpidMap = getAllCIPackages(); Set cpidSet = new HashSet<>(); System.out.println("Go: "+cpidMap.size()+" current packages"); + int i = 0; for (String s : cpidMap.keySet()) { - processCurrentPackage(s, cpidMap.get(s), cpidSet); + processCurrentPackage(s, cpidMap.get(s), cpidSet, i, cpidMap.size()); + i++; } Set pidList = getAllPackages(); System.out.println("Go: "+pidList.size()+" published packages"); + i = 0; for (String pid : pidList) { if (!cpidSet.contains(pid)) { + cpidSet.add(pid); List vList = listVersions(pid); if (oldVersions) { for (String v : vList) { - processPackage(pid, v); + processPackage(pid, v, i, pidList.size()); } } else if (vList.isEmpty()) { System.out.println("No Packages for "+pid); } else { - processPackage(pid, vList.get(vList.size() - 1)); + processPackage(pid, vList.get(vList.size() - 1), i, pidList.size()); } } - } + i++; + } + JsonObject json = JsonTrackingParser.fetchJson("https://raw.githubusercontent.com/FHIR/ig-registry/master/fhir-ig-list.json"); + i = 0; + List objects = JsonUtilities.objects(json, "guides"); + for (JsonObject o : objects) { + String pid = JsonUtilities.str(o, "npm-name"); + if (pid != null && !cpidSet.contains(pid)) { + cpidSet.add(pid); + List vList = listVersions(pid); + if (oldVersions) { + for (String v : vList) { + processPackage(pid, v, i, objects.size()); + } + } else if (vList.isEmpty()) { + System.out.println("No Packages for "+pid); + } else { + processPackage(pid, vList.get(vList.size() - 1), i, objects.size()); + } + } + i++; + } } - private void processCurrentPackage(String url, String pid, Set cpidSet) { + private void processCurrentPackage(String url, String pid, Set cpidSet, int i, int t) { try { String[] p = url.split("\\/"); String repo = "https://build.fhir.org/ig/"+p[0]+"/"+p[1]; @@ -160,7 +185,7 @@ public class PackageVisitor { } } } - System.out.println("Processed: "+pid+"#current: "+c+" resources"); + System.out.println("Processed: "+pid+"#current: "+c+" resources ("+i+" of "+t+")"); } } catch (Exception e) { System.out.println("Unable to process: "+pid+"#current: "+e.getMessage()); @@ -228,7 +253,7 @@ public class PackageVisitor { } - private void processPackage(String pid, String v) throws IOException { + private void processPackage(String pid, String v, int i, int t) throws IOException { NpmPackage npm = null; String fv = null; try { @@ -252,7 +277,7 @@ public class PackageVisitor { } } } - System.out.println("Processed: "+pid+"#"+v+": "+c+" resources"); + System.out.println("Processed: "+pid+"#"+v+": "+c+" resources ("+i+" of "+t+")"); } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java index a197b14f8..1e6b64456 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/CapabilityStatementRenderer.java @@ -41,7 +41,9 @@ public class CapabilityStatementRenderer extends ResourceRenderer { if (conf.getRest().size() > 0) { CapabilityStatementRestComponent rest = conf.getRest().get(0); XhtmlNode t = x.table(null); - addTableRow(t, "Mode", rest.getMode().toString()); + if (rest.hasMode()) { + addTableRow(t, "Mode", rest.getMode().toString()); + } addMarkdown(addTableRow(t, "Description"), rest.getDocumentation()); addTableRow(t, "Transaction", showOp(rest, SystemRestfulInteraction.TRANSACTION)); From 695a8610a2b4db4f7403e7c30eb5b0adc74a5ba2 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 23 Sep 2022 09:33:25 -0400 Subject: [PATCH 42/49] fix error with code system validation messages --- .../r5/terminologies/CodeSystemUtilities.java | 53 ++++++++++++++++++- .../r5/terminologies/ValueSetUtilities.java | 14 +++++ .../fhir/utilities/i18n/I18nConstants.java | 4 ++ .../fhir/utilities/json/JsonUtilities.java | 1 - .../src/main/resources/Messages.properties | 4 ++ .../instance/type/CodeSystemValidator.java | 36 ++++++------- .../type/StructureDefinitionValidator.java | 1 + 7 files changed, 93 insertions(+), 20 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java index 74094c34a..d7396cd8c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/CodeSystemUtilities.java @@ -41,6 +41,7 @@ import java.util.Set; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.model.BooleanType; import org.hl7.fhir.r5.model.CanonicalResource; import org.hl7.fhir.r5.model.CanonicalType; @@ -67,6 +68,35 @@ import org.hl7.fhir.utilities.Utilities; public class CodeSystemUtilities { + public static class SystemReference { + private String link; + private String text; + private boolean local; + + public SystemReference(String text, String link) { + super(); + this.link = link; + this.text = text; + } + public SystemReference(String text, String link, boolean local) { + super(); + this.link = link; + this.text = text; + this.local = local; + } + + public String getLink() { + return link; + } + public String getText() { + return text; + } + public boolean isLocal() { + return local; + } + + } + public static class ConceptDefinitionComponentSorter implements Comparator { @Override @@ -619,5 +649,26 @@ public class CodeSystemUtilities { return jurisdiction == null || !jurisdiction.contains("#") ? null : new Coding().setCode(jurisdiction.substring(jurisdiction.indexOf("#")+1)).setSystem(jurisdiction.substring(0, jurisdiction.indexOf("#"))); } + public static SystemReference getSystemReference(String system, IWorkerContext ctxt) { + if (system == null) { + return null; + } if ("http://snomed.info/sct".equals(system)) { + return new SystemReference("SNOMED CT", "https://browser.ihtsdotools.org/"); + } else if ("http://loinc.org".equals(system)) { + return new SystemReference("LOINC", "https://loinc.org/"); + } else if ("http://unitsofmeasure.org".equals(system)) { + return new SystemReference("UCUM", "http://ucum.org"); + } else if (system.equals("http://www.nlm.nih.gov/research/umls/rxnorm")) { + return new SystemReference("RxNorm", "http://www.nlm.nih.gov/research/umls/rxnorm"); + } else if (ctxt != null) { + CodeSystem cs = ctxt.fetchCodeSystem(system); + if (cs != null && cs.hasUserData("path")) { + return new SystemReference(cs.present(), cs.getUserString("path"), Utilities.isAbsoluteUrl(cs.getUserString("path"))); + } else if (cs != null) { + return new SystemReference(cs.present(), null); + } + } + return null; + } +} -} \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetUtilities.java index 1fc5ca3dd..0f367f393 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetUtilities.java @@ -51,6 +51,7 @@ import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent; import org.hl7.fhir.r5.model.CodeType; import org.hl7.fhir.r5.model.ValueSet.ConceptReferenceComponent; import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent; +import org.hl7.fhir.r5.model.ValueSet.ValueSetComposeComponent; import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionContainsComponent; import org.hl7.fhir.r5.model.ValueSet.ValueSetExpansionPropertyComponent; import org.hl7.fhir.r5.terminologies.CodeSystemUtilities.ConceptDefinitionComponentSorter; @@ -272,5 +273,18 @@ public class ValueSetUtilities { Collections.sort(inc.getConcept(), new ConceptReferenceComponentSorter()); } + public static String getAllCodesSystem(ValueSet vs) { + if (vs.hasCompose()) { + ValueSetComposeComponent c = vs.getCompose(); + if (c.getExclude().isEmpty() && c.getInclude().size() == 1) { + ConceptSetComponent i = c.getIncludeFirstRep(); + if (i.hasSystem() && !i.hasValueSet() && !i.hasConcept() && !i.hasFilter()) { + return i.getSystem(); + } + } + } + return null; + } + } \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java index cdc88e647..a2809dd73 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java @@ -631,6 +631,10 @@ public class I18nConstants { public static final String VALUESET_SHAREABLE_MISSING_HL7 = "VALUESET_SHAREABLE_MISSING_HL7"; public static final String VALUESET_SHAREABLE_EXTRA_MISSING_HL7 = "VALUESET_SHAREABLE_EXTRA_MISSING_HL7"; public static final String VALUESET_SHAREABLE_EXTRA_MISSING = "VALUESET_SHAREABLE_EXTRA_MISSING"; + public static final String CODESYSTEM_SHAREABLE_MISSING = "CODESYSTEM_SHAREABLE_MISSING"; + public static final String CODESYSTEM_SHAREABLE_MISSING_HL7 = "CODESYSTEM_SHAREABLE_MISSING_HL7"; + public static final String CODESYSTEM_SHAREABLE_EXTRA_MISSING_HL7 = "CODESYSTEM_SHAREABLE_EXTRA_MISSING_HL7"; + public static final String CODESYSTEM_SHAREABLE_EXTRA_MISSING = "CODESYSTEM_SHAREABLE_EXTRA_MISSING"; public static final String VALUESET_UNC_SYSTEM_WARNING = "VALUESET_UNC_SYSTEM_WARNING"; public static final String VALUESET_UNC_SYSTEM_WARNING_VER = "VALUESET_UNC_SYSTEM_WARNING_VER"; public static final String VALUESET_IMPORT_UNION_INTERSECTION = "VALUESET_IMPORT_UNION_INTERSECTION"; diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonUtilities.java index 955870333..e23ab7e31 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonUtilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/JsonUtilities.java @@ -165,5 +165,4 @@ public class JsonUtilities { } return res; } - } \ No newline at end of file diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index a5f6ebd8f..c384beb7c 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -726,3 +726,7 @@ VALUESET_SHAREABLE_MISSING = The ShareableValueSet profile says that the {0} ele VALUESET_SHAREABLE_EXTRA_MISSING = The ShareableValueSet profile recommends that the {0} element is populated, but it is not present. Published value sets SHOULD conform to the ShareableValueSet profile VALUESET_SHAREABLE_MISSING_HL7 = The ShareableValueSet profile says that the {0} element is mandatory, but it is not found. HL7 Published value sets SHALL conform to the ShareableValueSet profile VALUESET_SHAREABLE_EXTRA_MISSING_HL7 = The ShareableValueSet profile recommends that the {0} element is populated, but it is not found. HL7 Published value sets SHALL conform to the ShareableValueSet profile +CODESYSTEM_SHAREABLE_MISSING = The ShareableCodeSystem profile says that the {0} element is mandatory, but it is not present. Published value sets SHOULD conform to the ShareableCodeSystem profile +CODESYSTEM_SHAREABLE_EXTRA_MISSING = The ShareableCodeSystem profile recommends that the {0} element is populated, but it is not present. Published value sets SHOULD conform to the ShareableCodeSystem profile +CODESYSTEM_SHAREABLE_MISSING_HL7 = The ShareableCodeSystem profile says that the {0} element is mandatory, but it is not found. HL7 Published value sets SHALL conform to the ShareableCodeSystem profile +CODESYSTEM_SHAREABLE_EXTRA_MISSING_HL7 = The ShareableCodeSystem profile recommends that the {0} element is populated, but it is not found. HL7 Published value sets SHALL conform to the ShareableCodeSystem profile diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java index 3cb045afe..c89ca492f 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/CodeSystemValidator.java @@ -91,28 +91,28 @@ public class CodeSystemValidator extends BaseValidator { private void checkShareableCodeSystem(List errors, Element cs, NodeStack stack) { if (parent.isForPublication()) { if (isHL7(cs)) { - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "url"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "version"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "title"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING_HL7, "name"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "status"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "experimental"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "description"); - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "content"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "url"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "version"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "title"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.CODESYSTEM_SHAREABLE_EXTRA_MISSING_HL7, "name"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "status"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "experimental"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "description"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "content"); if (!"supplement".equals(cs.getChildValue("content"))) { - rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING_HL7, "caseSensitive"); + rule(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING_HL7, "caseSensitive"); } } else { - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.VALUESET_SHAREABLE_MISSING, "url"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.VALUESET_SHAREABLE_MISSING, "version"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.VALUESET_SHAREABLE_MISSING, "title"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.VALUESET_SHAREABLE_EXTRA_MISSING, "name"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.VALUESET_SHAREABLE_MISSING, "status"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.VALUESET_SHAREABLE_MISSING, "experimental"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.VALUESET_SHAREABLE_MISSING, "description"); - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.VALUESET_SHAREABLE_MISSING, "content"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("url"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "url"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("version"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "version"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("title"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "title"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("name"), I18nConstants.CODESYSTEM_SHAREABLE_EXTRA_MISSING, "name"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("status"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "status"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("experimental"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "experimental"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("description"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "description"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("content"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "content"); if (!"supplement".equals(cs.getChildValue("content"))) { - warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.VALUESET_SHAREABLE_MISSING, "caseSensitive"); + warning(errors, IssueType.REQUIRED, cs.line(), cs.col(), stack.getLiteralPath(), cs.hasChild("caseSensitive"), I18nConstants.CODESYSTEM_SHAREABLE_MISSING, "caseSensitive"); } } } diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java index cda40a05e..6522375f9 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java @@ -78,6 +78,7 @@ public class StructureDefinitionValidator extends BaseValidator { List msgs = new ArrayList<>(); ProfileUtilities pu = new ProfileUtilities(context, msgs, null); pu.setXver(xverManager); + pu.setNewSlicingProcessing(!sd.hasFhirVersion() || VersionUtilities.isR4Plus(sd.getFhirVersion().toCode())); pu.generateSnapshot(base, sd, sd.getUrl(), "http://hl7.org/fhir/R4/", sd.getName()); if (msgs.size() > 0) { for (ValidationMessage msg : msgs) { From c51f7c232788c789c6603a862720e6bcefa081fa Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 23 Sep 2022 10:38:10 -0400 Subject: [PATCH 43/49] Enhanced testing for character encoding issues (#928) * Redo pull pipeline to check for alternate file encodings * Fix jdkVersion references in pull-request-pipeline * Failing test for Cp1252 encoded Java environments * Fix file encoding mistake * Add fix + refactor test * Backport ParserBase changes and tests to previous versions * And I mean it, this time * Update tx cache resources Co-authored-by: dotasek --- .../hl7/fhir/dstu2/formats/ParserBase.java | 9 +- .../fhir/dstu2/formats/ParserBaseTest.java | 62 + .../fhir/dstu2016may/formats/ParserBase.java | 9 +- .../dstu2016may/formats/ParserBaseTest.java | 62 + .../hl7/fhir/dstu3/formats/ParserBase.java | 9 +- .../fhir/dstu3/formats/ParserBaseTest.java | 62 + .../org/hl7/fhir/r4/formats/ParserBase.java | 11 +- .../hl7/fhir/r4/formats/ParserBaseTest.java | 68 + .../org/hl7/fhir/r4b/formats/ParserBase.java | 11 +- .../hl7/fhir/r4b/formats/ParserBaseTest.java | 67 + .../org/hl7/fhir/r5/formats/ParserBase.java | 11 +- .../hl7/fhir/r5/formats/ParserBaseTest.java | 70 + .../txCache/org.hl7.fhir.r5/iso4217.cache | 14 +- .../txCache/org.hl7.fhir.r5/loinc.cache | 4 +- .../txCache/org.hl7.fhir.r5/mimetypes.cache | 14 +- .../txCache/org.hl7.fhir.r5/ucum.cache | 115 +- .../txCache/org.hl7.fhir.r5/iso4217.cache | 29 - .../txCache/org.hl7.fhir.r5/lang.cache | 11 - .../txCache/org.hl7.fhir.r5/loinc.cache | 90 - .../txCache/org.hl7.fhir.r5/mimetypes.cache | 29 - .../txCache/org.hl7.fhir.r5/ucum.cache | 228 -- .../1.0.2/.capabilityStatement.cache | 2 +- .../1.4.0/.capabilityStatement.cache | 2 +- .../1.4.0/.terminologyCapabilities.cache | 6 + .../3.0.2/.capabilityStatement.cache | 2 +- .../3.0.2/.terminologyCapabilities.cache | 6 + .../3.0.2/snomed.cache | 53 +- .../4.0.1/.capabilityStatement.cache | 2 +- .../4.0.1/.terminologyCapabilities.cache | 8 +- .../4.0.1/all-systems.cache | 38 +- .../4.0.1/http___www.ada.org_snodent.cache | 12 - .../org.hl7.fhir.validation/4.0.1/loinc.cache | 396 +- .../4.0.1/snomed.cache | 110 +- .../org.hl7.fhir.validation/4.0.1/ucum.cache | 20 +- .../4.3.0/.capabilityStatement.cache | 2 +- .../4.3.0/.terminologyCapabilities.cache | 8 +- .../4.5.0/.capabilityStatement.cache | 66 - .../4.5.0/.terminologyCapabilities.cache | 3587 ----------------- .../4.5.0/all-systems.cache | 84 - .../4.5.0/http___www.whocc.no_atc.cache | 14 - .../4.5.0/icd-9-cm.cache | 11 - .../org.hl7.fhir.validation/4.5.0/loinc.cache | 506 --- .../4.5.0/measure-population.cache | 12 - .../4.5.0/observation-category.cache | 32 - .../4.5.0/rxnorm.cache | 12 - .../4.5.0/snomed.cache | 205 - .../org.hl7.fhir.validation/4.5.0/ucum.cache | 41 - .../4.5.0/v2-0203.cache | 61 - .../4.5.0/v3-ObservationInterpretation.cache | 63 - .../5.0.0/.capabilityStatement.cache | 2 +- .../5.0.0/.terminologyCapabilities.cache | 5 +- .../5.0.0/all-systems.cache | 175 - .../5.0.0/icd-9-cm.cache | 11 - .../org.hl7.fhir.validation/5.0.0/loinc.cache | 492 +-- .../5.0.0/measure-population.cache | 34 - .../5.0.0/observation-category.cache | 62 +- .../5.0.0/snomed.cache | 123 +- .../org.hl7.fhir.validation/5.0.0/ucum.cache | 32 +- .../5.0.0/v2-0203.cache | 64 +- .../5.0.0/v3-ObservationInterpretation.cache | 100 +- pull-request-pipeline-parameterized.yml | 13 +- pull-request-pipeline.yml | 35 +- 62 files changed, 830 insertions(+), 6664 deletions(-) create mode 100644 org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/formats/ParserBaseTest.java create mode 100644 org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/formats/ParserBaseTest.java create mode 100644 org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/formats/ParserBaseTest.java create mode 100644 org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/formats/ParserBaseTest.java create mode 100644 org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/formats/ParserBaseTest.java create mode 100644 org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/formats/ParserBaseTest.java delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ada.org_snodent.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.capabilityStatement.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.terminologyCapabilities.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/all-systems.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/http___www.whocc.no_atc.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/icd-9-cm.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/loinc.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/measure-population.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/observation-category.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/rxnorm.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/snomed.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/ucum.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v2-0203.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v3-ObservationInterpretation.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/icd-9-cm.cache delete mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/formats/ParserBase.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/formats/ParserBase.java index 79921b62f..9b24dd1d9 100644 --- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/formats/ParserBase.java +++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/formats/ParserBase.java @@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -53,7 +54,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -63,7 +64,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { public Type parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public Type parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -72,7 +73,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource)); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -83,7 +84,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Type type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(Type type, String typeName) throws IOException { diff --git a/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/formats/ParserBaseTest.java b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/formats/ParserBaseTest.java new file mode 100644 index 000000000..56459fed6 --- /dev/null +++ b/org.hl7.fhir.dstu2/src/test/java/org/hl7/fhir/dstu2/formats/ParserBaseTest.java @@ -0,0 +1,62 @@ +package org.hl7.fhir.dstu2.formats; + +import org.hl7.fhir.dstu2.model.Resource; +import org.hl7.fhir.dstu2.model.Type; +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public Type parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, Type type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Type.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/formats/ParserBase.java b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/formats/ParserBase.java index 6055e92bf..19c3405da 100644 --- a/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/formats/ParserBase.java +++ b/org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/formats/ParserBase.java @@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -53,7 +54,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -62,7 +63,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public Type parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public Type parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -71,7 +72,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource)); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -82,7 +83,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Type type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(Type type, String typeName) throws IOException { diff --git a/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/formats/ParserBaseTest.java b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/formats/ParserBaseTest.java new file mode 100644 index 000000000..83b35e9df --- /dev/null +++ b/org.hl7.fhir.dstu2016may/src/test/java/org/hl7/fhir/dstu2016may/formats/ParserBaseTest.java @@ -0,0 +1,62 @@ +package org.hl7.fhir.dstu2016may.formats; + +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.dstu2016may.model.Resource; +import org.hl7.fhir.dstu2016may.model.Type; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public Type parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, Type type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Type.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserBase.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserBase.java index 5a0f5d5b2..993944313 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserBase.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/formats/ParserBase.java @@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -53,7 +54,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -62,7 +63,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public Type parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public Type parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -71,7 +72,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource)); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -82,7 +83,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Type type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(Type type, String typeName) throws IOException { diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/formats/ParserBaseTest.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/formats/ParserBaseTest.java new file mode 100644 index 000000000..bf9a049ad --- /dev/null +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/formats/ParserBaseTest.java @@ -0,0 +1,62 @@ +package org.hl7.fhir.dstu3.formats; + +import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.Type; +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public Type parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, Type type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Type.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/ParserBase.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/ParserBase.java index ee0364db3..262a56b1c 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/ParserBase.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/formats/ParserBase.java @@ -38,6 +38,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -53,7 +54,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -62,11 +63,11 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public Type parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public Type parseAnyType(String input, String typeName) throws FHIRFormatError, IOException { - return parseAnyType(input.getBytes("UTF-8"), typeName); + return parseAnyType(input.getBytes(StandardCharsets.UTF_8), typeName); } public Type parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -80,7 +81,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource), "UTF-8"); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -91,7 +92,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Type type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(Type type, String typeName) throws IOException { diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/formats/ParserBaseTest.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/formats/ParserBaseTest.java new file mode 100644 index 000000000..b3b1e5fcb --- /dev/null +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/formats/ParserBaseTest.java @@ -0,0 +1,68 @@ +package org.hl7.fhir.r4.formats; + +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.r4.model.Type; +import org.hl7.fhir.r4.model.Resource; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public Type parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public Type parseAnyType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, Type type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Type.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/ParserBase.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/ParserBase.java index e61433ea5..21395218b 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/ParserBase.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/formats/ParserBase.java @@ -40,6 +40,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -56,7 +57,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -65,11 +66,11 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public DataType parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public DataType parseAnyType(String input, String typeName) throws FHIRFormatError, IOException { - return parseAnyType(input.getBytes("UTF-8"), typeName); + return parseAnyType(input.getBytes(StandardCharsets.UTF_8), typeName); } public DataType parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -83,7 +84,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource), "UTF-8"); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -94,7 +95,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(DataType type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(DataType type, String typeName) throws IOException { diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/formats/ParserBaseTest.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/formats/ParserBaseTest.java new file mode 100644 index 000000000..55bfc2ea3 --- /dev/null +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/formats/ParserBaseTest.java @@ -0,0 +1,67 @@ +package org.hl7.fhir.r4b.formats; + +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.r4b.model.DataType; +import org.hl7.fhir.r4b.model.Resource; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public DataType parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public DataType parseAnyType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, DataType type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(DataType.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/ParserBase.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/ParserBase.java index 0631b50a2..d1a9b6c4f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/ParserBase.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/ParserBase.java @@ -40,6 +40,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.HashMap; import java.util.Map; @@ -56,7 +57,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { // -- implementation of variant type methods from the interface -------------------------------- public Resource parse(String input) throws FHIRFormatError, IOException { - return parse(input.getBytes("UTF-8")); + return parse(input.getBytes(StandardCharsets.UTF_8)); } public Resource parse(byte[] bytes) throws FHIRFormatError, IOException { @@ -65,11 +66,11 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public DataType parseType(String input, String typeName) throws FHIRFormatError, IOException { - return parseType(input.getBytes("UTF-8"), typeName); + return parseType(input.getBytes(StandardCharsets.UTF_8), typeName); } public DataType parseAnyType(String input, String typeName) throws FHIRFormatError, IOException { - return parseAnyType(input.getBytes("UTF-8"), typeName); + return parseAnyType(input.getBytes(StandardCharsets.UTF_8), typeName); } public DataType parseType(byte[] bytes, String typeName) throws FHIRFormatError, IOException { @@ -83,7 +84,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(Resource resource) throws IOException { - return new String(composeBytes(resource), "UTF-8"); + return new String(composeBytes(resource), StandardCharsets.UTF_8); } public byte[] composeBytes(Resource resource) throws IOException { @@ -94,7 +95,7 @@ public abstract class ParserBase extends FormatUtilities implements IParser { } public String composeString(DataType type, String typeName) throws IOException { - return new String(composeBytes(type, typeName)); + return new String(composeBytes(type, typeName), StandardCharsets.UTF_8); } public byte[] composeBytes(DataType type, String typeName) throws IOException { diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/formats/ParserBaseTest.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/formats/ParserBaseTest.java new file mode 100644 index 000000000..6b0a18661 --- /dev/null +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/formats/ParserBaseTest.java @@ -0,0 +1,70 @@ +package org.hl7.fhir.r5.formats; + +import org.hl7.fhir.exceptions.FHIRFormatError; +import org.hl7.fhir.r5.model.DataType; +import org.hl7.fhir.r5.model.HumanName; +import org.hl7.fhir.r5.model.Patient; +import org.hl7.fhir.r5.model.Resource; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; + +public class ParserBaseTest { + + public static final String SLASHED_O = "ø"; + private ParserBase parserBase; + + @BeforeEach + public void beforeEach() { + parserBase = new ParserBase() { + @Override + public ParserType getType() { + return null; + } + + @Override + public Resource parse(InputStream input) throws IOException, FHIRFormatError { + return null; + } + + @Override + public DataType parseType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public DataType parseAnyType(InputStream input, String knownType) throws IOException, FHIRFormatError { + return null; + } + + @Override + public void compose(OutputStream stream, Resource resource) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + + @Override + public void compose(OutputStream stream, DataType type, String rootName) throws IOException { + stream.write(SLASHED_O.getBytes("UTF-8")); + } + }; + } + + @Test + public void composeString_forResource_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(Resource.class)); + assertEquals(SLASHED_O, actualString); + } + + @Test + public void composeString_forDataType_worksForCurrentEncoding() throws IOException { + String actualString = parserBase.composeString(mock(DataType.class), "dummyName"); + assertEquals(SLASHED_O, actualString); + } +} diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache index 84e8d085d..7eab6dadc 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache @@ -9,21 +9,11 @@ } }}#### e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-ballot"}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache index 0eff5d126..b725544c6 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache @@ -41,7 +41,7 @@ } }}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "valueSet" :{ @@ -85,6 +85,6 @@ e: { } }}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache index cd3d2dcfe..89832520c 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache @@ -9,21 +9,11 @@ } }}#### e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot"}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache index c68360c06..b6d6f4ad2 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache @@ -1,106 +1,4 @@ ------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "http://unitsofmeasure.org", - "concept" : [{ - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "second" - }], - "code" : "s", - "display" : "second", - "designation" : [{ - "language" : "zh", - "value" : "秒" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "minute" - }], - "code" : "min", - "display" : "minute", - "designation" : [{ - "language" : "zh", - "value" : "分钟" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "hour" - }], - "code" : "h", - "display" : "hour", - "designation" : [{ - "language" : "zh", - "value" : "小时" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "day" - }], - "code" : "d", - "display" : "day", - "designation" : [{ - "language" : "zh", - "value" : "天" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "week" - }], - "code" : "wk", - "display" : "week", - "designation" : [{ - "language" : "zh", - "value" : "星期" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "month" - }], - "code" : "mo", - "display" : "month", - "designation" : [{ - "language" : "zh", - "value" : "月" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "year" - }], - "code" : "a", - "display" : "year", - "designation" : [{ - "language" : "zh", - "value" : "年" - }] - }] - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- {"hierarchical" : false, "valueSet" :{ "resourceType" : "ValueSet", "compose" : { @@ -195,17 +93,12 @@ e: { } }}#### e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-ballot"}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "valueSet" :{ @@ -218,11 +111,11 @@ e: { } }}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- {"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-ballot"}#### e: { - "error" : "java.lang.NullPointerException" + "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" } ------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache deleted file mode 100644 index 84e8d085d..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache +++ /dev/null @@ -1,29 +0,0 @@ -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "urn:iso:std:iso:4217" - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-ballot"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache deleted file mode 100644 index 9eff9c452..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache +++ /dev/null @@ -1,11 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "urn:ietf:bcp:47", - "code" : "fr-CA" -}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "severity" : "error", - "error" : "Attempt to use Terminology server when no Terminology server is available", - "class" : "SERVER_ERROR" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache deleted file mode 100644 index 0eff5d126..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache +++ /dev/null @@ -1,90 +0,0 @@ -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "http://loinc.org", - "concept" : [{ - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "A." - }], - "code" : "LA20752-4", - "display" : "Within 24 hours" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "B." - }], - "code" : "LA20753-2", - "display" : "After 24 hours but before 3 days" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "C." - }], - "code" : "LA20754-0", - "display" : "Three days or later" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "D." - }], - "code" : "LA4489-6", - "display" : "Unknown" - }] - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "include" : [{ - "system" : "http://loinc.org", - "concept" : [{ - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "A." - }], - "code" : "LA20752-4", - "display" : "Within 24 hours" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "B." - }], - "code" : "LA20753-2", - "display" : "After 24 hours but before 3 days" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "C." - }], - "code" : "LA20754-0", - "display" : "Three days or later" - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", - "valueString" : "D." - }], - "code" : "LA4489-6", - "display" : "Unknown" - }] - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache deleted file mode 100644 index cd3d2dcfe..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache +++ /dev/null @@ -1,29 +0,0 @@ -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "urn:ietf:bcp:13" - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache deleted file mode 100644 index c68360c06..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache +++ /dev/null @@ -1,228 +0,0 @@ -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "http://unitsofmeasure.org", - "concept" : [{ - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "second" - }], - "code" : "s", - "display" : "second", - "designation" : [{ - "language" : "zh", - "value" : "秒" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "minute" - }], - "code" : "min", - "display" : "minute", - "designation" : [{ - "language" : "zh", - "value" : "分钟" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "hour" - }], - "code" : "h", - "display" : "hour", - "designation" : [{ - "language" : "zh", - "value" : "小时" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "day" - }], - "code" : "d", - "display" : "day", - "designation" : [{ - "language" : "zh", - "value" : "天" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "week" - }], - "code" : "wk", - "display" : "week", - "designation" : [{ - "language" : "zh", - "value" : "星期" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "month" - }], - "code" : "mo", - "display" : "month", - "designation" : [{ - "language" : "zh", - "value" : "月" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "year" - }], - "code" : "a", - "display" : "year", - "designation" : [{ - "language" : "zh", - "value" : "年" - }] - }] - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.0.1"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "http://unitsofmeasure.org", - "concept" : [{ - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "second" - }], - "code" : "s", - "display" : "second", - "designation" : [{ - "language" : "zh", - "value" : "秒" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "minute" - }], - "code" : "min", - "display" : "minute", - "designation" : [{ - "language" : "zh", - "value" : "分钟" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "hour" - }], - "code" : "h", - "display" : "hour", - "designation" : [{ - "language" : "zh", - "value" : "小时" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "day" - }], - "code" : "d", - "display" : "day", - "designation" : [{ - "language" : "zh", - "value" : "天" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "week" - }], - "code" : "wk", - "display" : "week", - "designation" : [{ - "language" : "zh", - "value" : "星期" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "month - Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence." - }], - "code" : "mo", - "display" : "month", - "designation" : [{ - "language" : "zh", - "value" : "月" - }] - }, - { - "extension" : [{ - "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", - "valueString" : "year" - }], - "code" : "a", - "display" : "year", - "designation" : [{ - "language" : "zh", - "value" : "年" - }] - }] - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "4.6.0"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-ballot"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "inactive" : true, - "include" : [{ - "system" : "http://unitsofmeasure.org" - }] - } -}}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- -{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-ballot"}#### -e: { - "error" : "java.lang.NullPointerException" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache index a3159b550..443b95970 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache @@ -16,7 +16,7 @@ "version" : "1.0.2-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-06-17T22:07:09.897Z", + "date" : "2022-09-22T20:21:24.315Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache index 686dd509d..31d40b289 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache @@ -16,7 +16,7 @@ "version" : "3.0.2-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-06-15T16:31:15.631Z", + "date" : "2022-09-16T12:12:41.427Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.terminologyCapabilities.cache index 1b1c8daa5..443c6d422 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.terminologyCapabilities.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.terminologyCapabilities.cache @@ -2838,6 +2838,9 @@ { "uri" : "http://nucc.org/provider-taxonomy" }, + { + "uri" : "http://radlex.org" + }, { "uri" : "http://snomed.info/sct" }, @@ -3225,6 +3228,9 @@ { "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" }, + { + "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3" + }, { "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" }, diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.capabilityStatement.cache index 686dd509d..31d40b289 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.capabilityStatement.cache @@ -16,7 +16,7 @@ "version" : "3.0.2-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-06-15T16:31:15.631Z", + "date" : "2022-09-16T12:12:41.427Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.terminologyCapabilities.cache index 1b1c8daa5..443c6d422 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.terminologyCapabilities.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.terminologyCapabilities.cache @@ -2838,6 +2838,9 @@ { "uri" : "http://nucc.org/provider-taxonomy" }, + { + "uri" : "http://radlex.org" + }, { "uri" : "http://snomed.info/sct" }, @@ -3225,6 +3228,9 @@ { "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" }, + { + "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3" + }, { "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" }, diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/snomed.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/snomed.cache index 755ff6363..320926f45 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/snomed.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/snomed.cache @@ -130,7 +130,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 823681000000100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"823681000000100\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#823681000000100) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 823681000000100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"823681000000100\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#823681000000100) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -140,7 +140,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 886921000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"886921000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#886921000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 886921000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"886921000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#886921000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -150,7 +150,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 1077881000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"1077881000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1077881000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 1077881000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"1077881000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1077881000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -160,7 +160,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 887181000000106 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"887181000000106\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887181000000106) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 887181000000106 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"887181000000106\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887181000000106) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -170,7 +170,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 887161000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"887161000000102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887161000000102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 887161000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"887161000000102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887161000000102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -180,7 +180,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 1052891000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"1052891000000108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1052891000000108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 1052891000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"1052891000000108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1052891000000108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -190,7 +190,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 715851000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"715851000000102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#715851000000102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 715851000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"715851000000102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#715851000000102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -200,7 +200,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 717121000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"717121000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#717121000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 717121000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"717121000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#717121000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -210,7 +210,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 933361000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"933361000000108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#933361000000108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 933361000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"933361000000108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#933361000000108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -220,7 +220,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 887171000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"887171000000109\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887171000000109) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 887171000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"887171000000109\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887171000000109) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -230,7 +230,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 887201000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"887201000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887201000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 887201000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"887201000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887201000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -240,7 +240,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 1052951000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"1052951000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1052951000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 1052951000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"1052951000000105\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1052951000000105) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -250,7 +250,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 886731000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"886731000000109\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#886731000000109) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 886731000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"886731000000109\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#886731000000109) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -260,7 +260,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 887231000000104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"887231000000104\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887231000000104) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 887231000000104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"887231000000104\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#887231000000104) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -270,7 +270,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 9290701000001101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"9290701000001101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#9290701000001101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 9290701000001101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"9290701000001101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#9290701000001101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -338,7 +338,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 11181000146103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"11181000146103\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#11181000146103) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" + "error" : "Unable to find code 11181000146103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"11181000146103\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#11181000146103) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r3)" } ------------------------------------------------------------------------------------- {"code" : { @@ -352,24 +352,3 @@ v: { "system" : "http://snomed.info/sct" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "17621005", - "display" : "Normal (qualifier value)" -}, "url": "http://hl7.org/fhir/ValueSet/security-labels", "version": "3.0.2", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "17621005", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "17621005" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "17621005", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.capabilityStatement.cache index f2a8b0787..0c9fedfc4 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.capabilityStatement.cache @@ -12,7 +12,7 @@ "version" : "4.0.1-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-06-17T22:02:53.771Z", + "date" : "2022-09-15T13:27:05.487Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.terminologyCapabilities.cache index 2538dfc2c..d1f5aa73b 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.terminologyCapabilities.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.terminologyCapabilities.cache @@ -5,7 +5,7 @@ "version" : "1.0.0", "name" : "FHIR Reference Server Teminology Capability Statement", "status" : "active", - "date" : "2022-06-17T22:02:55.131Z", + "date" : "2022-09-12T07:14:02.176Z", "contact" : [{ "telecom" : [{ "system" : "other", @@ -865,6 +865,9 @@ { "uri" : "http://nucc.org/provider-taxonomy" }, + { + "uri" : "http://radlex.org" + }, { "uri" : "http://snomed.info/sct" }, @@ -1267,6 +1270,9 @@ { "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" }, + { + "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3" + }, { "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" }, diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache index f8c814514..a7483ec05 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache @@ -75,15 +75,6 @@ v: { "system" : "urn:ietf:bcp:13" } ------------------------------------------------------------------------------------- -{"code" : { - "code" : "xml" -}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "xml", - "code" : "xml", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- {"code" : { "code" : "json" }, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -93,6 +84,15 @@ v: { "system" : "urn:ietf:bcp:13" } ------------------------------------------------------------------------------------- +{"code" : { + "code" : "xml" +}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "xml", + "code" : "xml", + "system" : "urn:ietf:bcp:13" +} +------------------------------------------------------------------------------------- {"code" : { "code" : "application/fhir+json" }, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -837,7 +837,7 @@ v: { }, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'no-colonoscopy-sedation-level' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'no-colonoscopy-sedation-level' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1514,6 +1514,15 @@ v: { "system" : "http://snomed.info/sct" } ------------------------------------------------------------------------------------- +{"code" : { + "code" : "en-AU" +}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.0.1", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "English (Australia)", + "code" : "en-AU", + "system" : "urn:ietf:bcp:47" +} +------------------------------------------------------------------------------------- {"code" : { "code" : "en" }, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.0.1", "lang":"en", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -1542,15 +1551,6 @@ v: { "system" : "urn:iso:std:iso:3166" } ------------------------------------------------------------------------------------- -{"code" : { - "code" : "en-AU" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.0.1", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English (Australia)", - "code" : "en-AU", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- {"code" : { "code" : "[%payloadFormat%]" }, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ada.org_snodent.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ada.org_snodent.cache deleted file mode 100644 index d5350b2dc..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ada.org_snodent.cache +++ /dev/null @@ -1,12 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://www.ada.org/snodent", - "code" : "210965D", - "display" : "Anterior part of lower alveolar ridge" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anterior part of lower alveolar ridge", - "code" : "210965D", - "system" : "http://www.ada.org/snodent" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache index 444f3bbfc..302ba75ba 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/loinc.cache @@ -362,6 +362,51 @@ v: { "error" : "The code \"X-34133-9\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#X-34133-9) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "56445-0" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Medication summary Document", + "code" : "56445-0", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0", + "display" : "Medication summary Doc" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "56445-0" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "version" : "current", + "code" : "48765-2", + "display" : "Allergies and adverse reactions" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '48765-2'). ValidVersions = [2.73]; The code provided (http://loinc.org#48765-2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "class" : "CODESYSTEM_UNSUPPORTED" +} +------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", "code" : "34133-9" @@ -405,7 +450,7 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", - "version" : "2.72", + "version" : "2.73", "code" : "57852-6", "display" : "Problem list Narrative - Reported" }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -415,6 +460,151 @@ v: { "system" : "http://loinc.org" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "18842-5" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Discharge summary", + "code" : "18842-5", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "18842-5", + "display" : "Discharge Summary" +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +v: { + "display" : "Discharge summary", + "code" : "18842-5", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "18842-5" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Discharge summary", + "code" : "18842-5", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "29299-5" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Reason for visit Narrative", + "code" : "29299-5", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "�g��", + "display" : "8302-2" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "severity" : "error", + "error" : "The code \"�g��\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#�g��) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8867-4", + "display" : "Heart rate" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Heart rate", + "code" : "8867-4", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "10331-7", + "display" : "Rh [Type] in Blood" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Rh [Type] in Blood", + "code" : "10331-7", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "18684-1", + "display" : "����" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "First Blood pressure Set", + "code" : "18684-1", + "system" : "http://loinc.org", + "severity" : "warning", + "error" : "The display \"����\" is not a valid display for the code {http://loinc.org}18684-1 - should be one of ['First Blood pressure Set', '', 'ED Health Insurance Portability and Accountability Act of 1996' (zh-CN), 'HIPAA' (zh-CN), '健康保險可攜與責任法' (zh-CN), 'HIPAA法案' (zh-CN), '健康保险可移植性和问责法1996年' (zh-CN), '美国健康保险携带和责任法案' (zh-CN), '医疗保险便携性和责任法案' (zh-CN), '医疗保险便携性与责任法案' (zh-CN), '醫療保險可攜性與責任法' (zh-CN), 'HIPAA 信息附件.急诊' (zh-CN), 'HIPAA 信息附件.急诊科' (zh-CN), 'HIPAA 信息附件.急诊科就医' (zh-CN), 'HIPAA 信息附件.急诊科就诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊 临床信息附件集' (zh-CN), '临床信息附件集合' (zh-CN), '集' (zh-CN), '集合 信息附件' (zh-CN), '健康保险便携与责任法案信息附件' (zh-CN), '附件 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 压强 复合属性' (zh-CN), '复杂型属性' (zh-CN), '复杂属性 就医' (zh-CN), '就医过程 急诊科 急诊科（DEEDS）变量' (zh-CN), 'DEEDS 变量' (zh-CN), '急诊' (zh-CN), '急诊科' (zh-CN), 'Emergency Department' (zh-CN), 'ED' (zh-CN), '急诊科（急诊科系统代码之数据元素）变量' (zh-CN), '急诊科（急诊科系统代码之数据元素）指标' (zh-CN), '急诊科（美国CDC急诊科系统代码之数据元素）指标' (zh-CN), '急诊科指标 急诊科（Emergency Department，ED） 急诊部 第一个' (zh-CN), '第一次' (zh-CN), '首个' (zh-CN), '首次 血' (zh-CN), '全血' (zh-CN), 'Allegato Allegato di reparto di emergenza (pronto soccorso) Complesso Emergenza (DEEDS - Data Elements for Emergency Dep Incontro' (it-IT), 'Appuntamento paziente Stabilito' (it-IT), 'Fissato' (it-IT), 'Встреча Комплекс' (ru-RU)] (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8480-6", + "display" : "���k������" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Systolic blood pressure", + "code" : "8480-6", + "system" : "http://loinc.org", + "severity" : "warning", + "error" : "The display \"���k������\" is not a valid display for the code {http://loinc.org}8480-6 - should be one of ['Systolic blood pressure', 'BP sys', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内收缩期' (zh-CN), '血管内心缩期 血管内的' (zh-CN), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'BP systolic' (pt-BR), 'Blood pressure systolic' (pt-BR), 'Sys BP' (pt-BR), 'SBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck systolisch' (de-AT)] (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "8462-4", + "display" : "�g��������" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Diastolic blood pressure", + "code" : "8462-4", + "system" : "http://loinc.org", + "severity" : "warning", + "error" : "The display \"�g��������\" is not a valid display for the code {http://loinc.org}8462-4 - should be one of ['Diastolic blood pressure', 'BP dias', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内心舒期' (zh-CN), '血管内舒张期 血管内的' (zh-CN), 'Dias' (pt-BR), 'Diast' (pt-BR), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'Diastoli' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'Blood pressure diastolic' (pt-BR), 'BP diastolic' (pt-BR), 'Dias BP' (pt-BR), 'DBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Внутрисосудистый диастолический Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck diastolisch' (de-AT)] (from http://tx.fhir.org/r4)" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "718-7", + "display" : "Hemoglobin [Mass/volume] in Blood" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Hemoglobin [Mass/volume] in Blood", + "code" : "718-7", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "38483-4", + "display" : "Creat Bld-mCnc" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Creatinine [Mass/volume] in Blood", + "code" : "38483-4", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://loinc.org", + "code" : "2093-3", + "display" : "Cholesterol [Mass/volume] in Serum or Plasma" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Cholesterol [Mass/volume] in Serum or Plasma", + "code" : "2093-3", + "system" : "http://loinc.org" +} +------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", "code" : "44261-6", @@ -1318,7 +1508,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Version 'http://loinc.org' of the code system 'http://loinc.org' is not known (encountered paired with code = 'test'). ValidVersions = [2.72]; The code provided (http://loinc.org#test) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "error" : "Version 'http://loinc.org' of the code system 'http://loinc.org' is not known (encountered paired with code = 'test'). ValidVersions = [2.73]; The code provided (http://loinc.org#test) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", "class" : "CODESYSTEM_UNSUPPORTED" } ------------------------------------------------------------------------------------- @@ -1332,205 +1522,3 @@ v: { "system" : "http://loinc.org" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5", - "display" : "Discharge Summary" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "29299-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Reason for visit Narrative", - "code" : "29299-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "�g��", - "display" : "8302-2" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code \"�g��\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#�g��) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8867-4", - "display" : "Heart rate" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Heart rate", - "code" : "8867-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "10331-7", - "display" : "Rh [Type] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Rh [Type] in Blood", - "code" : "10331-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18684-1", - "display" : "����" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "First Blood pressure Set", - "code" : "18684-1", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"����\" is not a valid display for the code {http://loinc.org}18684-1 - should be one of ['First Blood pressure Set', '', 'ED Health Insurance Portability and Accountability Act of 1996' (zh-CN), 'HIPAA' (zh-CN), '健康保險可攜與責任法' (zh-CN), 'HIPAA法案' (zh-CN), '健康保险可移植性和问责法1996年' (zh-CN), '美国健康保险携带和责任法案' (zh-CN), '医疗保险便携性和责任法案' (zh-CN), '医疗保险便携性与责任法案' (zh-CN), '醫療保險可攜性與責任法' (zh-CN), 'HIPAA 信息附件.急诊' (zh-CN), 'HIPAA 信息附件.急诊科' (zh-CN), 'HIPAA 信息附件.急诊科就医' (zh-CN), 'HIPAA 信息附件.急诊科就诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊 临床信息附件集' (zh-CN), '临床信息附件集合' (zh-CN), '集' (zh-CN), '集合 信息附件' (zh-CN), '健康保险便携与责任法案信息附件' (zh-CN), '附件 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 压强 复合属性' (zh-CN), '复杂型属性' (zh-CN), '复杂属性 就医' (zh-CN), '就医过程 急诊科 急诊科（DEEDS）变量' (zh-CN), 'DEEDS 变量' (zh-CN), '急诊' (zh-CN), '急诊科' (zh-CN), 'Emergency Department' (zh-CN), 'ED' (zh-CN), '急诊科（急诊科系统代码之数据元素）变量' (zh-CN), '急诊科（急诊科系统代码之数据元素）指标' (zh-CN), '急诊科（美国CDC急诊科系统代码之数据元素）指标' (zh-CN), '急诊科指标 急诊科（Emergency Department，ED） 急诊部 第一个' (zh-CN), '第一次' (zh-CN), '首个' (zh-CN), '首次 血' (zh-CN), '全血' (zh-CN), 'Allegato Allegato di reparto di emergenza (pronto soccorso) Complesso Emergenza (DEEDS - Data Elements for Emergency Dep Incontro' (it-IT), 'Appuntamento paziente Stabilito' (it-IT), 'Fissato' (it-IT), 'Встреча Комплекс' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "���k������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"���k������\" is not a valid display for the code {http://loinc.org}8480-6 - should be one of ['Systolic blood pressure', 'BP sys', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内收缩期' (zh-CN), '血管内心缩期 血管内的' (zh-CN), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'BP systolic' (pt-BR), 'Blood pressure systolic' (pt-BR), 'Sys BP' (pt-BR), 'SBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck systolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "�g��������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"�g��������\" is not a valid display for the code {http://loinc.org}8462-4 - should be one of ['Diastolic blood pressure', 'BP dias', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内心舒期' (zh-CN), '血管内舒张期 血管内的' (zh-CN), 'Dias' (pt-BR), 'Diast' (pt-BR), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'Diastoli' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'Blood pressure diastolic' (pt-BR), 'BP diastolic' (pt-BR), 'Dias BP' (pt-BR), 'DBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Внутрисосудистый диастолический Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck diastolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "718-7", - "display" : "Hemoglobin [Mass/volume] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Hemoglobin [Mass/volume] in Blood", - "code" : "718-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "38483-4", - "display" : "Creat Bld-mCnc" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Creatinine [Mass/volume] in Blood", - "code" : "38483-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "2093-3", - "display" : "Cholesterol [Mass/volume] in Serum or Plasma" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol [Mass/volume] in Serum or Plasma", - "code" : "2093-3", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '48765-2'). ValidVersions = [2.73]; The code provided (http://loinc.org#48765-2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.73", - "code" : "57852-6", - "display" : "Problem list Narrative - Reported" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Problem list Narrative - Reported", - "code" : "57852-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/snomed.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/snomed.cache index 4c4b5ba71..6871f0af8 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/snomed.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/snomed.cache @@ -516,7 +516,7 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/11000172109/version/20210915", + "version" : "http://snomed.info/sct/11000172109/version/20220315", "code" : "271872005", "display" : "Old age (qualifier value)" }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -531,8 +531,9 @@ v: { "code" : "271872005" }, "url": "https://fhir.kbv.de/ValueSet/KBV_VS_Base_Stage_Life--0", "version": "1.2.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { - "severity" : "error", - "error" : "The code system \"http://snomed.info/sct\" in the include in \"https://fhir.kbv.de/ValueSet/KBV_VS_Base_Stage_Life--0\" is not known; The code provided (http://snomed.info/sct#271872005) is not valid (from http://tx.fhir.org/r4)" + "display" : "Old age (qualifier value)", + "code" : "271872005", + "system" : "http://snomed.info/sct" } ------------------------------------------------------------------------------------- {"code" : { @@ -546,6 +547,28 @@ v: { "system" : "http://snomed.info/sct" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "10828004", + "display" : "Positive (qualifier value)" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Positive", + "code" : "10828004", + "system" : "http://snomed.info/sct" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://snomed.info/sct", + "code" : "233588003", + "display" : "Continuous hemodiafiltration" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Continuous hemodiafiltration", + "code" : "233588003", + "system" : "http://snomed.info/sct" +} +------------------------------------------------------------------------------------- {"code" : { "system" : "http://snomed.info/sct", "code" : "442311008", @@ -621,7 +644,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -655,7 +678,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -665,7 +688,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -686,7 +709,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 10291000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"10291000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10291000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 10291000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"10291000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10291000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -707,7 +730,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8901000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8901000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8901000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8901000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8901000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8901000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -728,7 +751,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8911000202100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8911000202100\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8911000202100) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8911000202100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8911000202100\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8911000202100) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -749,7 +772,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8891000202103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8891000202103\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8891000202103) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8891000202103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8891000202103\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8891000202103) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -810,7 +833,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 15991000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"15991000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#15991000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 15991000202102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"15991000202102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#15991000202102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1251,7 +1274,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 10821000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"10821000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#10821000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1491,7 +1514,7 @@ v: { }, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'No-procedure-performer-function' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'No-procedure-performer-function' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1500,7 +1523,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8921000202108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8921000202108\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8921000202108) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1627,7 +1650,7 @@ v: { }, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'No-procedure-performer-function' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'No-procedure-performer-function' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1636,7 +1659,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 8951000202101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"8951000202101\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#8951000202101) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1720,7 +1743,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Version 'http://snomed.info/sct/900000000000207008/version/20210331' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '459231000124102'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20210915,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20210630,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220301,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200131,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20220131,http://snomed.info/sct/900000000000207008/version/20220331]; The code provided (http://snomed.info/sct#459231000124102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "error" : "Version 'http://snomed.info/sct/900000000000207008/version/20210331' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '459231000124102'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20220315,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20220731,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220901,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20210731,http://snomed.info/sct/900000000000207008/version/20220731]; The code provided (http://snomed.info/sct#459231000124102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", "class" : "CODESYSTEM_UNSUPPORTED" } ------------------------------------------------------------------------------------- @@ -1766,7 +1789,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 35901911000001104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"35901911000001104\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#35901911000001104) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 35901911000001104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"35901911000001104\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#35901911000001104) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1799,7 +1822,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Unable to find code 39695211000001102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"39695211000001102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#39695211000001102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 39695211000001102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"39695211000001102\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#39695211000001102) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1808,7 +1831,7 @@ v: { }, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### v: { "severity" : "error", - "error" : "Unable to find code 1 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"1\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" + "error" : "Unable to find code 1 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"1\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#1) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -1817,51 +1840,6 @@ v: { }, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### v: { "severity" : "error", - "error" : "Unable to find code 2 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220331); The code \"2\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/11000172109/version/20220315", - "code" : "271872005", - "display" : "Old age (qualifier value)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Old age", - "code" : "271872005", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "10828004", - "display" : "Positive (qualifier value)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Positive", - "code" : "10828004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "233588003", - "display" : "Continuous hemodiafiltration" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Continuous hemodiafiltration", - "code" : "233588003", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "17621005", - "display" : "Normal (qualifier value)" -}, "url": "http://hl7.org/fhir/ValueSet/security-labels", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "17621005", - "system" : "http://snomed.info/sct" + "error" : "Unable to find code 2 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20220731); The code \"2\" is not valid in the system http://snomed.info/sct; The code provided (http://snomed.info/sct#2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ucum.cache index fc21403db..222379509 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ucum.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ucum.cache @@ -107,6 +107,16 @@ v: { "error" : "The code provided (http://unitsofmeasure.org#m) is not valid (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://unitsofmeasure.org", + "code" : "/min" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "/min", + "code" : "/min", + "system" : "http://unitsofmeasure.org" +} +------------------------------------------------------------------------------------- {"code" : { "system" : "http://unitsofmeasure.org", "code" : "mg" @@ -176,13 +186,3 @@ v: { "system" : "http://unitsofmeasure.org" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "/min" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "/min", - "code" : "/min", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.capabilityStatement.cache index 433ddb184..0c9fedfc4 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.capabilityStatement.cache @@ -12,7 +12,7 @@ "version" : "4.0.1-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-06-17T22:07:43.178Z", + "date" : "2022-09-15T13:27:05.487Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.terminologyCapabilities.cache index 42c364c4d..d1f5aa73b 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.terminologyCapabilities.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.terminologyCapabilities.cache @@ -5,7 +5,7 @@ "version" : "1.0.0", "name" : "FHIR Reference Server Teminology Capability Statement", "status" : "active", - "date" : "2022-06-17T22:07:43.413Z", + "date" : "2022-09-12T07:14:02.176Z", "contact" : [{ "telecom" : [{ "system" : "other", @@ -865,6 +865,9 @@ { "uri" : "http://nucc.org/provider-taxonomy" }, + { + "uri" : "http://radlex.org" + }, { "uri" : "http://snomed.info/sct" }, @@ -1267,6 +1270,9 @@ { "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" }, + { + "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3" + }, { "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" }, diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.capabilityStatement.cache deleted file mode 100644 index d8124af61..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.capabilityStatement.cache +++ /dev/null @@ -1,66 +0,0 @@ -{ - "resourceType" : "CapabilityStatement", - "id" : "FhirServer", - "meta" : { - "tag" : [{ - "system" : "http://hl7.org/fhir/v3/ObservationValue", - "code" : "SUBSETTED", - "display" : "Subsetted" - }] - }, - "url" : "http://tx.fhir.org/r4/metadata", - "version" : "4.0.1-2.0.14", - "name" : "FHIR Reference Server Conformance Statement", - "status" : "active", - "date" : "2022-06-17T22:03:23.787Z", - "contact" : [{ - "telecom" : [{ - "system" : "other", - "value" : "http://healthintersections.com.au/" - }] - }], - "kind" : "instance", - "instantiates" : ["http://hl7.org/fhir/CapabilityStatement/terminology-server"], - "software" : { - "name" : "Reference Server", - "version" : "2.0.14", - "releaseDate" : "2022-05-13T19:50:55.040Z" - }, - "implementation" : { - "description" : "FHIR Server running at http://tx.fhir.org/r4", - "url" : "http://tx.fhir.org/r4" - }, - "fhirVersion" : "4.0.1", - "format" : ["application/fhir+xml", - "application/fhir+json"], - "rest" : [{ - "mode" : "server", - "security" : { - "cors" : true - }, - "operation" : [{ - "name" : "expand", - "definition" : "http://hl7.org/fhir/OperationDefinition/ValueSet-expand" - }, - { - "name" : "lookup", - "definition" : "http://hl7.org/fhir/OperationDefinition/ValueSet-lookup" - }, - { - "name" : "validate-code", - "definition" : "http://hl7.org/fhir/OperationDefinition/Resource-validate" - }, - { - "name" : "translate", - "definition" : "http://hl7.org/fhir/OperationDefinition/ConceptMap-translate" - }, - { - "name" : "closure", - "definition" : "http://hl7.org/fhir/OperationDefinition/ConceptMap-closure" - }, - { - "name" : "versions", - "definition" : "http://tx.fhir.org/r4/OperationDefinition/fso-versions" - }] - }] -} \ No newline at end of file diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.terminologyCapabilities.cache deleted file mode 100644 index c00ed0a48..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/.terminologyCapabilities.cache +++ /dev/null @@ -1,3587 +0,0 @@ -{ - "resourceType" : "TerminologyCapabilities", - "id" : "FhirServer", - "url" : "http://tx.fhir.org/r4/metadata", - "version" : "1.0.0", - "name" : "FHIR Reference Server Teminology Capability Statement", - "status" : "active", - "date" : "2022-06-17T22:03:23.912Z", - "contact" : [{ - "telecom" : [{ - "system" : "other", - "value" : "http://healthintersections.com.au/" - }] - }], - "description" : "Standard Teminology Capability Statement for the open source Reference FHIR Server provided by Health Intersections", - "codeSystem" : [{ - "uri" : "http://cds-hooks.hl7.org/CodeSystem/indicator" - }, - { - "uri" : "http://devices.fhir.org/CodeSystem/MDC-concept-status" - }, - { - "uri" : "http://devices.fhir.org/CodeSystem/MDC-designation-use" - }, - { - "uri" : "http://dicom.nema.org/resources/ontology/DCM" - }, - { - "uri" : "http://fdasis.nlm.nih.gov" - }, - { - "uri" : "http://healthit.gov/nhin/purposeofuse" - }, - { - "uri" : "http://hl7.org/fhir/abstract-types" - }, - { - "uri" : "http://hl7.org/fhir/account-status" - }, - { - "uri" : "http://hl7.org/fhir/action-cardinality-behavior" - }, - { - "uri" : "http://hl7.org/fhir/action-condition-kind" - }, - { - "uri" : "http://hl7.org/fhir/action-grouping-behavior" - }, - { - "uri" : "http://hl7.org/fhir/action-participant-type" - }, - { - "uri" : "http://hl7.org/fhir/action-precheck-behavior" - }, - { - "uri" : "http://hl7.org/fhir/action-relationship-type" - }, - { - "uri" : "http://hl7.org/fhir/action-required-behavior" - }, - { - "uri" : "http://hl7.org/fhir/action-selection-behavior" - }, - { - "uri" : "http://hl7.org/fhir/additionalmaterials" - }, - { - "uri" : "http://hl7.org/fhir/address-type" - }, - { - "uri" : "http://hl7.org/fhir/address-use" - }, - { - "uri" : "http://hl7.org/fhir/administrative-gender" - }, - { - "uri" : "http://hl7.org/fhir/adverse-event-actuality" - }, - { - "uri" : "http://hl7.org/fhir/allergy-intolerance-category" - }, - { - "uri" : "http://hl7.org/fhir/allergy-intolerance-criticality" - }, - { - "uri" : "http://hl7.org/fhir/allergy-intolerance-type" - }, - { - "uri" : "http://hl7.org/fhir/animal-genderstatus" - }, - { - "uri" : "http://hl7.org/fhir/animal-species" - }, - { - "uri" : "http://hl7.org/fhir/appointmentstatus" - }, - { - "uri" : "http://hl7.org/fhir/assert-direction-codes" - }, - { - "uri" : "http://hl7.org/fhir/assert-operator-codes" - }, - { - "uri" : "http://hl7.org/fhir/assert-response-code-types" - }, - { - "uri" : "http://hl7.org/fhir/asset-availability" - }, - { - "uri" : "http://hl7.org/fhir/audit-event-action" - }, - { - "uri" : "http://hl7.org/fhir/audit-event-outcome" - }, - { - "uri" : "http://hl7.org/fhir/binding-strength" - }, - { - "uri" : "http://hl7.org/fhir/bundle-type" - }, - { - "uri" : "http://hl7.org/fhir/capability-statement-kind" - }, - { - "uri" : "http://hl7.org/fhir/care-plan-activity-status" - }, - { - "uri" : "http://hl7.org/fhir/care-team-status" - }, - { - "uri" : "http://hl7.org/fhir/chargeitem-status" - }, - { - "uri" : "http://hl7.org/fhir/claim-use" - }, - { - "uri" : "http://hl7.org/fhir/code-search-support" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/example" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-intent" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-status" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/medication-status" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/status" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/summary" - }, - { - "uri" : "http://hl7.org/fhir/CodeSystem/task-code" - }, - { - "uri" : "http://hl7.org/fhir/codesystem-content-mode" - }, - { - "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning" - }, - { - "uri" : "http://hl7.org/fhir/compartment-type" - }, - { - "uri" : "http://hl7.org/fhir/composition-attestation-mode" - }, - { - "uri" : "http://hl7.org/fhir/composition-status" - }, - { - "uri" : "http://hl7.org/fhir/concept-map-equivalence" - }, - { - "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode" - }, - { - "uri" : "http://hl7.org/fhir/concept-properties" - }, - { - "uri" : "http://hl7.org/fhir/concept-property-type" - }, - { - "uri" : "http://hl7.org/fhir/concept-subsumption-outcome" - }, - { - "uri" : "http://hl7.org/fhir/conditional-delete-status" - }, - { - "uri" : "http://hl7.org/fhir/conditional-read-status" - }, - { - "uri" : "http://hl7.org/fhir/consent-data-meaning" - }, - { - "uri" : "http://hl7.org/fhir/consentperformer" - }, - { - "uri" : "http://hl7.org/fhir/consent-provision-type" - }, - { - "uri" : "http://hl7.org/fhir/consent-state-codes" - }, - { - "uri" : "http://hl7.org/fhir/constraint-severity" - }, - { - "uri" : "http://hl7.org/fhir/contact-point-system" - }, - { - "uri" : "http://hl7.org/fhir/contact-point-use" - }, - { - "uri" : "http://hl7.org/fhir/contract-action-status" - }, - { - "uri" : "http://hl7.org/fhir/contract-asset-context" - }, - { - "uri" : "http://hl7.org/fhir/contract-asset-scope" - }, - { - "uri" : "http://hl7.org/fhir/contract-asset-subtype" - }, - { - "uri" : "http://hl7.org/fhir/contract-asset-type" - }, - { - "uri" : "http://hl7.org/fhir/contract-decision-mode" - }, - { - "uri" : "http://hl7.org/fhir/contract-definition-subtype" - }, - { - "uri" : "http://hl7.org/fhir/contract-definition-type" - }, - { - "uri" : "http://hl7.org/fhir/contract-expiration-type" - }, - { - "uri" : "http://hl7.org/fhir/contract-legalstate" - }, - { - "uri" : "http://hl7.org/fhir/contract-party-role" - }, - { - "uri" : "http://hl7.org/fhir/contract-publicationstatus" - }, - { - "uri" : "http://hl7.org/fhir/contract-scope" - }, - { - "uri" : "http://hl7.org/fhir/contract-security-category" - }, - { - "uri" : "http://hl7.org/fhir/contract-security-classification" - }, - { - "uri" : "http://hl7.org/fhir/contract-security-control" - }, - { - "uri" : "http://hl7.org/fhir/contract-status" - }, - { - "uri" : "http://hl7.org/fhir/contributor-type" - }, - { - "uri" : "http://hl7.org/fhir/data-types" - }, - { - "uri" : "http://hl7.org/fhir/days-of-week" - }, - { - "uri" : "http://hl7.org/fhir/definition-resource-types" - }, - { - "uri" : "http://hl7.org/fhir/detectedissue-severity" - }, - { - "uri" : "http://hl7.org/fhir/device-action" - }, - { - "uri" : "http://hl7.org/fhir/device-definition-status" - }, - { - "uri" : "http://hl7.org/fhir/device-nametype" - }, - { - "uri" : "http://hl7.org/fhir/device-statement-status" - }, - { - "uri" : "http://hl7.org/fhir/device-status" - }, - { - "uri" : "http://hl7.org/fhir/diagnostic-report-status" - }, - { - "uri" : "http://hl7.org/fhir/discriminator-type" - }, - { - "uri" : "http://hl7.org/fhir/document-mode" - }, - { - "uri" : "http://hl7.org/fhir/document-reference-status" - }, - { - "uri" : "http://hl7.org/fhir/document-relationship-type" - }, - { - "uri" : "http://hl7.org/fhir/eligibilityrequest-purpose" - }, - { - "uri" : "http://hl7.org/fhir/eligibilityresponse-purpose" - }, - { - "uri" : "http://hl7.org/fhir/encounter-location-status" - }, - { - "uri" : "http://hl7.org/fhir/encounter-status" - }, - { - "uri" : "http://hl7.org/fhir/endpoint-status" - }, - { - "uri" : "http://hl7.org/fhir/episode-of-care-status" - }, - { - "uri" : "http://hl7.org/fhir/event-capability-mode" - }, - { - "uri" : "http://hl7.org/fhir/event-resource-types" - }, - { - "uri" : "http://hl7.org/fhir/event-status" - }, - { - "uri" : "http://hl7.org/fhir/event-timing" - }, - { - "uri" : "http://hl7.org/fhir/examplescenario-actor-type" - }, - { - "uri" : "http://hl7.org/fhir/ex-claimitemtype" - }, - { - "uri" : "http://hl7.org/fhir/ex-fdi" - }, - { - "uri" : "http://hl7.org/fhir/ex-onsettype" - }, - { - "uri" : "http://hl7.org/fhir/ex-oralprostho" - }, - { - "uri" : "http://hl7.org/fhir/ex-pharmaservice" - }, - { - "uri" : "http://hl7.org/fhir/explanationofbenefit-status" - }, - { - "uri" : "http://hl7.org/fhir/exposure-state" - }, - { - "uri" : "http://hl7.org/fhir/expression-language" - }, - { - "uri" : "http://hl7.org/fhir/ex-servicemodifier" - }, - { - "uri" : "http://hl7.org/fhir/ex-serviceproduct" - }, - { - "uri" : "http://hl7.org/fhir/extension-context-type" - }, - { - "uri" : "http://hl7.org/fhir/extra-activity-type" - }, - { - "uri" : "http://hl7.org/fhir/ex-udi" - }, - { - "uri" : "http://hl7.org/fhir/feeding-device" - }, - { - "uri" : "http://hl7.org/fhir/FHIR-version" - }, - { - "uri" : "http://hl7.org/fhir/filter-operator" - }, - { - "uri" : "http://hl7.org/fhir/flag-priority-code" - }, - { - "uri" : "http://hl7.org/fhir/flag-status" - }, - { - "uri" : "http://hl7.org/fhir/fm-conditions" - }, - { - "uri" : "http://hl7.org/fhir/fm-status" - }, - { - "uri" : "http://hl7.org/fhir/gender-identity" - }, - { - "uri" : "http://hl7.org/fhir/goal-status" - }, - { - "uri" : "http://hl7.org/fhir/goal-status-reason" - }, - { - "uri" : "http://hl7.org/fhir/graph-compartment-rule" - }, - { - "uri" : "http://hl7.org/fhir/graph-compartment-use" - }, - { - "uri" : "http://hl7.org/fhir/group-measure" - }, - { - "uri" : "http://hl7.org/fhir/group-type" - }, - { - "uri" : "http://hl7.org/fhir/guidance-response-status" - }, - { - "uri" : "http://hl7.org/fhir/guide-page-generation" - }, - { - "uri" : "http://hl7.org/fhir/guide-parameter-code" - }, - { - "uri" : "http://hl7.org/fhir/history-status" - }, - { - "uri" : "http://hl7.org/fhir/http-operations" - }, - { - "uri" : "http://hl7.org/fhir/http-verb" - }, - { - "uri" : "http://hl7.org/fhir/identifier-use" - }, - { - "uri" : "http://hl7.org/fhir/identity-assuranceLevel" - }, - { - "uri" : "http://hl7.org/fhir/imagingstudy-status" - }, - { - "uri" : "http://hl7.org/fhir/intervention" - }, - { - "uri" : "http://hl7.org/fhir/invoice-priceComponentType" - }, - { - "uri" : "http://hl7.org/fhir/invoice-status" - }, - { - "uri" : "http://hl7.org/fhir/issue-severity" - }, - { - "uri" : "http://hl7.org/fhir/issue-type" - }, - { - "uri" : "http://hl7.org/fhir/item-type" - }, - { - "uri" : "http://hl7.org/fhir/knowledge-resource-types" - }, - { - "uri" : "http://hl7.org/fhir/language-preference-type" - }, - { - "uri" : "http://hl7.org/fhir/linkage-type" - }, - { - "uri" : "http://hl7.org/fhir/link-type" - }, - { - "uri" : "http://hl7.org/fhir/list-mode" - }, - { - "uri" : "http://hl7.org/fhir/list-status" - }, - { - "uri" : "http://hl7.org/fhir/location-mode" - }, - { - "uri" : "http://hl7.org/fhir/location-status" - }, - { - "uri" : "http://hl7.org/fhir/map-context-type" - }, - { - "uri" : "http://hl7.org/fhir/map-group-type-mode" - }, - { - "uri" : "http://hl7.org/fhir/map-input-mode" - }, - { - "uri" : "http://hl7.org/fhir/map-model-mode" - }, - { - "uri" : "http://hl7.org/fhir/map-source-list-mode" - }, - { - "uri" : "http://hl7.org/fhir/map-target-list-mode" - }, - { - "uri" : "http://hl7.org/fhir/map-transform" - }, - { - "uri" : "http://hl7.org/fhir/measure-report-status" - }, - { - "uri" : "http://hl7.org/fhir/measure-report-type" - }, - { - "uri" : "http://hl7.org/fhir/message-events" - }, - { - "uri" : "http://hl7.org/fhir/messageheader-response-request" - }, - { - "uri" : "http://hl7.org/fhir/message-significance-category" - }, - { - "uri" : "http://hl7.org/fhir/metric-calibration-state" - }, - { - "uri" : "http://hl7.org/fhir/metric-calibration-type" - }, - { - "uri" : "http://hl7.org/fhir/metric-category" - }, - { - "uri" : "http://hl7.org/fhir/metric-color" - }, - { - "uri" : "http://hl7.org/fhir/metric-operational-status" - }, - { - "uri" : "http://hl7.org/fhir/name-use" - }, - { - "uri" : "http://hl7.org/fhir/namingsystem-identifier-type" - }, - { - "uri" : "http://hl7.org/fhir/namingsystem-type" - }, - { - "uri" : "http://hl7.org/fhir/narrative-status" - }, - { - "uri" : "http://hl7.org/fhir/network-type" - }, - { - "uri" : "http://hl7.org/fhir/note-type" - }, - { - "uri" : "http://hl7.org/fhir/observation-range-category" - }, - { - "uri" : "http://hl7.org/fhir/observation-status" - }, - { - "uri" : "http://hl7.org/fhir/operation-kind" - }, - { - "uri" : "http://hl7.org/fhir/operation-parameter-use" - }, - { - "uri" : "http://hl7.org/fhir/organization-role" - }, - { - "uri" : "http://hl7.org/fhir/orientation-type" - }, - { - "uri" : "http://hl7.org/fhir/participantrequired" - }, - { - "uri" : "http://hl7.org/fhir/participationstatus" - }, - { - "uri" : "http://hl7.org/fhir/permitted-data-type" - }, - { - "uri" : "http://hl7.org/fhir/practitioner-specialty" - }, - { - "uri" : "http://hl7.org/fhir/procedure-progress-status-code" - }, - { - "uri" : "http://hl7.org/fhir/product-category" - }, - { - "uri" : "http://hl7.org/fhir/product-status" - }, - { - "uri" : "http://hl7.org/fhir/product-storage-scale" - }, - { - "uri" : "http://hl7.org/fhir/property-representation" - }, - { - "uri" : "http://hl7.org/fhir/provenance-entity-role" - }, - { - "uri" : "http://hl7.org/fhir/provenance-participant-role" - }, - { - "uri" : "http://hl7.org/fhir/publication-status" - }, - { - "uri" : "http://hl7.org/fhir/quality-type" - }, - { - "uri" : "http://hl7.org/fhir/quantity-comparator" - }, - { - "uri" : "http://hl7.org/fhir/questionnaire-answers-status" - }, - { - "uri" : "http://hl7.org/fhir/questionnaire-display-category" - }, - { - "uri" : "http://hl7.org/fhir/questionnaire-enable-behavior" - }, - { - "uri" : "http://hl7.org/fhir/questionnaire-enable-operator" - }, - { - "uri" : "http://hl7.org/fhir/questionnaire-item-control" - }, - { - "uri" : "http://hl7.org/fhir/reaction-event-severity" - }, - { - "uri" : "http://hl7.org/fhir/reason-medication-not-given" - }, - { - "uri" : "http://hl7.org/fhir/reference-handling-policy" - }, - { - "uri" : "http://hl7.org/fhir/reference-version-rules" - }, - { - "uri" : "http://hl7.org/fhir/related-artifact-type" - }, - { - "uri" : "http://hl7.org/fhir/relationship" - }, - { - "uri" : "http://hl7.org/fhir/relation-type" - }, - { - "uri" : "http://hl7.org/fhir/remittance-outcome" - }, - { - "uri" : "http://hl7.org/fhir/report-action-result-codes" - }, - { - "uri" : "http://hl7.org/fhir/report-participant-type" - }, - { - "uri" : "http://hl7.org/fhir/report-result-codes" - }, - { - "uri" : "http://hl7.org/fhir/report-status-codes" - }, - { - "uri" : "http://hl7.org/fhir/repository-type" - }, - { - "uri" : "http://hl7.org/fhir/request-intent" - }, - { - "uri" : "http://hl7.org/fhir/request-priority" - }, - { - "uri" : "http://hl7.org/fhir/request-resource-types" - }, - { - "uri" : "http://hl7.org/fhir/request-status" - }, - { - "uri" : "http://hl7.org/fhir/research-element-type" - }, - { - "uri" : "http://hl7.org/fhir/research-study-status" - }, - { - "uri" : "http://hl7.org/fhir/research-subject-status" - }, - { - "uri" : "http://hl7.org/fhir/resource-aggregation-mode" - }, - { - "uri" : "http://hl7.org/fhir/resource-slicing-rules" - }, - { - "uri" : "http://hl7.org/fhir/resource-status" - }, - { - "uri" : "http://hl7.org/fhir/resource-types" - }, - { - "uri" : "http://hl7.org/fhir/resource-validation-mode" - }, - { - "uri" : "http://hl7.org/fhir/response-code" - }, - { - "uri" : "http://hl7.org/fhir/restful-capability-mode" - }, - { - "uri" : "http://hl7.org/fhir/restful-interaction" - }, - { - "uri" : "http://hl7.org/fhir/search-comparator" - }, - { - "uri" : "http://hl7.org/fhir/search-entry-mode" - }, - { - "uri" : "http://hl7.org/fhir/search-modifier-code" - }, - { - "uri" : "http://hl7.org/fhir/search-param-type" - }, - { - "uri" : "http://hl7.org/fhir/search-xpath-usage" - }, - { - "uri" : "http://hl7.org/fhir/secondary-finding" - }, - { - "uri" : "http://hl7.org/fhir/sequence-type" - }, - { - "uri" : "http://hl7.org/fhir/sid/cvx" - }, - { - "uri" : "http://hl7.org/fhir/sid/ex-icd-10-procedures" - }, - { - "uri" : "http://hl7.org/fhir/sid/icd-10" - }, - { - "uri" : "http://hl7.org/fhir/sid/icd-10-cm" - }, - { - "uri" : "http://hl7.org/fhir/sid/icd-9-cm" - }, - { - "uri" : "http://hl7.org/fhir/sid/mvx" - }, - { - "uri" : "http://hl7.org/fhir/sid/ndc" - }, - { - "uri" : "http://hl7.org/fhir/slotstatus" - }, - { - "uri" : "http://hl7.org/fhir/sort-direction" - }, - { - "uri" : "http://hl7.org/fhir/spdx-license" - }, - { - "uri" : "http://hl7.org/fhir/specimen-contained-preference" - }, - { - "uri" : "http://hl7.org/fhir/specimen-status" - }, - { - "uri" : "http://hl7.org/fhir/strand-type" - }, - { - "uri" : "http://hl7.org/fhir/structure-definition-kind" - }, - { - "uri" : "http://hl7.org/fhir/subscription-channel-type" - }, - { - "uri" : "http://hl7.org/fhir/subscription-status" - }, - { - "uri" : "http://hl7.org/fhir/substance-status" - }, - { - "uri" : "http://hl7.org/fhir/supplydelivery-status" - }, - { - "uri" : "http://hl7.org/fhir/supplyrequest-status" - }, - { - "uri" : "http://hl7.org/fhir/task-intent" - }, - { - "uri" : "http://hl7.org/fhir/task-status" - }, - { - "uri" : "http://hl7.org/fhir/transaction-mode" - }, - { - "uri" : "http://hl7.org/fhir/trigger-type" - }, - { - "uri" : "http://hl7.org/fhir/type-derivation-rule" - }, - { - "uri" : "http://hl7.org/fhir/udi-entry-type" - }, - { - "uri" : "http://hl7.org/fhir/unknown-content-code" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/careplan-category" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/condition-category" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-observation-category" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-provenance-participant-type" - }, - { - "uri" : "http://hl7.org/fhir/us/core/CodeSystem/us-core-tags" - }, - { - "uri" : "http://hl7.org/fhir/variable-type" - }, - { - "uri" : "http://hl7.org/fhir/versioning-policy" - }, - { - "uri" : "http://hl7.org/fhir/vision-base-codes" - }, - { - "uri" : "http://hl7.org/fhir/vision-eye-codes" - }, - { - "uri" : "http://hl7.org/fhir/w3c-provenance-activity-type" - }, - { - "uri" : "http://ihe.net/fhir/ihe.formatcode.fhir/CodeSystem/formatcode" - }, - { - "uri" : "http://loinc.org" - }, - { - "uri" : "http://nucc.org/provider-taxonomy" - }, - { - "uri" : "http://snomed.info/sct" - }, - { - "uri" : "http://standardterms.edqm.eu" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/action-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/activity-definition-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adjudication" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adjudication-error" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adjudication-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/admit-source" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-causality-assess" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-causality-method" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-outcome" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-seriousness" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/adverse-event-severity" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/allerg-intol-substance-exp-risk" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/allergyintolerance-verification" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/applicability" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/appointment-cancellation-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/attribute-estimate-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/audit-entity-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/audit-event-outcome" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/audit-event-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/basic-resource-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/benefit-network" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/benefit-term" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/benefit-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/benefit-unit" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/can-push-updates" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/catalogType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/certainty-rating" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/certainty-subcomponent-rating" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/certainty-subcomponent-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/characteristic-method" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/chargeitem-billingcodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/choice-list-orientation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/claim-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/common-tags" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/communication-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/communication-not-done-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/communication-topic" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/composite-measure-scoring" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/composition-altcode-kind" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/conceptdomains" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/condition-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/condition-clinical" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/condition-state" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/condition-ver-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/conformance-expectation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/consentaction" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/consentcategorycodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/consentpolicycodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/consentscope" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/consentverification" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contactentity-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/container-cap" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contractaction" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contractsubtypecodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contracttermsubtypecodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/contract-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/coverage-class" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/definition-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/definition-topic" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/definition-use" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/device-status-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/diagnosis-role" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/dicom-audit-lifecycle" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/diet" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/directness" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/discharge-disposition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/dose-rate-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/effect-estimate-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/encounter-special-arrangements" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/encounter-subject-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/encounter-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/endpoint-connection-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/endpoint-payload-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/entformula-additive" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/episodeofcare-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/evidence-quality" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/evidence-variant-state" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-benefitcategory" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-claimsubtype" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-coverage-financial-exception" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosis-on-admission" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosisrelatedgroup" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-paymenttype" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-procedure-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-programcode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-providerqualification" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-relatedclaimrelationship" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-revenue-center" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-serviceplace" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/failure-action" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/FDI-surface" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/financialtaskcode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/financialtaskinputtype" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/flag-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/forms-codes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/fundsreserve" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/goal-acceptance-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/goal-achievement" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/goal-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/goal-priority" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/goal-relationship-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/guide-parameter-code" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/handling-condition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/history-absent-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/hl7-document-format-codes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-funding-source" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-origin" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-program-eligibility" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-recommendation-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/immunization-subpotent-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/implantStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/insurance-plan-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/iso-21089-lifecycle" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/library-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/list-empty-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/list-example-use-codes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/list-order" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/location-physical-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/match-grade" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/measure-data-usage" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/measure-improvement-notation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/measure-population" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/measure-scoring" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/measure-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/med-admin-perform-function" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/media-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/media-modality" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/media-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-location" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationknowledge-characteristic" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationknowledge-package-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationknowledge-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-admin-location" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-course-of-therapy" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/message-transport" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/missingtoothreason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/modifiers" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/name-assembly-order" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/need" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/nutrition-intake-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/object-role" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/observation-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/observation-statistics" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/operation-outcome" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/organization-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/parameter-group" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/participant-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/payeetype" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/payment-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/practitioner-role" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/precision-estimate-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/primary-source-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/processpriority" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/program" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/provenance-participant-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/push-type-available" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/question-max-occurs" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/questionnaire-usage-mode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/reaction-event-certainty" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/reason-medication-given" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/recommendation-strength" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/referencerange-meaning" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/rejection-criteria" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-study-objective-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-study-phase" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-study-prim-purp-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-study-reason-stopped" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-subject-milestone" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-subject-state" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/research-subject-state-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/resource-security-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/resource-type-link" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/restful-security-service" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/risk-estimate-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/risk-probability" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/security-source-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/service-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/service-provision-conditions" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/service-referral-method" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/service-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/smart-capabilities" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/special-values" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/standards-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/state-change-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/statistic-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/study-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/subscriber-relationship" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/subscription-channel-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/subscription-error" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/subscription-status-at-event" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/subscription-tag" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/substance-category" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/supply-item-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/supply-kind" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/supplyrequest-reason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/synthesis-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/testscript-operation-codes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/testscript-profile-destination-types" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/testscript-profile-origin-types" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/triggerEventID" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/usage-context-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/utg-concept-properties" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0001" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0002" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0003" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0004" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0005" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0006" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0006|2.1" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0006|2.4" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0007" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0008" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0009" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0012" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0017" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0023" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0027" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0033" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0034" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0038" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0043" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0048" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0052" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0061" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0062" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0063" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0065" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0066" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0069" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0070" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0074" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0076" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0078" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0080" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0083" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0085" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0091" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0092" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0098" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0100" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0102" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0103" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0104" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0105" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0106" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0107" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0108" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0109" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0116" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0119" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0121" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0122" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0123" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0124" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0126" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0127" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0128" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0130" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0131" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0133" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0135" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0136" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0137" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0140" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0141" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0142" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0144" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0145" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0146" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0147" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0148" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0149" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0150" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0153" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0155" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0156" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0157" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0158" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0159" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0160" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0161" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0162" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0163" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0164" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0165" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0166" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0167" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0168" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0169" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0170" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0173" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0174" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0175" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0177" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0178" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0179" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0180" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0181" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0183" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0185" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0187" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0189" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0190" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0191" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0193" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0200" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0201" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0202" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0203" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0204" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0205" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0206" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0207" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0208" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0209" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0210" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0211" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0213" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0214" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0215" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0216" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0217" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0220" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0223" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0224" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0225" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0227" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0228" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0229" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0230" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0231" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0232" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0234" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0235" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0236" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0237" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0238" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0239" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0240" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0241" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0242" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0243" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0247" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0248" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0250" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0251" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0252" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0253" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0254" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0255" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0256" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0257" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0258" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0259" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0260" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0261" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0262" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0263" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0265" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0267" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0268" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0269" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0270" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0271" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0272" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0273" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0275" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0276" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0277" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0278" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0279" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0280" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0281" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0282" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0283" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0284" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0286" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0287" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0290" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0291" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0292" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0294" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0298" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0299" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0301" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0305" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0309" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0311" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0315" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0316" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0317" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0321" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0322" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0323" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0324" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0325" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0326" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0329" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0330" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0331" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0332" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0334" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0335" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0336" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0337" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0338" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0339" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0344" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0350" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0351" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0353" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0354" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0355" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0356" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0357" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0359" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0360" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.3.1" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.7" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0363" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0364" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0365" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0366" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0367" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0368" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0369" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0370" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0371" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0372" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0373" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0374" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0375" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0376" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0377" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0383" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0384" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0387" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0388" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0389" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0391" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0391|2.4" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0391|2.6" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0392" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0393" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0394" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0395" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0396" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0397" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0398" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0401" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0402" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0403" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0404" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0406" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0409" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0411" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0415" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0416" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0417" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0418" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0421" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0422" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0423" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0424" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0425" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0426" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0427" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0428" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0429" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0430" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0431" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0432" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0433" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0434" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0435" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0436" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0437" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0438" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0440" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0441" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0442" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0443" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0444" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0445" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0450" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0455" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0456" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0457" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0459" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0460" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0465" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0466" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0468" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0469" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0470" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0472" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0473" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0474" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0475" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0477" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0478" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0480" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0482" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0483" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0484" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0485" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0487" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0488" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0489" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0490" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0491" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0492" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0493" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0494" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0495" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0496" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0497" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0498" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0499" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0500" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0501" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0502" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0503" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0504" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0505" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0506" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0507" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0508" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0510" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0511" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0513" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0514" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0516" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0517" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0518" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0520" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0523" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0524" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0527" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0528" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0529" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0530" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0532" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0534" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0535" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0536" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0538" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0540" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0544" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0547" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0548" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0550" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0553" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0554" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0555" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0556" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0557" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0558" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0559" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0560" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0561" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0562" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0564" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0565" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0566" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0569" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0570" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0571" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0572" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0615" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0616" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0617" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0618" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0625" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0634" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0642" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0651" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0653" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0657" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0659" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0667" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0669" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0682" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0702" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0717" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0719" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0725" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0728" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0731" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0734" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0739" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0742" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0749" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0755" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0757" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0759" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0761" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0763" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0776" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0778" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0790" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0793" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0806" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0818" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0834" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0868" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0871" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0881" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0882" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0894" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0895" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0904" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0905" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0906" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0907" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0909" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0912" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0914" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0916" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0917" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0918" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0919" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0920" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0921" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0922" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0923" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0924" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0925" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0926" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0927" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0933" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0935" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0936" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0937" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0938" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0939" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0940" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0942" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0945" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0946" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0948" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0949" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0950" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0951" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0970" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-0971" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-4000" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v2-tables" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AcknowledgementCondition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AcknowledgementDetailCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AcknowledgementDetailType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AcknowledgementType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActClass" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActExposureLevelCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActInvoiceElementModifier" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActMood" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActPriority" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActReason" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActRelationshipCheckpoint" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActRelationshipJoin" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActRelationshipSplit" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActRelationshipSubset" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActRelationshipType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActSite" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActUncertainty" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ActUSPrivacyLaw" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AddressPartType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AddressUse" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AdministrativeGender" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-AmericanIndianAlaskaNativeLanguages" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Calendar" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CalendarCycle" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CalendarType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Charset" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CodeSystem" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CodeSystemType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CodingRationale" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CommunicationFunctionType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-CompressionAlgorithm" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ConceptCodeRelationship" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ConceptGenerality" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ConceptProperty" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ConceptStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Confidentiality" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ContainerCap" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ContainerSeparator" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ContentProcessingMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ContextControl" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Country" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Currency" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-DataOperation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-DataType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Dentition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-DeviceAlertLevel" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-DocumentCompletion" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-DocumentStorage" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EditStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EducationLevel" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EmployeeJobClass" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EncounterAccident" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EncounterAcuity" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EncounterAdmissionSource" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EncounterReferralSource" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EncounterSpecialCourtesy" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityClass" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityDeterminer" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityHandling" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNamePartQualifier" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNamePartQualifierR2" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNamePartType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNamePartTypeR2" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUse" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUseR2" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityRisk" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EntityStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-EquipmentAlertLevel" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Ethnicity" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ExposureMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-GenderStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-GTSAbbreviation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HealthcareProviderTaxonomyHIPAA" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7ApprovalStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7CMETAttribution" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7CommitteeIDInRIM" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7ConformanceInclusion" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7ContextConductionStyle" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7DefinedRoseProperty" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7DocumentFormatCodes" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7ITSType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7ITSVersionCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7PublishingDomain" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7PublishingSection" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7PublishingSubSection" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7Realm" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7StandardVersionCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HL7UpdateMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7V3Conformance" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-hl7VoteResolution" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-HtmlLinkType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-IdentifierReliability" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-IdentifierScope" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-IntegrityCheckAlgorithm" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ISO3166-1retired" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ISO3166-2retired" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ISO3166-3retired" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-iso4217-HL7" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-LanguageAbilityMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-LanguageAbilityProficiency" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-LivingArrangement" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-LocalMarkupIgnore" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-LocalRemoteControlState" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ManagedParticipationStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MapRelationship" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MaritalStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MaterialForm" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MaterialType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MDFAttributeType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MdfHmdMetSourceType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MdfHmdRowType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MdfRmimRowType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MDFSubjectAreaPrefix" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-mediaType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MessageCondition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-MessageWaitingPriority" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ModifyIndicator" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-NullFlavor" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ObservationCategory" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ObservationMethod" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ObservationValue" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-orderableDrugForm" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-OrganizationNameType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ParameterizedDataType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationFunction" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationSignature" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ParticipationType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-PatientImportance" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-PaymentTerms" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-PersonDisabilityType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-policyHolderRole" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-PostalAddressUse" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ProbabilityDistributionType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ProcessingID" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ProcessingMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryParameterValue" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryPriority" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryQuantityUnit" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryRequestLimit" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryResponse" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-QueryStatusCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Race" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RelationalOperator" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RelationshipConjunction" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ReligiousAffiliation" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ResponseLevel" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ResponseModality" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-ResponseMode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RoleClass" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RoleCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RoleLinkStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RoleLinkType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RoleStatus" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-RouteOfAdministration" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-Sequencing" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-SetOperator" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-SpecimenType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-styleType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-substanceAdminSubstitution" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-SubstitutionCondition" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TableCellHorizontalAlign" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TableCellScope" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TableCellVerticalAlign" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TableFrame" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TableRules" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TargetAwareness" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TelecommunicationAddressUse" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TelecommunicationCapabilities" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TimingEvent" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TransmissionRelationshipTypeCode" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-TribalEntityUS" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-triggerEventID" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-URLScheme" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-VaccineManufacturer" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-VaccineType" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-VocabularyDomainQualifier" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/v3-WorkClassificationODH" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/validation-process" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/validation-status" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/validation-type" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/variable-role" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/variant-state" - }, - { - "uri" : "http://terminology.hl7.org/CodeSystem/verificationresult-communication-method" - }, - { - "uri" : "http://terminology.hl7.org/fhir/CodeSystem/medicationdispense-category" - }, - { - "uri" : "http://terminology.hl7.org/fhir/CodeSystem/medicationdispense-status-reason" - }, - { - "uri" : "http://unitsofmeasure.org" - }, - { - "uri" : "http://unstats.un.org/unsd/methods/m49/m49.htm" - }, - { - "uri" : "http://varnomen.hgvs.org" - }, - { - "uri" : "http://www.ada.org/snodent" - }, - { - "uri" : "http://www.nlm.nih.gov/research/umls/rxnorm" - }, - { - "uri" : "http://www.whocc.no/atc" - }, - { - "uri" : "https://www.cms.gov/Medicare/Medicare-Fee-for-Service-Payment/HospitalAcqCond/Coding" - }, - { - "uri" : "https://www.humanservices.gov.au/organisations/health-professionals/enablers/air-vaccine-code-formats" - }, - { - "uri" : "https://www.iana.org/time-zones" - }, - { - "uri" : "https://www.usps.com/" - }, - { - "uri" : "urn:ietf:bcp:13" - }, - { - "uri" : "urn:ietf:bcp:47" - }, - { - "uri" : "urn:ietf:rfc:3986" - }, - { - "uri" : "urn:iso:std:iso:11073:10101" - }, - { - "uri" : "urn:iso:std:iso:3166" - }, - { - "uri" : "urn:iso:std:iso:3166:-2" - }, - { - "uri" : "urn:iso:std:iso:4217" - }, - { - "uri" : "urn:iso-astm:E1762-95:2013" - }, - { - "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592" - }, - { - "uri" : "urn:oid:1.2.36.1.2001.1005.17" - }, - { - "uri" : "urn:oid:2.16.840.1.113883.2.9.6.2.7" - }, - { - "uri" : "urn:oid:2.16.840.1.113883.3.1937.98.5.8" - }], - "expansion" : { - "parameter" : [{ - "name" : "cache-id", - "documentation" : "This server supports caching terminology resources between calls. Clients only need to send value sets and codesystems once; there after tehy are automatically in scope for calls with the same cache-id. The cache is retained for 30 min from last call" - }, - { - "name" : "tx-resource", - "documentation" : "Additional valuesets needed for evaluation e.g. value sets referred to from the import statement of the value set being expanded" - }] - } -} \ No newline at end of file diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/all-systems.cache deleted file mode 100644 index d19f8c17b..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/all-systems.cache +++ /dev/null @@ -1,84 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/plain" -}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "text/plain", - "code" : "text/plain", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "271649006", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "271649006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "SYL" -}, "url": "http://hl7.org/fhir/ValueSet/name-v3-representation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Syllabic", - "code" : "SYL", - "system" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUse" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "IDE" -}, "url": "http://hl7.org/fhir/ValueSet/name-v3-representation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Ideographic", - "code" : "IDE", - "system" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUse" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "nl-NL" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.5.0", "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Nederlands (Nederland)", - "code" : "nl-NL", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/cql" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "CQL", - "code" : "text/cql", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/fhirpath" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "FHIRPath", - "code" : "text/fhirpath", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en-AU" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.5.0", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English (Australia)", - "code" : "en-AU", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English", - "code" : "en", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/http___www.whocc.no_atc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/http___www.whocc.no_atc.cache deleted file mode 100644 index 9cb0b874e..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/http___www.whocc.no_atc.cache +++ /dev/null @@ -1,14 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://www.whocc.no/atc", - "code" : "N02AA", - "display" : "Barbiturates and derivatives" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Natural opium alkaloids", - "code" : "N02AA", - "system" : "http://www.whocc.no/atc", - "severity" : "warning", - "error" : "The display \"Barbiturates and derivatives\" is not a valid display for the code {http://www.whocc.no/atc}N02AA - should be one of ['Natural opium alkaloids'] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/icd-9-cm.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/icd-9-cm.cache deleted file mode 100644 index e4d85cbe8..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/icd-9-cm.cache +++ /dev/null @@ -1,11 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://hl7.org/fhir/sid/icd-9-cm", - "code" : "99.00" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Perioperative autologous transfusion of whole blood or blood components", - "code" : "99.00", - "system" : "http://hl7.org/fhir/sid/icd-9-cm" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/loinc.cache deleted file mode 100644 index 9a2431688..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/loinc.cache +++ /dev/null @@ -1,506 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9", - "display" : "Blood pressure panel with all children optional" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "Systolic blood pressure" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "Diastolic blood pressure" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9", - "display" : "Blood pressure panel with all children optional" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "Diastolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.72]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.72]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '48765-2'). ValidVersions = [2.72]; The code provided (http://loinc.org#48765-2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Allergies and adverse reactions Document", - "code" : "48765-2", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"Allergies and adverse reactions\" is not a valid display for the code {http://loinc.org}48765-2 - should be one of ['Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 变态反应与不良反应 文档.其他' (zh-CN), '杂项类文档' (zh-CN), '其他文档 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 杂项' (zh-CN), '杂项类' (zh-CN), '杂项试验 过敏反应' (zh-CN), '过敏' (zh-CN), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Allergies and adverse reactions Document", - "code" : "48765-2", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"Allergies and adverse reactions\" is not a valid display for the code {http://loinc.org}48765-2 - should be one of ['Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 变态反应与不良反应 文档.其他' (zh-CN), '杂项类文档' (zh-CN), '其他文档 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 杂项' (zh-CN), '杂项类' (zh-CN), '杂项试验 过敏反应' (zh-CN), '过敏' (zh-CN), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5", - "display" : "Discharge Summary" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "29299-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Reason for visit Narrative", - "code" : "29299-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "�g��", - "display" : "8302-2" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code \"�g��\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#�g��) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8867-4", - "display" : "Heart rate" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Heart rate", - "code" : "8867-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "883-9", - "display" : "ABO group [Type] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "ABO group [Type] in Blood", - "code" : "883-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "10331-7", - "display" : "Rh [Type] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Rh [Type] in Blood", - "code" : "10331-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18684-1", - "display" : "����" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "First Blood pressure Set", - "code" : "18684-1", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"����\" is not a valid display for the code {http://loinc.org}18684-1 - should be one of ['First Blood pressure Set', '', 'ED Health Insurance Portability and Accountability Act of 1996' (zh-CN), 'HIPAA' (zh-CN), '健康保險可攜與責任法' (zh-CN), 'HIPAA法案' (zh-CN), '健康保险可移植性和问责法1996年' (zh-CN), '美国健康保险携带和责任法案' (zh-CN), '医疗保险便携性和责任法案' (zh-CN), '医疗保险便携性与责任法案' (zh-CN), '醫療保險可攜性與責任法' (zh-CN), 'HIPAA 信息附件.急诊' (zh-CN), 'HIPAA 信息附件.急诊科' (zh-CN), 'HIPAA 信息附件.急诊科就医' (zh-CN), 'HIPAA 信息附件.急诊科就诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊 临床信息附件集' (zh-CN), '临床信息附件集合' (zh-CN), '集' (zh-CN), '集合 信息附件' (zh-CN), '健康保险便携与责任法案信息附件' (zh-CN), '附件 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 压强 复合属性' (zh-CN), '复杂型属性' (zh-CN), '复杂属性 就医' (zh-CN), '就医过程 急诊科 急诊科（DEEDS）变量' (zh-CN), 'DEEDS 变量' (zh-CN), '急诊' (zh-CN), '急诊科' (zh-CN), 'Emergency Department' (zh-CN), 'ED' (zh-CN), '急诊科（急诊科系统代码之数据元素）变量' (zh-CN), '急诊科（急诊科系统代码之数据元素）指标' (zh-CN), '急诊科（美国CDC急诊科系统代码之数据元素）指标' (zh-CN), '急诊科指标 急诊科（Emergency Department，ED） 急诊部 第一个' (zh-CN), '第一次' (zh-CN), '首个' (zh-CN), '首次 血' (zh-CN), '全血' (zh-CN), 'Allegato Allegato di reparto di emergenza (pronto soccorso) Complesso Emergenza (DEEDS - Data Elements for Emergency Dep Incontro' (it-IT), 'Appuntamento paziente Stabilito' (it-IT), 'Fissato' (it-IT), 'Встреча Комплекс' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "���k������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"���k������\" is not a valid display for the code {http://loinc.org}8480-6 - should be one of ['Systolic blood pressure', 'BP sys', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内收缩期' (zh-CN), '血管内心缩期 血管内的' (zh-CN), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'BP systolic' (pt-BR), 'Blood pressure systolic' (pt-BR), 'Sys BP' (pt-BR), 'SBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck systolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "�g��������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"�g��������\" is not a valid display for the code {http://loinc.org}8462-4 - should be one of ['Diastolic blood pressure', 'BP dias', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内心舒期' (zh-CN), '血管内舒张期 血管内的' (zh-CN), 'Dias' (pt-BR), 'Diast' (pt-BR), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'Diastoli' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'Blood pressure diastolic' (pt-BR), 'BP diastolic' (pt-BR), 'Dias BP' (pt-BR), 'DBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Внутрисосудистый диастолический Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck diastolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "718-7", - "display" : "Hemoglobin [Mass/volume] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Hemoglobin [Mass/volume] in Blood", - "code" : "718-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "38483-4", - "display" : "Creat Bld-mCnc" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Creatinine [Mass/volume] in Blood", - "code" : "38483-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "2093-3", - "display" : "Cholesterol [Mass/volume] in Serum or Plasma" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol [Mass/volume] in Serum or Plasma", - "code" : "2093-3", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "3151-8", - "display" : "ingeademde O2" -}, "valueSet" :null, "lang":"en", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Inhaled oxygen flow rate", - "code" : "3151-8", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"ingeademde O2\" is not a valid display for the code {http://loinc.org}3151-8 - should be one of ['Inhaled oxygen flow rate', 'Inhaled O2 flow rate', '', 'O2' (zh-CN), 'tO2' (zh-CN), '总氧' (zh-CN), '氧气 体积速率(单位时间)' (zh-CN), '单位时间内体积的变化速率' (zh-CN), '流量 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 吸入气' (zh-CN), '吸入气体' (zh-CN), '吸入的空气 所吸入的氧' (zh-CN), '已吸入的氧气 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 气 气体类 空气' (zh-CN), 'Inhaled O2' (pt-BR), 'vRate' (pt-BR), 'Volume rate' (pt-BR), 'Flow' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'IhG' (pt-BR), 'Inhaled Gas' (pt-BR), 'Inspired' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'Gases' (pt-BR), 'Clinico Gas inalati Punto nel tempo (episodio) Tasso di Volume' (it-IT), 'Количественный Объемная скорость Точка во времени' (ru-RU), 'Момент' (ru-RU), 'ingeademde O2' (nl-NL), 'O2-Zufuhr' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "3151-8", - "display" : "ingeademde O2" -}, "valueSet" :null, "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "ingeademde O2", - "code" : "3151-8", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "35200-5", - "display" : "Cholesterol [Moles/​volume] in Serum or Plasma" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol [Mass or Moles/volume] in Serum or Plasma", - "code" : "35200-5", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"Cholesterol [Moles/​volume] in Serum or Plasma\" is not a valid display for the code {http://loinc.org}35200-5 - should be one of ['Cholesterol [Mass or Moles/volume] in Serum or Plasma', 'Cholest SerPl-msCnc', '', '化学' (zh-CN), '化学检验项目' (zh-CN), '化学检验项目类' (zh-CN), '化学类' (zh-CN), '化学试验' (zh-CN), '非刺激耐受型化学检验项目' (zh-CN), '非刺激耐受型化学检验项目类' (zh-CN), '非刺激耐受型化学试验' (zh-CN), '非刺激耐受型化学试验类 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 总胆固醇' (zh-CN), '胆固醇总计' (zh-CN), '胆甾醇' (zh-CN), '脂类' (zh-CN), '脂质 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血清或血浆 质量或摩尔浓度' (zh-CN), '质量或摩尔浓度(单位体积)' (zh-CN), '质量或物质的量浓度(单位体积)' (zh-CN), 'Juhuslik Kvantitatiivne Plasma Seerum Seerum või plasma' (et-EE), 'Cholest' (pt-BR), 'Chol' (pt-BR), 'Choles' (pt-BR), 'Lipid' (pt-BR), 'Cholesterol total' (pt-BR), 'Cholesterols' (pt-BR), 'Level' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'SerPl' (pt-BR), 'SerPlas' (pt-BR), 'SerP' (pt-BR), 'Serum' (pt-BR), 'SR' (pt-BR), 'Plasma' (pt-BR), 'Pl' (pt-BR), 'Plsm' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'Chemistry' (pt-BR), 'Chimica Concentrazione Sostanza o Massa Plasma Punto nel tempo (episodio) Siero Siero o Plasma' (it-IT), 'Количественный Массовая или Молярная Концентрация Плазма Сыворотка Сыворотка или Плазма Точка во времени' (ru-RU), 'Момент Холестерин' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "13457-7", - "display" : "Cholesterol in LDL [Mass/volume] in Serum or Plasma by calculation" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol in LDL [Mass/volume] in Serum or Plasma by calculation", - "code" : "13457-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "29463-7", - "display" : "Body Weight" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Body weight", - "code" : "29463-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "29463-7", - "display" : "Body Weight" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Body weight", - "code" : "29463-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "35200-5", - "display" : "Cholest SerPl-msCnc" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol [Mass or Moles/volume] in Serum or Plasma", - "code" : "35200-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "35217-9", - "display" : "Triglyceride [Moles/​volume] in Serum or Plasma" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Triglyceride [Mass or Moles/volume] in Serum or Plasma", - "code" : "35217-9", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"Triglyceride [Moles/​volume] in Serum or Plasma\" is not a valid display for the code {http://loinc.org}35217-9 - should be one of ['Triglyceride [Mass or Moles/volume] in Serum or Plasma', 'Trigl SerPl-msCnc', '', 'TG' (zh-CN), 'Trigly' (zh-CN), '甘油三脂' (zh-CN), '甘油三酸酯' (zh-CN), '三酸甘油酯' (zh-CN), '甘油三酸脂' (zh-CN), '三酸甘油脂 化学' (zh-CN), '化学检验项目' (zh-CN), '化学检验项目类' (zh-CN), '化学类' (zh-CN), '化学试验' (zh-CN), '非刺激耐受型化学检验项目' (zh-CN), '非刺激耐受型化学检验项目类' (zh-CN), '非刺激耐受型化学试验' (zh-CN), '非刺激耐受型化学试验类 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血清或血浆 质量或摩尔浓度' (zh-CN), '质量或摩尔浓度(单位体积)' (zh-CN), '质量或物质的量浓度(单位体积)' (zh-CN), 'Juhuslik Kvantitatiivne Plasma Seerum Seerum või plasma' (et-EE), 'Trigl' (pt-BR), 'Triglycrides' (pt-BR), 'Trig' (pt-BR), 'Triglycerides' (pt-BR), 'Level' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'SerPl' (pt-BR), 'SerPlas' (pt-BR), 'SerP' (pt-BR), 'Serum' (pt-BR), 'SR' (pt-BR), 'Plasma' (pt-BR), 'Pl' (pt-BR), 'Plsm' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'Chemistry' (pt-BR), 'Chimica Concentrazione Sostanza o Massa Plasma Punto nel tempo (episodio) Siero Siero o Plasma' (it-IT), 'Количественный Массовая или Молярная Концентрация Плазма Сыворотка Сыворотка или Плазма Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/measure-population.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/measure-population.cache deleted file mode 100644 index 21350a313..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/measure-population.cache +++ /dev/null @@ -1,12 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "coding" : [{ - "code" : "initial-population" - }] -}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### -v: { - "severity" : "error", - "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/observation-category.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/observation-category.cache deleted file mode 100644 index efbcf3c57..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/observation-category.cache +++ /dev/null @@ -1,32 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs", - "display" : "Vital Signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/rxnorm.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/rxnorm.cache deleted file mode 100644 index 934038989..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/rxnorm.cache +++ /dev/null @@ -1,12 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://www.nlm.nih.gov/research/umls/rxnorm", - "code" : "1049640", - "display" : "Acetaminophen 325 MG / Oxycodone Hydrochloride 5 MG Oral Tablet [Percocet]" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "acetaminophen 325 MG / oxycodone hydrochloride 5 MG Oral Tablet [Percocet]", - "code" : "1049640", - "system" : "http://www.nlm.nih.gov/research/umls/rxnorm" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/snomed.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/snomed.cache deleted file mode 100644 index b4d7c0266..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/snomed.cache +++ /dev/null @@ -1,205 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "368209003", - "display" : "Right arm" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Right upper arm", - "code" : "368209003", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "271649006", - "display" : "Systolic blood pressure" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "271649006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "271649006" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "271649006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/731000124108/version/20210201", - "code" : "132037003", - "display" : "Pineywoods pig breed" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'http://snomed.info/sct/731000124108/version/20210201' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '132037003'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20210915,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20210630,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220301,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200131,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20220131,http://snomed.info/sct/900000000000207008/version/20220331]; The code provided (http://snomed.info/sct#132037003) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/731000124108/version/20210201", - "code" : "132037003", - "display" : "Pineywoods pig breed" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Pineywoods pig", - "code" : "132037003", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/11000172109/version/20210915", - "code" : "132037003", - "display" : "Pineywoods pig breed. Not." -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Pineywoods pig", - "code" : "132037003", - "system" : "http://snomed.info/sct", - "severity" : "warning", - "error" : "The display \"Pineywoods pig breed. Not.\" is not a valid display for the code {http://snomed.info/sct}132037003 - should be one of ['Pineywoods pig', 'Pineywoods pig breed (organism)', 'Pineywoods pig breed'] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "112144000", - "display" : "Blood group A (finding)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood group A", - "code" : "112144000", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "10828004", - "display" : "Positive (qualifier value)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Positive", - "code" : "10828004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "233588003", - "display" : "Continuous hemodiafiltration" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Continuous hemodiafiltration", - "code" : "233588003", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006", - "display" : "Anxiety disorder of childhood OR adolescence" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006", - "display" : "Anxiety disorder of childhood OR adolescence" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004", - "display" : "Posterior carpal region" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Posterior carpal region", - "code" : "106004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004", - "display" : "Posterior carpal region" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Posterior carpal region", - "code" : "106004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004" -}, "valueSet" :{ - "resourceType" : "ValueSet", - "compose" : { - "include" : [{ - "system" : "http://snomed.info/sct" - }] - } -}, "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Posterior carpal region", - "code" : "106004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "85600001", - "display" : "Triacylglycerol" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Triacylglycerol", - "code" : "85600001", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/ucum.cache deleted file mode 100644 index d5216dc84..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/ucum.cache +++ /dev/null @@ -1,41 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "mm[Hg]" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "mm[Hg]", - "code" : "mm[Hg]", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "mm[Hg]" -}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "millimeter of mercury", - "code" : "mm[Hg]", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "/min" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "/min", - "code" : "/min", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "mmol/L" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "mmol/L", - "code" : "mmol/L", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v2-0203.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v2-0203.cache deleted file mode 100644 index 1cc44e5ce..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v2-0203.cache +++ /dev/null @@ -1,61 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MC" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MC", - "display" : "Patient's Medicare number" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Patient's Medicare number", - "code" : "MC", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v3-ObservationInterpretation.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v3-ObservationInterpretation.cache deleted file mode 100644 index 676a272ca..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.5.0/v3-ObservationInterpretation.cache +++ /dev/null @@ -1,63 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L", - "display" : "low" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N", - "display" : "normal" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.capabilityStatement.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.capabilityStatement.cache index 16161526f..0c9fedfc4 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.capabilityStatement.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.capabilityStatement.cache @@ -12,7 +12,7 @@ "version" : "4.0.1-2.0.14", "name" : "FHIR Reference Server Conformance Statement", "status" : "active", - "date" : "2022-07-13T16:07:09.351Z", + "date" : "2022-09-15T13:27:05.487Z", "contact" : [{ "telecom" : [{ "system" : "other", diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.terminologyCapabilities.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.terminologyCapabilities.cache index fcd279141..d1f5aa73b 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.terminologyCapabilities.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.terminologyCapabilities.cache @@ -5,7 +5,7 @@ "version" : "1.0.0", "name" : "FHIR Reference Server Teminology Capability Statement", "status" : "active", - "date" : "2022-07-13T04:36:48.317Z", + "date" : "2022-09-12T07:14:02.176Z", "contact" : [{ "telecom" : [{ "system" : "other", @@ -1270,6 +1270,9 @@ { "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group" }, + { + "uri" : "http://terminology.hl7.org/CodeSystem/icd-o-3" + }, { "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status" }, diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache index 486e0761e..ae3ac0d64 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache @@ -1,161 +1,4 @@ ------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/plain" -}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.5.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "text/plain", - "code" : "text/plain", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/plain" -}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "text/plain", - "code" : "text/plain", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "271649006", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "271649006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "SYL" -}, "url": "http://hl7.org/fhir/ValueSet/name-v3-representation", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Syllabic", - "code" : "SYL", - "system" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUse" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "IDE" -}, "url": "http://hl7.org/fhir/ValueSet/name-v3-representation", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Ideographic", - "code" : "IDE", - "system" : "http://terminology.hl7.org/CodeSystem/v3-EntityNameUse" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "nl-NL" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot1", "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Nederlands (Nederland)", - "code" : "nl-NL", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/cql" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "CQL", - "code" : "text/cql", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/fhirpath" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "FHIRPath", - "code" : "text/fhirpath", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en-AU" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot1", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English (Australia)", - "code" : "en-AU", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English", - "code" : "en", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/plain" -}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "text/plain", - "code" : "text/plain", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "271649006", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "271649006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "nl-NL" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.6.0", "lang":"nl-NL", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Nederlands (Nederland)", - "code" : "nl-NL", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/cql" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "CQL", - "code" : "text/cql", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/fhirpath" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "FHIRPath", - "code" : "text/fhirpath", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en-AU" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.6.0", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English (Australia)", - "code" : "en-AU", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "en" -}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "English", - "code" : "en", - "system" : "urn:ietf:bcp:47" -} -------------------------------------------------------------------------------------- {"code" : { "code" : "text/plain" }, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -185,24 +28,6 @@ v: { "system" : "urn:ietf:bcp:47" } ------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/cql" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "CQL", - "code" : "text/cql", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- -{"code" : { - "code" : "text/fhirpath" -}, "url": "http://hl7.org/fhir/ValueSet/expression-language", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "FHIRPath", - "code" : "text/fhirpath", - "system" : "urn:ietf:bcp:13" -} -------------------------------------------------------------------------------------- {"code" : { "code" : "en-AU" }, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0-ballot", "lang":"en-AU", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/icd-9-cm.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/icd-9-cm.cache deleted file mode 100644 index e4d85cbe8..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/icd-9-cm.cache +++ /dev/null @@ -1,11 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://hl7.org/fhir/sid/icd-9-cm", - "code" : "99.00" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Perioperative autologous transfusion of whole blood or blood components", - "code" : "99.00", - "system" : "http://hl7.org/fhir/sid/icd-9-cm" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache index 6cb027de3..7cdd910aa 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache @@ -35,7 +35,7 @@ v: { {"code" : { "system" : "http://loinc.org", "code" : "85354-9" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Blood pressure panel with all children optional", "code" : "85354-9", @@ -46,7 +46,7 @@ v: { "system" : "http://loinc.org", "code" : "85354-9", "display" : "Blood pressure panel with all children optional" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Blood pressure panel with all children optional", "code" : "85354-9", @@ -66,7 +66,7 @@ v: { {"code" : { "system" : "http://loinc.org", "code" : "8480-6" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Systolic blood pressure", "code" : "8480-6", @@ -77,7 +77,7 @@ v: { "system" : "http://loinc.org", "code" : "8480-6", "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Systolic blood pressure", "code" : "8480-6", @@ -97,7 +97,7 @@ v: { {"code" : { "system" : "http://loinc.org", "code" : "8462-4" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Diastolic blood pressure", "code" : "8462-4", @@ -108,7 +108,7 @@ v: { "system" : "http://loinc.org", "code" : "8462-4", "display" : "Diastolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Diastolic blood pressure", "code" : "8462-4", @@ -128,7 +128,7 @@ v: { {"code" : { "system" : "http://loinc.org", "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Medication summary Document", "code" : "56445-0", @@ -137,45 +137,10 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", - "version" : "current", + "version" : "2.73", "code" : "56445-0", "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.72]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.72]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '48765-2'). ValidVersions = [2.72]; The code provided (http://loinc.org#48765-2) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Medication summary Document", "code" : "56445-0", @@ -184,7 +149,7 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", - "version" : "2.72", + "version" : "2.73", "code" : "56445-0" }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { @@ -195,7 +160,7 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", - "version" : "2.72", + "version" : "2.73", "code" : "48765-2", "display" : "Allergies and adverse reactions" }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### @@ -210,7 +175,7 @@ v: { {"code" : { "system" : "http://loinc.org", "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### v: { "display" : "Medication summary Document", "code" : "56445-0", @@ -222,7 +187,7 @@ v: { "version" : "current", "code" : "56445-0", "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### +}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### v: { "display" : "Medication summary Document", "code" : "56445-0", @@ -254,162 +219,6 @@ v: { "error" : "The display \"Allergies and adverse reactions\" is not a valid display for the code {http://loinc.org}48765-2 - should be one of ['Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 变态反应与不良反应 文档.其他' (zh-CN), '杂项类文档' (zh-CN), '其他文档 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 杂项' (zh-CN), '杂项类' (zh-CN), '杂项试验 过敏反应' (zh-CN), '过敏' (zh-CN), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5", - "display" : "Discharge Summary" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18842-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Discharge summary", - "code" : "18842-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "29299-5" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Reason for visit Narrative", - "code" : "29299-5", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "�g��", - "display" : "8302-2" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code \"�g��\" is not valid in the system http://loinc.org; The code provided (http://loinc.org#�g��) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8867-4", - "display" : "Heart rate" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Heart rate", - "code" : "8867-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "883-9", - "display" : "ABO group [Type] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "ABO group [Type] in Blood", - "code" : "883-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "10331-7", - "display" : "Rh [Type] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Rh [Type] in Blood", - "code" : "10331-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "18684-1", - "display" : "����" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "First Blood pressure Set", - "code" : "18684-1", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"����\" is not a valid display for the code {http://loinc.org}18684-1 - should be one of ['First Blood pressure Set', '', 'ED Health Insurance Portability and Accountability Act of 1996' (zh-CN), 'HIPAA' (zh-CN), '健康保險可攜與責任法' (zh-CN), 'HIPAA法案' (zh-CN), '健康保险可移植性和问责法1996年' (zh-CN), '美国健康保险携带和责任法案' (zh-CN), '医疗保险便携性和责任法案' (zh-CN), '医疗保险便携性与责任法案' (zh-CN), '醫療保險可攜性與責任法' (zh-CN), 'HIPAA 信息附件.急诊' (zh-CN), 'HIPAA 信息附件.急诊科' (zh-CN), 'HIPAA 信息附件.急诊科就医' (zh-CN), 'HIPAA 信息附件.急诊科就诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊' (zh-CN), '健康保险便携与责任法案信息附件.急诊 临床信息附件集' (zh-CN), '临床信息附件集合' (zh-CN), '集' (zh-CN), '集合 信息附件' (zh-CN), '健康保险便携与责任法案信息附件' (zh-CN), '附件 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 压强 复合属性' (zh-CN), '复杂型属性' (zh-CN), '复杂属性 就医' (zh-CN), '就医过程 急诊科 急诊科（DEEDS）变量' (zh-CN), 'DEEDS 变量' (zh-CN), '急诊' (zh-CN), '急诊科' (zh-CN), 'Emergency Department' (zh-CN), 'ED' (zh-CN), '急诊科（急诊科系统代码之数据元素）变量' (zh-CN), '急诊科（急诊科系统代码之数据元素）指标' (zh-CN), '急诊科（美国CDC急诊科系统代码之数据元素）指标' (zh-CN), '急诊科指标 急诊科（Emergency Department，ED） 急诊部 第一个' (zh-CN), '第一次' (zh-CN), '首个' (zh-CN), '首次 血' (zh-CN), '全血' (zh-CN), 'Allegato Allegato di reparto di emergenza (pronto soccorso) Complesso Emergenza (DEEDS - Data Elements for Emergency Dep Incontro' (it-IT), 'Appuntamento paziente Stabilito' (it-IT), 'Fissato' (it-IT), 'Встреча Комплекс' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "���k������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"���k������\" is not a valid display for the code {http://loinc.org}8480-6 - should be one of ['Systolic blood pressure', 'BP sys', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内收缩期' (zh-CN), '血管内心缩期 血管内的' (zh-CN), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'BP systolic' (pt-BR), 'Blood pressure systolic' (pt-BR), 'Sys BP' (pt-BR), 'SBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck systolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "�g��������" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"�g��������\" is not a valid display for the code {http://loinc.org}8462-4 - should be one of ['Diastolic blood pressure', 'BP dias', '', '一般血压' (zh-CN), '血压.原子型' (zh-CN), '血压指标.原子型 压力' (zh-CN), '压强 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血管内心舒期' (zh-CN), '血管内舒张期 血管内的' (zh-CN), 'Dias' (pt-BR), 'Diast' (pt-BR), 'Pressure' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'Art sys' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'IV' (pt-BR), 'Intravenous' (pt-BR), 'Diastoli' (pt-BR), 'BLOOD PRESSURE MEASUREMENTS.ATOM' (pt-BR), 'Blood pressure diastolic' (pt-BR), 'BP diastolic' (pt-BR), 'Dias BP' (pt-BR), 'DBP' (pt-BR), 'Pressione Pressione arteriosa - atomica Punto nel tempo (episodio)' (it-IT), 'Внутрисосудистый диастолический Давление Количественный Точка во времени' (ru-RU), 'Момент' (ru-RU), 'Blutdruck diastolisch' (de-AT)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "718-7", - "display" : "Hemoglobin [Mass/volume] in Blood" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Hemoglobin [Mass/volume] in Blood", - "code" : "718-7", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "38483-4", - "display" : "Creat Bld-mCnc" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Creatinine [Mass/volume] in Blood", - "code" : "38483-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "2093-3", - "display" : "Cholesterol [Mass/volume] in Serum or Plasma" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Cholesterol [Mass/volume] in Serum or Plasma", - "code" : "2093-3", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- {"code" : { "system" : "http://loinc.org", "code" : "3151-8", @@ -504,278 +313,3 @@ v: { "error" : "The display \"Triglyceride [Moles/​volume] in Serum or Plasma\" is not a valid display for the code {http://loinc.org}35217-9 - should be one of ['Triglyceride [Mass or Moles/volume] in Serum or Plasma', 'Trigl SerPl-msCnc', '', 'TG' (zh-CN), 'Trigly' (zh-CN), '甘油三脂' (zh-CN), '甘油三酸酯' (zh-CN), '三酸甘油酯' (zh-CN), '甘油三酸脂' (zh-CN), '三酸甘油脂 化学' (zh-CN), '化学检验项目' (zh-CN), '化学检验项目类' (zh-CN), '化学类' (zh-CN), '化学试验' (zh-CN), '非刺激耐受型化学检验项目' (zh-CN), '非刺激耐受型化学检验项目类' (zh-CN), '非刺激耐受型化学试验' (zh-CN), '非刺激耐受型化学试验类 可用数量表示的' (zh-CN), '定量性' (zh-CN), '数值型' (zh-CN), '数量型' (zh-CN), '连续数值型标尺 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 血清或血浆 质量或摩尔浓度' (zh-CN), '质量或摩尔浓度(单位体积)' (zh-CN), '质量或物质的量浓度(单位体积)' (zh-CN), 'Juhuslik Kvantitatiivne Plasma Seerum Seerum või plasma' (et-EE), 'Trigl' (pt-BR), 'Triglycrides' (pt-BR), 'Trig' (pt-BR), 'Triglycerides' (pt-BR), 'Level' (pt-BR), 'Point in time' (pt-BR), 'Random' (pt-BR), 'SerPl' (pt-BR), 'SerPlas' (pt-BR), 'SerP' (pt-BR), 'Serum' (pt-BR), 'SR' (pt-BR), 'Plasma' (pt-BR), 'Pl' (pt-BR), 'Plsm' (pt-BR), 'Quantitative' (pt-BR), 'QNT' (pt-BR), 'Quant' (pt-BR), 'Quan' (pt-BR), 'Chemistry' (pt-BR), 'Chimica Concentrazione Sostanza o Massa Plasma Punto nel tempo (episodio) Siero Siero o Plasma' (it-IT), 'Количественный Массовая или Молярная Концентрация Плазма Сыворотка Сыворотка или Плазма Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9", - "display" : "Blood pressure panel with all children optional" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "Diastolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.72]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "85354-9", - "display" : "Blood pressure panel with all children optional" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Blood pressure panel with all children optional", - "code" : "85354-9", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8480-6", - "display" : "Systolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Systolic blood pressure", - "code" : "8480-6", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "8462-4", - "display" : "Diastolic blood pressure" -}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Diastolic blood pressure", - "code" : "8462-4", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version 'current' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.72", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "Version '2.72' of the code system 'http://loinc.org' is not known (encountered paired with code = '56445-0'). ValidVersions = [2.73]; The code provided (http://loinc.org#56445-0) is not valid in the value set 'FHIRDocumentTypeCodes' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "code" : "56445-0" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "current", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.73", - "code" : "56445-0", - "display" : "Medication summary Doc" -}, "url": "http://hl7.org/fhir/ValueSet/doc-typecodes", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.73", - "code" : "56445-0" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medication summary Document", - "code" : "56445-0", - "system" : "http://loinc.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://loinc.org", - "version" : "2.73", - "code" : "48765-2", - "display" : "Allergies and adverse reactions" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Allergies and adverse reactions Document", - "code" : "48765-2", - "system" : "http://loinc.org", - "severity" : "warning", - "error" : "The display \"Allergies and adverse reactions\" is not a valid display for the code {http://loinc.org}48765-2 - should be one of ['Allergies and adverse reactions Document', 'Allergies &or adverse reactions Doc', '', '临床文档型' (zh-CN), '临床文档' (zh-CN), '文档' (zh-CN), '文书' (zh-CN), '医疗文书' (zh-CN), '临床医疗文书 医疗服务对象' (zh-CN), '客户' (zh-CN), '病人' (zh-CN), '病患' (zh-CN), '病号' (zh-CN), '超系统 - 病人 发现是一个原子型临床观察指标，并不是作为印象的概括陈述。体格检查、病史、系统检查及其他此类观察指标的属性均为发现。它们的标尺对于编码型发现可能是名义型，而对于叙述型文本之中所报告的发现，则可能是叙述型。' (zh-CN), '发现物' (zh-CN), '所见' (zh-CN), '结果' (zh-CN), '结论 变态反应与不良反应 文档.其他' (zh-CN), '杂项类文档' (zh-CN), '其他文档 时刻' (zh-CN), '随机' (zh-CN), '随意' (zh-CN), '瞬间 杂项' (zh-CN), '杂项类' (zh-CN), '杂项试验 过敏反应' (zh-CN), '过敏' (zh-CN), 'Allergie e reazioni avverse Documentazione miscellanea Miscellanea Osservazione paziente Punto nel tempo (episodio)' (it-IT), 'Документ Точка во времени' (ru-RU), 'Момент' (ru-RU)] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache deleted file mode 100644 index 3ee93fe17..000000000 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/measure-population.cache +++ /dev/null @@ -1,34 +0,0 @@ -------------------------------------------------------------------------------------- -{"code" : { - "coding" : [{ - "code" : "initial-population" - }] -}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### -v: { - "severity" : "error", - "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "coding" : [{ - "code" : "initial-population" - }] -}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### -v: { - "severity" : "error", - "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { - "coding" : [{ - "code" : "initial-population" - }] -}, "url": "http://hl7.org/fhir/ValueSet/measure-population", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "versionFlexible":"false"+}#### -v: { - "severity" : "error", - "error" : "The code system '' is not known (encountered paired with code = 'initial-population'); The code provided (#initial-population) is not valid in the value set 'MeasurePopulationType' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache index 2cc9c3b6d..e1a144c6f 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/observation-category.cache @@ -1,56 +1,4 @@ ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs", - "display" : "Vital Signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/observation-category", - "code" : "vital-signs", - "display" : "Vital Signs" -}, "url": "http://hl7.org/fhir/ValueSet/observation-category", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Vital Signs", - "code" : "vital-signs", - "system" : "http://terminology.hl7.org/CodeSystem/observation-category" -} -------------------------------------------------------------------------------------- {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/observation-category", "code" : "vital-signs" @@ -72,3 +20,13 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/observation-category" } ------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/observation-category", + "code" : "vital-signs" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "Vital Signs", + "code" : "vital-signs", + "system" : "http://terminology.hl7.org/CodeSystem/observation-category" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache index 4468966e5..9306b36ab 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/snomed.cache @@ -39,7 +39,7 @@ v: { }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", - "error" : "Version 'http://snomed.info/sct/731000124108/version/20210201' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '132037003'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20220315,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20210630,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220301,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200131,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20210731,http://snomed.info/sct/900000000000207008/version/20220131,http://snomed.info/sct/900000000000207008/version/20220331]; The code provided (http://snomed.info/sct#132037003) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", + "error" : "Version 'http://snomed.info/sct/731000124108/version/20210201' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '132037003'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20220315,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20220731,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220901,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20210731,http://snomed.info/sct/900000000000207008/version/20220731]; The code provided (http://snomed.info/sct#132037003) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", "class" : "CODESYSTEM_UNSUPPORTED" } ------------------------------------------------------------------------------------- @@ -57,47 +57,16 @@ v: { ------------------------------------------------------------------------------------- {"code" : { "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/11000172109/version/20210915", + "version" : "http://snomed.info/sct/11000172109/version/20220315", "code" : "132037003", "display" : "Pineywoods pig breed. Not." }, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { - "severity" : "error", - "error" : "Version 'http://snomed.info/sct/11000172109/version/20210915' of the code system 'http://snomed.info/sct' is not known (encountered paired with code = '132037003'). ValidVersions = [http://snomed.info/sct/11000146104/version/20210930,http://snomed.info/sct/11000172109/version/20220315,http://snomed.info/sct/20611000087101/version/20220331,http://snomed.info/sct/32506021000036107/version/20210630,http://snomed.info/sct/45991000052106/version/20210531,http://snomed.info/sct/554471000005108/version/20210930,http://snomed.info/sct/731000124108/version/20220301,http://snomed.info/sct/900000000000207008/version/20190731,http://snomed.info/sct/900000000000207008/version/20200131,http://snomed.info/sct/900000000000207008/version/20200731,http://snomed.info/sct/900000000000207008/version/20210731,http://snomed.info/sct/900000000000207008/version/20220131,http://snomed.info/sct/900000000000207008/version/20220331]; The code provided (http://snomed.info/sct#132037003) is not valid in the value set 'All codes known to the system' (from http://tx.fhir.org/r4)", - "class" : "CODESYSTEM_UNSUPPORTED" -} -------------------------------------------------------------------------------------- -{"code" : { + "display" : "Pineywoods pig", + "code" : "132037003", "system" : "http://snomed.info/sct", - "code" : "112144000", - "display" : "Blood group A (finding)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Blood group A", - "code" : "112144000", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "10828004", - "display" : "Positive (qualifier value)" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Positive", - "code" : "10828004", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "233588003", - "display" : "Continuous hemodiafiltration" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Continuous hemodiafiltration", - "code" : "233588003", - "system" : "http://snomed.info/sct" + "severity" : "warning", + "error" : "The display \"Pineywoods pig breed. Not.\" is not a valid display for the code {http://snomed.info/sct}132037003 - should be one of ['Pineywoods pig', 'Pineywoods pig breed (organism)', 'Pineywoods pig breed'] (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- {"code" : { @@ -114,7 +83,7 @@ v: { {"code" : { "system" : "http://snomed.info/sct", "code" : "109006" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Anxiety disorder of childhood OR adolescence", "code" : "109006", @@ -125,7 +94,7 @@ v: { "system" : "http://snomed.info/sct", "code" : "109006", "display" : "Anxiety disorder of childhood OR adolescence" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Anxiety disorder of childhood OR adolescence", "code" : "109006", @@ -156,7 +125,7 @@ v: { {"code" : { "system" : "http://snomed.info/sct", "code" : "106004" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" @@ -201,77 +170,3 @@ v: { "system" : "http://snomed.info/sct" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "version" : "http://snomed.info/sct/11000172109/version/20220315", - "code" : "132037003", - "display" : "Pineywoods pig breed. Not." -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Pineywoods pig", - "code" : "132037003", - "system" : "http://snomed.info/sct", - "severity" : "warning", - "error" : "The display \"Pineywoods pig breed. Not.\" is not a valid display for the code {http://snomed.info/sct}132037003 - should be one of ['Pineywoods pig', 'Pineywoods pig breed (organism)', 'Pineywoods pig breed'] (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006", - "display" : "Anxiety disorder of childhood OR adolescence" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "109006", - "display" : "Anxiety disorder of childhood OR adolescence" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Anxiety disorder of childhood OR adolescence", - "code" : "109006", - "system" : "http://snomed.info/sct" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://snomed.info/sct", - "code" : "106004" -}, "url": "http://hl7.org/fhir/ValueSet/clinical-findings--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://snomed.info/sct#106004) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache index de6ac0095..f39a8284c 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache @@ -12,23 +12,13 @@ v: { {"code" : { "system" : "http://unitsofmeasure.org", "code" : "mm[Hg]" -}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "millimeter of mercury", "code" : "mm[Hg]", "system" : "http://unitsofmeasure.org" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "/min" -}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "/min", - "code" : "/min", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- {"code" : { "system" : "http://unitsofmeasure.org", "code" : "mmol/L" @@ -39,23 +29,3 @@ v: { "system" : "http://unitsofmeasure.org" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "mm[Hg]" -}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "millimeter of mercury", - "code" : "mm[Hg]", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://unitsofmeasure.org", - "code" : "mm[Hg]" -}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "millimeter of mercury", - "code" : "mm[Hg]", - "system" : "http://unitsofmeasure.org" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache index 8c4537315..81fa8953e 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0203.cache @@ -2,7 +2,7 @@ {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Medical record number", "code" : "MR", @@ -12,7 +12,7 @@ v: { {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Medical record number", "code" : "MR", @@ -42,7 +42,7 @@ v: { {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", "code" : "MC" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "severity" : "error", "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" @@ -59,61 +59,3 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MC" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MR" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Medical record number", - "code" : "MR", - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", - "code" : "MC" -}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "severity" : "error", - "error" : "The code provided (http://terminology.hl7.org/CodeSystem/v2-0203#MC) is not valid (from http://tx.fhir.org/r4)" -} -------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache index ad14c6921..353e1e361 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v3-ObservationInterpretation.cache @@ -2,7 +2,7 @@ {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", "code" : "L" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Low", "code" : "L", @@ -13,7 +13,7 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", "code" : "L", "display" : "low" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Low", "code" : "L", @@ -33,7 +33,7 @@ v: { {"code" : { "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", "code" : "N" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### v: { "display" : "Normal", "code" : "N", @@ -44,7 +44,7 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", "code" : "N", "display" : "normal" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-snapshot1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### +}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### v: { "display" : "Normal", "code" : "N", @@ -61,48 +61,6 @@ v: { "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L", - "display" : "low" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N", - "display" : "normal" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "4.6.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- {"hierarchical" : false, "valueSet" :{ "resourceType" : "ValueSet", "compose" : { @@ -130,8 +88,8 @@ e: { "language" : "en", "status" : "active", "expansion" : { - "identifier" : "urn:uuid:b52e8b2a-2ec9-4912-b3cd-8e554ba1b242", - "timestamp" : "2022-09-07T11:46:46.676Z", + "identifier" : "urn:uuid:bcd023d9-5bc4-42de-9558-37e0cede35e2", + "timestamp" : "2022-09-22T20:24:55.721Z", "parameter" : [{ "name" : "limitedExpansion", "valueBoolean" : true @@ -213,8 +171,8 @@ e: { "language" : "en", "status" : "active", "expansion" : { - "identifier" : "urn:uuid:6cabd13c-4765-46d1-9ebb-43e87fc0a036", - "timestamp" : "2022-09-07T11:46:47.286Z", + "identifier" : "urn:uuid:fb2ebfbd-1e40-43a3-857c-a243d7df24e1", + "timestamp" : "2022-09-22T20:24:55.893Z", "parameter" : [{ "name" : "limitedExpansion", "valueBoolean" : true @@ -268,45 +226,3 @@ e: { "error" : "" } ------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "L", - "display" : "low" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Low", - "code" : "L", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation--0", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- -{"code" : { - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation", - "code" : "N", - "display" : "normal" -}, "url": "http://hl7.org/fhir/ValueSet/observation-interpretation", "version": "5.0.0-ballot", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"false"}#### -v: { - "display" : "Normal", - "code" : "N", - "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation" -} -------------------------------------------------------------------------------------- diff --git a/pull-request-pipeline-parameterized.yml b/pull-request-pipeline-parameterized.yml index b02bc4bd4..95cc10b12 100644 --- a/pull-request-pipeline-parameterized.yml +++ b/pull-request-pipeline-parameterized.yml @@ -1,18 +1,17 @@ jobs: - ${{ each image in parameters.images }}: - - ${{ each jdkVersion in image.jdkVersions }}: - job: - displayName: ${{image.name}}_${{jdkVersion}} + displayName: ${{image.displayName}} pool: - vmImage: ${{image.name}} + vmImage: ${{image.vmImage}} variables: - currentImage: ${{image.name}} + currentImage: ${{image.vmImage}} codecov: $(CODECOV_TOKEN) VERSION: - JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8 + JAVA_TOOL_OPTIONS: ${{image.javaToolOptions}} steps: # Runs 'mvn clean install' @@ -21,7 +20,7 @@ jobs: mavenPomFile: 'pom.xml' mavenOptions: '-Xmx3072m' javaHomeOption: 'JDKVersion' - jdkVersionOption: '${{jdkVersion}}' + jdkVersionOption: '${{image.jdkVersion}}' jdkArchitectureOption: 'x64' publishJUnitResults: true testResultsFiles: '**/surefire-reports/TEST-*.xml' @@ -32,7 +31,7 @@ jobs: mavenPomFile: 'pom.xml' mavenOptions: '-Xmx3072m' javaHomeOption: 'JDKVersion' - jdkVersionOption: '${{jdkVersion}}' + jdkVersionOption: '${{image.jdkVersion}}' jdkArchitectureOption: 'x64' options: '-pl org.hl7.fhir.validation.cli' publishJUnitResults: false diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index 976b10d28..ad25c2ac7 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -10,9 +10,32 @@ jobs: - template: pull-request-pipeline-parameterized.yml parameters: images: - - name: ubuntu-latest - jdkVersions: [ '1.11', '1.17'] - - name: macos-latest - jdkVersions: [ '1.11', '1.17'] - - name: windows-latest - jdkVersions: [ '1.11', '1.17'] \ No newline at end of file + # This image is here so that at least one job specifically sets Cp1252 file encodings, which are normally set by the JDK (which Azure can change on each latest image) + - displayName: ubuntu-latest-java-17-cp1252 + vmImage: ubuntu-latest + jdkVersion: 1.17 + javaToolOptions: -Dfile.encoding=Cp1252 + - displayName: ubuntu-latest-java-11 + vmImage: ubuntu-latest + jdkVersion: 1.11 + javaToolOptions: + - displayName: ubuntu-latest-java-17 + vmImage: ubuntu-latest + jdkVersion: 1.17 + javaToolOptions: + - displayName: macos-latest-java-11 + vmImage: macos-latest + jdkVersion: 1.11 + javaToolOptions: + - displayName: macos-latest-java-17 + vmImage: macos-latest + jdkVersion: 1.17 + javaToolOptions: + - displayName: windows-latest-java-11 + vmImage: windows-latest + jdkVersion: 1.11 + javaToolOptions: + - displayName: windows-latest-java-17 + vmImage: windows-latest + jdkVersion: 1.17 + javaToolOptions: From d670ac9e4cac4f8c1cbe0195cd2449877c09cba3 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 23 Sep 2022 12:52:17 -0400 Subject: [PATCH 44/49] set up release --- RELEASE_NOTES.md | 5 +++-- .../main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java | 7 +++---- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..0b09d4a66 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,8 @@ ## Validator Changes -* no changes +* fix error with code system validation messages ## Other code changes -* no changes \ No newline at end of file +* Enhanced testing for character encoding issues +* XIG publisher improvements \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java index 2a40bd170..60b74d0a6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java @@ -115,11 +115,9 @@ public class ToolingExtensions { public static final String EXT_ISSUE_MSG_ID = "http://hl7.org/fhir/StructureDefinition/operationoutcome-message-id"; public static final String EXT_ISSUE_LINE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-line"; public static final String EXT_ISSUE_COL = "http://hl7.org/fhir/StructureDefinition/operationoutcome-issue-col"; - public static final String EXT_RESOURCE_IMPLEMENTS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-implements"; - public static final String EXT_ALLOWEDRESOURCE = "http://hl7.org/fhir/StructureDefinition/questionnaire-allowedResource"; public static final String EXT_OO_FILE = "http://hl7.org/fhir/StructureDefinition/operationoutcome-file"; + public static final String EXT_RESOURCE_IMPLEMENTS = "http://hl7.org/fhir/StructureDefinition/structuredefinition-implements"; public static final String EXT_XML_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-xml-type"; - public static final String EXT_PATTERN = "http://hl7.org/fhir/StructureDefinition/elementdefinition-pattern"; public static final String EXT_XML_NAME = "http://hl7.org/fhir/StructureDefinition/elementdefinition-xml-name"; public static final String EXT_BINDING_STYLE = "http://hl7.org/fhir/StructureDefinition/elementdefinition-binding-style"; public static final String EXT_EXPLICIT_TYPE = "http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name"; @@ -144,7 +142,8 @@ public class ToolingExtensions { // validated // private static final String EXT_OID = "http://hl7.org/fhir/StructureDefinition/valueset-oid"; // public static final String EXT_DEPRECATED = "http://hl7.org/fhir/StructureDefinition/codesystem-deprecated"; - + public static final String EXT_PATTERN = "http://hl7.org/fhir/StructureDefinition/elementdefinition-pattern"; + public static final String EXT_ALLOWEDRESOURCE = "http://hl7.org/fhir/StructureDefinition/questionnaire-referenceResource"; private static final String EXT_ALLOWABLE_UNITS = "http://hl7.org/fhir/StructureDefinition/elementdefinition-allowedUnits"; private static final String EXT_FHIRTYPE = "http://hl7.org/fhir/StructureDefinition/questionnaire-fhirType"; public static final String EXT_ALLOWED_TYPE = "http://hl7.org/fhir/StructureDefinition/operationdefinition-allowed-type"; diff --git a/pom.xml b/pom.xml index 321153256..321052495 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.112-SNAPSHOT + 1.1.112 5.7.1 1.8.2 3.0.0-M5 From 303853b7a1fcc5ce4d7bb121c02e573e0f6d5030 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 23 Sep 2022 18:20:37 +0000 Subject: [PATCH 45/49] Release: v5.6.66 ## Validator Changes * fix error with code system validation messages ## Other code changes * Enhanced testing for character encoding issues * XIG publisher improvements ***NO_CI*** --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 81e4f8165..ff350c07c 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index d1cb97cca..0cff95b0e 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index e1cb668d5..1f8b1fd8b 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 758c7f6ab..93cb1cba2 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 967801196..b9fd1d0b9 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 2c45d86a8..0a4b413d7 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 2f841d192..57fc77e2c 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index f9ad25ced..024593397 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index ebdade661..e148308d0 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 6c40b6039..d9bbe1839 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 0a1d960be..0222b6931 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 ../pom.xml diff --git a/pom.xml b/pom.xml index 321052495..5cea0f16f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.66-SNAPSHOT + 5.6.66 pom From 9d308db001feea0a2ad3055bf31ad37417b7c94c Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 23 Sep 2022 18:40:26 +0000 Subject: [PATCH 46/49] Updating version to: 5.6.67-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 5 ++--- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r4b/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0b09d4a66..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,8 +1,7 @@ ## Validator Changes -* fix error with code system validation messages +* no changes ## Other code changes -* Enhanced testing for character encoding issues -* XIG publisher improvements \ No newline at end of file +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index ff350c07c..2c3f3779a 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 0cff95b0e..80a597ba5 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 1f8b1fd8b..4fd752ab9 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 93cb1cba2..8ae9e64fb 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index b9fd1d0b9..e50001b0a 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 0a4b413d7..4df338a0a 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 57fc77e2c..241e706ec 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 024593397..8f0684e6d 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index e148308d0..beea7e745 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index d9bbe1839..e9ca064a5 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 0222b6931..370ba097d 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 5cea0f16f..958419d68 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.66 + 5.6.67-SNAPSHOT pom From 2285da5f8d34f9e32d7d8dec6440cb76eaae5453 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Mon, 26 Sep 2022 23:49:32 -0400 Subject: [PATCH 47/49] minor validation improvements --- .../src/main/resources/Messages.properties | 6 +++--- .../main/java/org/hl7/fhir/validation/BaseValidator.java | 3 +++ .../org/hl7/fhir/validation/instance/InstanceValidator.java | 2 +- .../fhir/validation/instance/type/ValueSetValidator.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index c384beb7c..8c9fabd00 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -522,11 +522,11 @@ SEARCHPARAMETER_NOTFOUND = Unable to find the base Search Parameter {0} so can'' SEARCHPARAMETER_BASE_WRONG = The resource type {1} is not listed as a base in the SearchParameter this is derived from ({0}) SEARCHPARAMETER_TYPE_WRONG = The type {1} is different to the type {0} in the derivedFrom SearchParameter SEARCHPARAMETER_EXP_WRONG = The expression ''{2}'' is not compatible with the expression ''{1}'' in the derivedFrom SearchParameter {0}, and this likely indicates that the derivation relationship is not valid -VALUESET_NO_SYSTEM_WARNING = No System specified, so Concepts and Filters can''t be checked +VALUESET_NO_SYSTEM_WARNING = No System specified, so Concepts and Filters can't be checked VALUESET_INCLUDE_INVALID_CONCEPT_CODE = The code {1} is not valid in the system {0} VALUESET_INCLUDE_INVALID_CONCEPT_CODE_VER = The code {2} is not valid in the system {0} version {1} -VALUESET_UNC_SYSTEM_WARNING = Unknown System specified, so Concepts and Filters can''t be checked -VALUESET_UNC_SYSTEM_WARNING_VER = Unknown System/Version specified, so Concepts and Filters can''t be checked +VALUESET_UNC_SYSTEM_WARNING = Unknown System specified, so Concepts and Filters can't be checked +VALUESET_UNC_SYSTEM_WARNING_VER = Unknown System/Version specified, so Concepts and Filters can't be checked Extension_PROF_Type = The Profile ''{0}'' definition allows for the type {1} but found type {2} TYPE_CHECKS_PATTERN_CC = The pattern [system {0}, code {1}, and display ''{2}''] defined in the profile {3} not found. Issues: {4} TYPE_CHECKS_PATTERN_CC_US = The pattern [system {0}, code {1}, display ''{2}'' and userSelected {5}] defined in the profile {3} not found. Issues: {4} diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java index 500cc7566..8209fe33a 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/BaseValidator.java @@ -731,6 +731,9 @@ public class BaseValidator implements IValidationContextResourceLoader { protected ValueSet resolveBindingReference(DomainResource ctxt, String reference, String uri) { if (reference != null) { + if (reference.equals("http://www.rfc-editor.org/bcp/bcp13.txt")) { + reference = "http://hl7.org/fhir/ValueSet/mimetypes"; + } if (reference.startsWith("#")) { for (Resource c : ctxt.getContained()) { if (c.getId().equals(reference.substring(1)) && (c instanceof ValueSet)) 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 01dadebef..57f0f2074 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 @@ -2659,7 +2659,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat } else { Set invalidChars = new HashSet<>(); for (char ch : value.toCharArray()) { - if (!(Character.isDigit(ch) || Character.isAlphabetic(ch) || Utilities.existsInList(ch, ';', '?', ':', '@', '&', '=', '+', '$', '.', ',', '/', '%', '-', '_', '~', '#', '[', ']', '!', '\'', '(', ')', '*' ))) { + if (!(Character.isDigit(ch) || Character.isAlphabetic(ch) || Utilities.existsInList(ch, ';', '?', ':', '@', '&', '=', '+', '$', '.', ',', '/', '%', '-', '_', '~', '#', '[', ']', '!', '\'', '(', ')', '*', '|' ))) { invalidChars.add(ch); } } diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java index 39ce917eb..0c9144cf3 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/ValueSetValidator.java @@ -169,7 +169,7 @@ public class ValueSetValidator extends BaseValidator { } cf++; } - warning(errors, IssueType.BUSINESSRULE, stack.getLiteralPath(), systemOk, version == null ? I18nConstants.VALUESET_UNC_SYSTEM_WARNING : I18nConstants.VALUESET_UNC_SYSTEM_WARNING_VER); + warning(errors, IssueType.BUSINESSRULE, stack.getLiteralPath(), systemOk, version == null ? I18nConstants.VALUESET_UNC_SYSTEM_WARNING : I18nConstants.VALUESET_UNC_SYSTEM_WARNING_VER, system); } else { warning(errors, IssueType.BUSINESSRULE, stack.getLiteralPath(), filters.size() == 0 && concepts.size() == 0, I18nConstants.VALUESET_NO_SYSTEM_WARNING); } From a1d97b6ed4392031ed84f75723dc7298f510e57c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 27 Sep 2022 08:46:49 -0400 Subject: [PATCH 48/49] fix test dependency --- .../src/main/resources/Messages.properties | 4 +- .../txCache/org.hl7.fhir.r5/iso4217.cache | 19 +++ .../txCache/org.hl7.fhir.r5/lang.cache | 11 ++ .../txCache/org.hl7.fhir.r5/loinc.cache | 90 +++++++++++++ .../txCache/org.hl7.fhir.r5/mimetypes.cache | 19 +++ .../txCache/org.hl7.fhir.r5/ucum.cache | 121 ++++++++++++++++++ .../4.0.1/all-systems.cache | 9 ++ pom.xml | 2 +- 8 files changed, 272 insertions(+), 3 deletions(-) create mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache create mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache create mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache create mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache create mode 100644 org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index 8c9fabd00..654b93cc4 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -525,8 +525,8 @@ SEARCHPARAMETER_EXP_WRONG = The expression ''{2}'' is not compatible with the ex VALUESET_NO_SYSTEM_WARNING = No System specified, so Concepts and Filters can't be checked VALUESET_INCLUDE_INVALID_CONCEPT_CODE = The code {1} is not valid in the system {0} VALUESET_INCLUDE_INVALID_CONCEPT_CODE_VER = The code {2} is not valid in the system {0} version {1} -VALUESET_UNC_SYSTEM_WARNING = Unknown System specified, so Concepts and Filters can't be checked -VALUESET_UNC_SYSTEM_WARNING_VER = Unknown System/Version specified, so Concepts and Filters can't be checked +VALUESET_UNC_SYSTEM_WARNING = Unknown System ''{0}'' specified, so Concepts and Filters can't be checked +VALUESET_UNC_SYSTEM_WARNING_VER = Unknown System/Version ''{0}'' specified, so Concepts and Filters can't be checked Extension_PROF_Type = The Profile ''{0}'' definition allows for the type {1} but found type {2} TYPE_CHECKS_PATTERN_CC = The pattern [system {0}, code {1}, and display ''{2}''] defined in the profile {3} not found. Issues: {4} TYPE_CHECKS_PATTERN_CC_US = The pattern [system {0}, code {1}, display ''{2}'' and userSelected {5}] defined in the profile {3} not found. Issues: {4} diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache new file mode 100644 index 000000000..0fe7bd413 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache @@ -0,0 +1,19 @@ +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "urn:iso:std:iso:4217" + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache new file mode 100644 index 000000000..9eff9c452 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache @@ -0,0 +1,11 @@ +------------------------------------------------------------------------------------- +{"code" : { + "system" : "urn:ietf:bcp:47", + "code" : "fr-CA" +}, "valueSet" :null, "lang":"en-US", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +v: { + "severity" : "error", + "error" : "Attempt to use Terminology server when no Terminology server is available", + "class" : "SERVER_ERROR" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache new file mode 100644 index 000000000..0eff5d126 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache @@ -0,0 +1,90 @@ +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "http://loinc.org", + "concept" : [{ + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "A." + }], + "code" : "LA20752-4", + "display" : "Within 24 hours" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "B." + }], + "code" : "LA20753-2", + "display" : "After 24 hours but before 3 days" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "C." + }], + "code" : "LA20754-0", + "display" : "Three days or later" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "D." + }], + "code" : "LA4489-6", + "display" : "Unknown" + }] + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "include" : [{ + "system" : "http://loinc.org", + "concept" : [{ + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "A." + }], + "code" : "LA20752-4", + "display" : "Within 24 hours" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "B." + }], + "code" : "LA20753-2", + "display" : "After 24 hours but before 3 days" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "C." + }], + "code" : "LA20754-0", + "display" : "Three days or later" + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-label", + "valueString" : "D." + }], + "code" : "LA4489-6", + "display" : "Unknown" + }] + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache new file mode 100644 index 000000000..97dc74e0d --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache @@ -0,0 +1,19 @@ +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "urn:ietf:bcp:13" + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache new file mode 100644 index 000000000..f70e08aa7 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache @@ -0,0 +1,121 @@ +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "http://unitsofmeasure.org" + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "valueSet" :{ + "resourceType" : "ValueSet", + "compose" : { + "inactive" : true, + "include" : [{ + "system" : "http://unitsofmeasure.org", + "concept" : [{ + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "second" + }], + "code" : "s", + "display" : "second", + "designation" : [{ + "language" : "zh", + "value" : "秒" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "minute" + }], + "code" : "min", + "display" : "minute", + "designation" : [{ + "language" : "zh", + "value" : "分钟" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "hour" + }], + "code" : "h", + "display" : "hour", + "designation" : [{ + "language" : "zh", + "value" : "小时" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "day" + }], + "code" : "d", + "display" : "day", + "designation" : [{ + "language" : "zh", + "value" : "天" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "week" + }], + "code" : "wk", + "display" : "week", + "designation" : [{ + "language" : "zh", + "value" : "星期" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "month - Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence." + }], + "code" : "mo", + "display" : "month", + "designation" : [{ + "language" : "zh", + "value" : "月" + }] + }, + { + "extension" : [{ + "url" : "http://hl7.org/fhir/StructureDefinition/valueset-concept-definition", + "valueString" : "year" + }], + "code" : "a", + "display" : "year", + "designation" : [{ + "language" : "zh", + "value" : "年" + }] + }] + }] + } +}}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- +{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-ballot"}#### +e: { + "error" : "java.lang.NullPointerException" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache index a7483ec05..ae9d784b5 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/all-systems.cache @@ -1559,3 +1559,12 @@ v: { "error" : "The code \"[%payloadFormat%]\" is not valid in the system urn:ietf:bcp:13; The code provided (urn:ietf:bcp:13#[%payloadFormat%]) is not valid in the value set 'Mime Types' (from http://tx.fhir.org/r4)" } ------------------------------------------------------------------------------------- +{"code" : { + "code" : "text/cql.identifier" +}, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "4.0.1", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "versionFlexible":"false"}#### +v: { + "display" : "text/cql.identifier", + "code" : "text/cql.identifier", + "system" : "urn:ietf:bcp:13" +} +------------------------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 958419d68..0762f6e96 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.4.0 - 1.1.112 + 1.1.113 5.7.1 1.8.2 3.0.0-M5 From dad4aea58521ece20807403dc1ee2c8bd0d31564 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 27 Sep 2022 10:12:13 -0400 Subject: [PATCH 49/49] release notes --- RELEASE_NOTES.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 7b06c6ab5..537a92e70 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,8 @@ ## Validator Changes -* no changes +* Work around R4 issue with http://www.rfc-editor.org/bcp/bcp13.txt value set (should be http://hl7.org/fhir/ValueSet/mimetypes) +* Minor improvements to error messages ## Other code changes -* no changes \ No newline at end of file +n/a \ No newline at end of file