diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index b4d749c75..e4d077814 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/ActivityDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/ActivityDefinition30_50.java index e87dcff07..6e4f4c1a7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/ActivityDefinition30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/resources30_50/ActivityDefinition30_50.java @@ -283,6 +283,9 @@ public class ActivityDefinition30_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.VISIONPRESCRIPTION); break; @@ -338,6 +341,9 @@ public class ActivityDefinition30_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionKind.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionKind.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.dstu3.model.ActivityDefinition.ActivityDefinitionKind.VISIONPRESCRIPTION); break; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ActivityDefinition40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ActivityDefinition40_50.java index a5115b5b1..a1ea7694b 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ActivityDefinition40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/ActivityDefinition40_50.java @@ -295,6 +295,9 @@ public class ActivityDefinition40_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.VISIONPRESCRIPTION); break; @@ -350,6 +353,9 @@ public class ActivityDefinition40_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.r4.model.ActivityDefinition.ActivityDefinitionKind.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.r4.model.ActivityDefinition.ActivityDefinitionKind.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.r4.model.ActivityDefinition.ActivityDefinitionKind.VISIONPRESCRIPTION); break; diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/resources43_50/ActivityDefinition43_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/resources43_50/ActivityDefinition43_50.java index 13bad0e57..26aeacce4 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/resources43_50/ActivityDefinition43_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv43_50/resources43_50/ActivityDefinition43_50.java @@ -295,6 +295,9 @@ public class ActivityDefinition43_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.r5.model.ActivityDefinition.RequestResourceTypes.VISIONPRESCRIPTION); break; @@ -350,6 +353,9 @@ public class ActivityDefinition43_50 { case SUPPLYREQUEST: tgt.setValue(org.hl7.fhir.r4b.model.ActivityDefinition.RequestResourceType.SUPPLYREQUEST); break; + case TASK: + tgt.setValue(org.hl7.fhir.r4b.model.ActivityDefinition.RequestResourceType.TASK); + break; case VISIONPRESCRIPTION: tgt.setValue(org.hl7.fhir.r4b.model.ActivityDefinition.RequestResourceType.VISIONPRESCRIPTION); break; diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 434687572..0bd0c9031 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 63021afb1..9c65ea31b 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 7fd29c1f8..190eb0ec3 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 74b827351..8338cf3ae 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/TerminologyCache.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/TerminologyCache.java index acd05391e..ae66e4b1d 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/TerminologyCache.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/TerminologyCache.java @@ -1,33 +1,33 @@ package org.hl7.fhir.r4.context; -/* - 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 - list of conditions and the following disclaimer. - * 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 - 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. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - 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. - - */ +/* + 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 + list of conditions and the following disclaimer. + * 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 + 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. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + 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. + + */ @@ -84,16 +84,88 @@ public class TerminologyCache { private static final String ENTRY_MARKER = "-------------------------------------------------------------------------------------"; private static final String BREAK = "####"; + private SystemNameKeyGenerator systemNameKeyGenerator = new SystemNameKeyGenerator(); + + protected SystemNameKeyGenerator getSystemNameKeyGenerator() { + return systemNameKeyGenerator; + } + + public class SystemNameKeyGenerator { + public static final String SNOMED_SCT_CODESYSTEM_URL = "http://snomed.info/sct"; + public static final String RXNORM_CODESYSTEM_URL = "http://www.nlm.nih.gov/research/umls/rxnorm"; + public static final String LOINC_CODESYSTEM_URL = "http://loinc.org"; + public static final String UCUM_CODESYSTEM_URL = "http://unitsofmeasure.org"; + + public static final String HL7_TERMINOLOGY_CODESYSTEM_BASE_URL = "http://terminology.hl7.org/CodeSystem/"; + public static final String HL7_SID_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/sid/"; + public static final String HL7_FHIR_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/"; + + public static final String ISO_CODESYSTEM_URN = "urn:iso:std:iso:"; + public static final String LANG_CODESYSTEM_URN = "urn:ietf:bcp:47"; + public static final String MIMETYPES_CODESYSTEM_URN = "urn:ietf:bcp:13"; + + public static final String _11073_CODESYSTEM_URN = "urn:iso:std:iso:11073:10101"; + public static final String DICOM_CODESYSTEM_URL = "http://dicom.nema.org/resources/ontology/DCM"; + + public String getNameForSystem(String system) { + final int lastPipe = system.lastIndexOf('|'); + final String systemBaseName = lastPipe == -1 ? system : system.substring(0,lastPipe); + final String systemVersion = lastPipe == -1 ? null : system.substring(lastPipe + 1); + + if (systemBaseName.equals(SNOMED_SCT_CODESYSTEM_URL)) + return getVersionedSystem("snomed", systemVersion); + if (systemBaseName.equals(RXNORM_CODESYSTEM_URL)) + return getVersionedSystem("rxnorm", systemVersion); + if (systemBaseName.equals(LOINC_CODESYSTEM_URL)) + return getVersionedSystem("loinc", systemVersion); + if (systemBaseName.equals(UCUM_CODESYSTEM_URL)) + return getVersionedSystem("ucum", systemVersion); + if (systemBaseName.startsWith(HL7_SID_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_SID_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(_11073_CODESYSTEM_URN)) + return getVersionedSystem("11073", systemVersion); + if (systemBaseName.startsWith(ISO_CODESYSTEM_URN)) + return getVersionedSystem("iso"+systemBaseName.substring(ISO_CODESYSTEM_URN.length()).replace(":", ""), systemVersion); + if (systemBaseName.startsWith(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.startsWith(HL7_FHIR_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_FHIR_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(LANG_CODESYSTEM_URN)) + return getVersionedSystem("lang", systemVersion); + if (systemBaseName.equals(MIMETYPES_CODESYSTEM_URN)) + return getVersionedSystem("mimetypes", systemVersion); + if (systemBaseName.equals(DICOM_CODESYSTEM_URL)) + return getVersionedSystem("dicom", systemVersion); + return getVersionedSystem(systemBaseName.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"), systemVersion); + } + + public String normalizeBaseURL(String baseUrl, String fullUrl) { + return fullUrl.substring(baseUrl.length()).replace("/", ""); + } + + public String getVersionedSystem(String baseSystem, String version) { + if (version != null) { + return baseSystem + "_" + version; + } + return baseSystem; + } + } + public class CacheToken { private String name; private String key; private String request; public void setName(String n) { + String systemName = getSystemNameKeyGenerator().getNameForSystem(n); if (name == null) - name = n; - else if (!n.equals(name)) + name = systemName; + else if (!systemName.equals(name)) name = NAME_FOR_NO_SYSTEM; } + + public String getName() { + return name; + } } private class CacheEntry { @@ -126,7 +198,7 @@ public class TerminologyCache { public CacheToken generateValidationToken(ValidationOptions options, Coding code, ValueSet vs) { CacheToken ct = new CacheToken(); if (code.hasSystem()) - ct.name = getNameForSystem(code.getSystem()); + ct.name = getSystemNameKeyGenerator().getNameForSystem(code.getSystem()); else ct.name = NAME_FOR_NO_SYSTEM; JsonParser json = new JsonParser(); @@ -145,7 +217,7 @@ public class TerminologyCache { CacheToken ct = new CacheToken(); for (Coding c : code.getCoding()) { if (c.hasSystem()) - ct.setName(getNameForSystem(c.getSystem())); + ct.setName(c.getSystem()); } JsonParser json = new JsonParser(); json.setOutputStyle(OutputStyle.PRETTY); @@ -176,13 +248,13 @@ public class TerminologyCache { ValueSet vsc = getVSEssense(vs); for (ConceptSetComponent inc : vs.getCompose().getInclude()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); for (ConceptSetComponent inc : vs.getCompose().getExclude()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); for (ValueSetExpansionContainsComponent inc : vs.getExpansion().getContains()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); JsonParser json = new JsonParser(); json.setOutputStyle(OutputStyle.PRETTY); try { @@ -194,34 +266,6 @@ public class TerminologyCache { return ct; } - private String getNameForSystem(String system) { - if (system.equals("http://snomed.info/sct")) - return "snomed"; - if (system.equals("http://www.nlm.nih.gov/research/umls/rxnorm")) - return "rxnorm"; - if (system.equals("http://loinc.org")) - return "loinc"; - if (system.equals("http://unitsofmeasure.org")) - return "ucum"; - if (system.startsWith("http://hl7.org/fhir/sid/")) - return system.substring(24).replace("/", ""); - if (system.startsWith("urn:iso:std:iso:")) - return "iso"+system.substring(16).replace(":", ""); - if (system.startsWith("http://terminology.hl7.org/CodeSystem/")) - return system.substring(38).replace("/", ""); - if (system.startsWith("http://hl7.org/fhir/")) - return system.substring(20).replace("/", ""); - if (system.equals("urn:ietf:bcp:47")) - return "lang"; - if (system.equals("urn:ietf:bcp:13")) - return "mimetypes"; - if (system.equals("urn:iso:std:iso:11073:10101")) - return "11073"; - if (system.equals("http://dicom.nema.org/resources/ontology/DCM")) - return "dicom"; - return system.replace("/", "_").replace(":", "_"); - } - public NamedCache getNamedCache(CacheToken cacheToken) { NamedCache nc = caches.get(cacheToken.name); if (nc == null) { diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/CacheTestUtils.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/CacheTestUtils.java new file mode 100644 index 000000000..059d2ec0b --- /dev/null +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/CacheTestUtils.java @@ -0,0 +1,8 @@ +package org.hl7.fhir.r4.context; + +import org.hl7.fhir.utilities.validation.ValidationOptions; + +public class CacheTestUtils { + public static final ValidationOptions validationOptions = new ValidationOptions().guessSystem().setVersionFlexible(false); + +} diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/TerminologyCacheTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/TerminologyCacheTests.java new file mode 100644 index 000000000..89ebbcc6c --- /dev/null +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/context/TerminologyCacheTests.java @@ -0,0 +1,61 @@ +package org.hl7.fhir.r4.context; + + +import org.hl7.fhir.r4.model.Coding; +import org.hl7.fhir.r4.model.ValueSet; + +import org.hl7.fhir.utilities.tests.ResourceLoaderTests; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import java.io.IOException; +import java.net.URISyntaxException; + +import static org.junit.jupiter.api.Assertions.assertEquals; + + +public class TerminologyCacheTests implements ResourceLoaderTests { + + private TerminologyCache createTerminologyCache() throws IOException { + Object lock = new Object(); + TerminologyCache terminologyCache = new TerminologyCache(lock, null); + return terminologyCache; + } + + @ParameterizedTest + @CsvSource({ + "http://terminology.hl7.org/CodeSystem/id,id", + "http://hl7.org/fhir/id,id", + "http://hl7.org/fhir/sid/id,id", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://snomed.info/sct,snomed", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://loinc.org,loinc", + "http://unitsofmeasure.org,ucum", + "urn:iso:std:iso:id,isoid", + "urn:ietf:bcp:47,lang", + "urn:ietf:bcp:13,mimetypes", + "urn:iso:std:iso:11073:10101,11073", + "my://random/system?with#chars,my___random_systemXwithXchars", + "http://dicom.nema.org/resources/ontology/DCM,dicom" + }) + public void testCacheTokenGeneration(String system, String expectedName) throws IOException, URISyntaxException { + + TerminologyCache terminologyCache = createTerminologyCache(); + ValueSet valueSet = new ValueSet(); + { + Coding coding = new Coding(); + coding.setSystem(system); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName, cacheToken.getName()); + } + { + Coding coding = new Coding(); + coding.setSystem(system + "|dummyVersion"); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName + "_dummyVersion", cacheToken.getName()); + } + } +} diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 9587e989c..5c752f71f 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/context/TerminologyCache.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/context/TerminologyCache.java index fd6d48de4..4c5ce24b8 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/context/TerminologyCache.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/context/TerminologyCache.java @@ -1,33 +1,33 @@ package org.hl7.fhir.r4b.context; -/* - 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 - list of conditions and the following disclaimer. - * 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 - 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. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - 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. - - */ +/* + 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 + list of conditions and the following disclaimer. + * 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 + 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. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + 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. + + */ @@ -84,16 +84,88 @@ public class TerminologyCache { private static final String ENTRY_MARKER = "-------------------------------------------------------------------------------------"; private static final String BREAK = "####"; + private SystemNameKeyGenerator systemNameKeyGenerator = new SystemNameKeyGenerator(); + + protected SystemNameKeyGenerator getSystemNameKeyGenerator() { + return systemNameKeyGenerator; + } + + public class SystemNameKeyGenerator { + public static final String SNOMED_SCT_CODESYSTEM_URL = "http://snomed.info/sct"; + public static final String RXNORM_CODESYSTEM_URL = "http://www.nlm.nih.gov/research/umls/rxnorm"; + public static final String LOINC_CODESYSTEM_URL = "http://loinc.org"; + public static final String UCUM_CODESYSTEM_URL = "http://unitsofmeasure.org"; + + public static final String HL7_TERMINOLOGY_CODESYSTEM_BASE_URL = "http://terminology.hl7.org/CodeSystem/"; + public static final String HL7_SID_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/sid/"; + public static final String HL7_FHIR_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/"; + + public static final String ISO_CODESYSTEM_URN = "urn:iso:std:iso:"; + public static final String LANG_CODESYSTEM_URN = "urn:ietf:bcp:47"; + public static final String MIMETYPES_CODESYSTEM_URN = "urn:ietf:bcp:13"; + + public static final String _11073_CODESYSTEM_URN = "urn:iso:std:iso:11073:10101"; + public static final String DICOM_CODESYSTEM_URL = "http://dicom.nema.org/resources/ontology/DCM"; + + public String getNameForSystem(String system) { + final int lastPipe = system.lastIndexOf('|'); + final String systemBaseName = lastPipe == -1 ? system : system.substring(0,lastPipe); + final String systemVersion = lastPipe == -1 ? null : system.substring(lastPipe + 1); + + if (systemBaseName.equals(SNOMED_SCT_CODESYSTEM_URL)) + return getVersionedSystem("snomed", systemVersion); + if (systemBaseName.equals(RXNORM_CODESYSTEM_URL)) + return getVersionedSystem("rxnorm", systemVersion); + if (systemBaseName.equals(LOINC_CODESYSTEM_URL)) + return getVersionedSystem("loinc", systemVersion); + if (systemBaseName.equals(UCUM_CODESYSTEM_URL)) + return getVersionedSystem("ucum", systemVersion); + if (systemBaseName.startsWith(HL7_SID_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_SID_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(_11073_CODESYSTEM_URN)) + return getVersionedSystem("11073", systemVersion); + if (systemBaseName.startsWith(ISO_CODESYSTEM_URN)) + return getVersionedSystem("iso"+systemBaseName.substring(ISO_CODESYSTEM_URN.length()).replace(":", ""), systemVersion); + if (systemBaseName.startsWith(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.startsWith(HL7_FHIR_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_FHIR_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(LANG_CODESYSTEM_URN)) + return getVersionedSystem("lang", systemVersion); + if (systemBaseName.equals(MIMETYPES_CODESYSTEM_URN)) + return getVersionedSystem("mimetypes", systemVersion); + if (systemBaseName.equals(DICOM_CODESYSTEM_URL)) + return getVersionedSystem("dicom", systemVersion); + return getVersionedSystem(systemBaseName.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"), systemVersion); + } + + public String normalizeBaseURL(String baseUrl, String fullUrl) { + return fullUrl.substring(baseUrl.length()).replace("/", ""); + } + + public String getVersionedSystem(String baseSystem, String version) { + if (version != null) { + return baseSystem + "_" + version; + } + return baseSystem; + } + } + public class CacheToken { private String name; private String key; private String request; public void setName(String n) { + String systemName = getSystemNameKeyGenerator().getNameForSystem(n); if (name == null) - name = n; - else if (!n.equals(name)) + name = systemName; + else if (!systemName.equals(name)) name = NAME_FOR_NO_SYSTEM; } + + public String getName() { + return name; + } } private class CacheEntry { @@ -130,7 +202,7 @@ public class TerminologyCache { public CacheToken generateValidationToken(ValidationOptions options, Coding code, ValueSet vs) { CacheToken ct = new CacheToken(); if (code.hasSystem()) - ct.name = getNameForSystem(code.getSystem()); + ct.name = getSystemNameKeyGenerator().getNameForSystem(code.getSystem()); else ct.name = NAME_FOR_NO_SYSTEM; JsonParser json = new JsonParser(); @@ -159,7 +231,7 @@ public class TerminologyCache { CacheToken ct = new CacheToken(); for (Coding c : code.getCoding()) { if (c.hasSystem()) - ct.setName(getNameForSystem(c.getSystem())); + ct.setName(c.getSystem()); } JsonParser json = new JsonParser(); json.setOutputStyle(OutputStyle.PRETTY); @@ -190,13 +262,13 @@ public class TerminologyCache { ValueSet vsc = getVSEssense(vs); for (ConceptSetComponent inc : vs.getCompose().getInclude()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); for (ConceptSetComponent inc : vs.getCompose().getExclude()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); for (ValueSetExpansionContainsComponent inc : vs.getExpansion().getContains()) if (inc.hasSystem()) - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); JsonParser json = new JsonParser(); json.setOutputStyle(OutputStyle.PRETTY); try { @@ -208,33 +280,7 @@ public class TerminologyCache { return ct; } - private String getNameForSystem(String system) { - if (system.equals("http://snomed.info/sct")) - return "snomed"; - if (system.equals("http://www.nlm.nih.gov/research/umls/rxnorm")) - return "rxnorm"; - if (system.equals("http://loinc.org")) - return "loinc"; - if (system.equals("http://unitsofmeasure.org")) - return "ucum"; - if (system.startsWith("http://hl7.org/fhir/sid/")) - return system.substring(24).replace("/", ""); - if (system.startsWith("urn:iso:std:iso:")) - return "iso"+system.substring(16).replace(":", ""); - if (system.startsWith("http://terminology.hl7.org/CodeSystem/")) - return system.substring(38).replace("/", ""); - if (system.startsWith("http://hl7.org/fhir/")) - return system.substring(20).replace("/", ""); - if (system.equals("urn:ietf:bcp:47")) - return "lang"; - if (system.equals("urn:ietf:bcp:13")) - return "mimetypes"; - if (system.equals("urn:iso:std:iso:11073:10101")) - return "11073"; - if (system.equals("http://dicom.nema.org/resources/ontology/DCM")) - return "dicom"; - return system.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"); - } + public NamedCache getNamedCache(CacheToken cacheToken) { NamedCache nc = caches.get(cacheToken.name); @@ -520,7 +566,7 @@ public class TerminologyCache { public void removeCS(String url) { synchronized (lock) { - String name = getNameForSystem(url); + String name = getSystemNameKeyGenerator().getNameForSystem(url); if (caches.containsKey(name)) { caches.remove(name); } diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireRenderer.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireRenderer.java index d1a150149..1ec71df58 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireRenderer.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireRenderer.java @@ -217,7 +217,16 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } private String getSDCLink(String path) { - return Utilities.pathURL("http://hl7.org/fhir/uv/sdc", path); // for now? + if (Utilities.isAbsoluteUrl(path)) { + StructureDefinition sd = context.getContext().fetchResource(StructureDefinition.class, path); + if (sd != null) { + return sd.getUserString("path"); + } else { + return path.replace("StructureDefinition/", "StructureDefinition-")+".html"; + } + } else { + return Utilities.pathURL("http://hl7.org/fhir/uv/sdc", path); // for now? + } } private boolean renderTreeItem(HierarchicalTableGenerator gen, List rows, Questionnaire q, QuestionnaireItemComponent i, boolean hasFlags) throws IOException { @@ -254,7 +263,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-optionalDisplay.html"), null, "Is optional to display").addHtml(new XhtmlNode(NodeType.Element, "img").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("src", Utilities.path(context.getLocalPrefix(), "icon-qi-observation.png")))); + flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-observationLinkPeriod.html"), null, "Is linked to an observation").addHtml(new XhtmlNode(NodeType.Element, "img").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"); @@ -263,7 +272,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { if (i.hasExtension("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory")) { CodeableConcept cc = i.getExtensionByUrl("http://hl7.org/fhir/StructureDefinition/questionnaire-displayCategory").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("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); + flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-displayCategory.html"), null, "Category: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); } } Cell defn = gen.new Cell(); @@ -678,7 +687,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject")) { 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"); + flags.ah(getSDCLink("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")) { hasFlag = true; @@ -687,17 +696,17 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay")) { 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(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-optionalDisplay"), "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"); + flags.ah(getSDCLink("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(); 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"); + flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-displayCategory"), "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png"), "icon"); } if (i.hasMaxLength()) { @@ -984,7 +993,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } if (qi.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod")) { XhtmlNode tr = tbl.tr(); - tr.td().ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod").tx("Observation Link Period"); + tr.td().ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod")).tx("Observation Link Period"); render(tr.td(), qi.getExtensionByUrl("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-observationLinkPeriod").getValue()); } diff --git a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireResponseRenderer.java b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireResponseRenderer.java index 63c9143f3..3c36235f5 100644 --- a/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireResponseRenderer.java +++ b/org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/renderers/QuestionnaireResponseRenderer.java @@ -440,7 +440,7 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // // if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject")) { // hasFlag = true; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject", "Can change the subject of the QuestionnaireResponse").img(Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject", "Can change the subject of the QuestionnaireResponse").img(Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png")); // } // if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-hidden")) { // hasFlag = true; @@ -449,17 +449,17 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // } // if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay")) { // hasFlag = true; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay", "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay", "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png")); // } // if (i.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod")) { // 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")); +// flags.ah(getSDCLink("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")) { // 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; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-displayCategory", "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-displayCategory", "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")); // } // // if (i.hasMaxLength()) { diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/CacheTestUtils.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/CacheTestUtils.java new file mode 100644 index 000000000..2fcd71fc7 --- /dev/null +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/CacheTestUtils.java @@ -0,0 +1,8 @@ +package org.hl7.fhir.r4b.context; + +import org.hl7.fhir.utilities.validation.ValidationOptions; + +public class CacheTestUtils { + public static final ValidationOptions validationOptions = new ValidationOptions().guessSystem().setVersionFlexible(false); + +} diff --git a/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/TerminologyCacheTests.java b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/TerminologyCacheTests.java new file mode 100644 index 000000000..1a5222230 --- /dev/null +++ b/org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/context/TerminologyCacheTests.java @@ -0,0 +1,68 @@ +package org.hl7.fhir.r4b.context; + + +import org.hl7.fhir.r4b.model.Coding; +import org.hl7.fhir.r4b.model.ValueSet; +import org.hl7.fhir.utilities.tests.ResourceLoaderTests; + +import org.junit.jupiter.params.ParameterizedTest; + +import org.junit.jupiter.params.provider.CsvSource; + +import java.io.IOException; + +import java.net.URISyntaxException; + + +import static org.junit.jupiter.api.Assertions.assertEquals; + + +public class TerminologyCacheTests implements ResourceLoaderTests { + + + + private TerminologyCache createTerminologyCache() throws IOException { + Object lock = new Object(); + TerminologyCache terminologyCache = new TerminologyCache(lock, null); + return terminologyCache; + } + + + + @ParameterizedTest + @CsvSource({ + "http://terminology.hl7.org/CodeSystem/id,id", + "http://hl7.org/fhir/id,id", + "http://hl7.org/fhir/sid/id,id", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://snomed.info/sct,snomed", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://loinc.org,loinc", + "http://unitsofmeasure.org,ucum", + "urn:iso:std:iso:id,isoid", + "urn:ietf:bcp:47,lang", + "urn:ietf:bcp:13,mimetypes", + "urn:iso:std:iso:11073:10101,11073", + "my://random/system?with#chars,my___random_systemXwithXchars", + "http://dicom.nema.org/resources/ontology/DCM,dicom" + }) + public void testCacheTokenGeneration(String system, String expectedName) throws IOException, URISyntaxException { + + TerminologyCache terminologyCache = createTerminologyCache(); + ValueSet valueSet = new ValueSet(); + { + Coding coding = new Coding(); + coding.setSystem(system); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName, cacheToken.getName()); + } + { + Coding coding = new Coding(); + coding.setSystem(system + "|dummyVersion"); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName + "_dummyVersion", cacheToken.getName()); + } + } +} diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 2e6563f12..18fe544da 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java index 287d1cb9b..4ec3c1452 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/TerminologyCache.java @@ -38,7 +38,6 @@ import java.io.IOException; import java.io.OutputStreamWriter; import java.util.*; -import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; @@ -85,6 +84,9 @@ public class TerminologyCache { private static final String CAPABILITY_STATEMENT_TITLE = ".capabilityStatement"; private static final String TERMINOLOGY_CAPABILITIES_TITLE = ".terminologyCapabilities"; + + private SystemNameKeyGenerator systemNameKeyGenerator = new SystemNameKeyGenerator(); + public class CacheToken { @Getter private String name; @@ -96,13 +98,79 @@ public class TerminologyCache { private boolean hasVersion; public void setName(String n) { + String systemName = getSystemNameKeyGenerator().getNameForSystem(n); if (name == null) - name = n; - else if (!n.equals(name)) + name = systemName; + else if (!systemName.equals(name)) name = NAME_FOR_NO_SYSTEM; } } + protected SystemNameKeyGenerator getSystemNameKeyGenerator() { + return systemNameKeyGenerator; + } + public class SystemNameKeyGenerator { + public static final String SNOMED_SCT_CODESYSTEM_URL = "http://snomed.info/sct"; + public static final String RXNORM_CODESYSTEM_URL = "http://www.nlm.nih.gov/research/umls/rxnorm"; + public static final String LOINC_CODESYSTEM_URL = "http://loinc.org"; + public static final String UCUM_CODESYSTEM_URL = "http://unitsofmeasure.org"; + + public static final String HL7_TERMINOLOGY_CODESYSTEM_BASE_URL = "http://terminology.hl7.org/CodeSystem/"; + public static final String HL7_SID_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/sid/"; + public static final String HL7_FHIR_CODESYSTEM_BASE_URL = "http://hl7.org/fhir/"; + + public static final String ISO_CODESYSTEM_URN = "urn:iso:std:iso:"; + public static final String LANG_CODESYSTEM_URN = "urn:ietf:bcp:47"; + public static final String MIMETYPES_CODESYSTEM_URN = "urn:ietf:bcp:13"; + + public static final String _11073_CODESYSTEM_URN = "urn:iso:std:iso:11073:10101"; + public static final String DICOM_CODESYSTEM_URL = "http://dicom.nema.org/resources/ontology/DCM"; + + public String getNameForSystem(String system) { + final int lastPipe = system.lastIndexOf('|'); + final String systemBaseName = lastPipe == -1 ? system : system.substring(0,lastPipe); + final String systemVersion = lastPipe == -1 ? null : system.substring(lastPipe + 1); + + if (systemBaseName.equals(SNOMED_SCT_CODESYSTEM_URL)) + return getVersionedSystem("snomed", systemVersion); + if (systemBaseName.equals(RXNORM_CODESYSTEM_URL)) + return getVersionedSystem("rxnorm", systemVersion); + if (systemBaseName.equals(LOINC_CODESYSTEM_URL)) + return getVersionedSystem("loinc", systemVersion); + if (systemBaseName.equals(UCUM_CODESYSTEM_URL)) + return getVersionedSystem("ucum", systemVersion); + if (systemBaseName.startsWith(HL7_SID_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_SID_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(_11073_CODESYSTEM_URN)) + return getVersionedSystem("11073", systemVersion); + if (systemBaseName.startsWith(ISO_CODESYSTEM_URN)) + return getVersionedSystem("iso"+systemBaseName.substring(ISO_CODESYSTEM_URN.length()).replace(":", ""), systemVersion); + if (systemBaseName.startsWith(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_TERMINOLOGY_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.startsWith(HL7_FHIR_CODESYSTEM_BASE_URL)) + return getVersionedSystem(normalizeBaseURL(HL7_FHIR_CODESYSTEM_BASE_URL, systemBaseName), systemVersion); + if (systemBaseName.equals(LANG_CODESYSTEM_URN)) + return getVersionedSystem("lang", systemVersion); + if (systemBaseName.equals(MIMETYPES_CODESYSTEM_URN)) + return getVersionedSystem("mimetypes", systemVersion); + if (systemBaseName.equals(DICOM_CODESYSTEM_URL)) + return getVersionedSystem("dicom", systemVersion); + return getVersionedSystem(systemBaseName.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"), systemVersion); + } + + public String normalizeBaseURL(String baseUrl, String fullUrl) { + return fullUrl.substring(baseUrl.length()).replace("/", ""); + } + + public String getVersionedSystem(String baseSystem, String version) { + if (version != null) { + return baseSystem + "_" + version; + } + return baseSystem; + } + } + + private class CacheEntry { private String request; private boolean persistent; @@ -185,7 +253,7 @@ public class TerminologyCache { public CacheToken generateValidationToken(ValidationOptions options, Coding code, ValueSet vs) { CacheToken ct = new CacheToken(); if (code.hasSystem()) { - ct.name = getNameForSystem(code.getSystem()); + ct.setName(code.getSystem()); ct.hasVersion = code.hasVersion(); } else @@ -226,7 +294,7 @@ public class TerminologyCache { CacheToken ct = new CacheToken(); for (Coding c : code.getCoding()) { if (c.hasSystem()) { - ct.setName(getNameForSystem(c.getSystem())); + ct.setName(c.getSystem()); ct.hasVersion = c.hasVersion(); } } @@ -287,53 +355,31 @@ public class TerminologyCache { if (vs != null) { for (ConceptSetComponent inc : vs.getCompose().getInclude()) { if (inc.hasSystem()) { - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); ct.hasVersion = inc.hasVersion(); } } for (ConceptSetComponent inc : vs.getCompose().getExclude()) { if (inc.hasSystem()) { - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); ct.hasVersion = inc.hasVersion(); } } for (ValueSetExpansionContainsComponent inc : vs.getExpansion().getContains()) { if (inc.hasSystem()) { - ct.setName(getNameForSystem(inc.getSystem())); + ct.setName(inc.getSystem()); ct.hasVersion = inc.hasVersion(); } } } } - private String getNameForSystem(String system) { - if (system.equals("http://snomed.info/sct")) - return "snomed"; - if (system.equals("http://www.nlm.nih.gov/research/umls/rxnorm")) - return "rxnorm"; - if (system.equals("http://loinc.org")) - return "loinc"; - if (system.equals("http://unitsofmeasure.org")) - return "ucum"; - if (system.startsWith("http://hl7.org/fhir/sid/")) - return system.substring(24).replace("/", ""); - if (system.startsWith("urn:iso:std:iso:")) - return "iso"+system.substring(16).replace(":", ""); - if (system.startsWith("http://terminology.hl7.org/CodeSystem/")) - return system.substring(38).replace("/", ""); - if (system.startsWith("http://hl7.org/fhir/")) - return system.substring(20).replace("/", ""); - if (system.equals("urn:ietf:bcp:47")) - return "lang"; - if (system.equals("urn:ietf:bcp:13")) - return "mimetypes"; - if (system.equals("urn:iso:std:iso:11073:10101")) - return "11073"; - if (system.equals("http://dicom.nema.org/resources/ontology/DCM")) - return "dicom"; - return system.replace("/", "_").replace(":", "_").replace("?", "X").replace("#", "X"); + private String normalizeSystemPath(String path) { + return path.replace("/", "").replace('|','X'); } + + public NamedCache getNamedCache(CacheToken cacheToken) { final String cacheName = cacheToken.name == null ? "null" : cacheToken.name; @@ -687,7 +733,7 @@ public class TerminologyCache { public void removeCS(String url) { synchronized (lock) { - String name = getNameForSystem(url); + String name = getSystemNameKeyGenerator().getNameForSystem(url); if (caches.containsKey(name)) { caches.remove(name); } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java index 6b49122c5..0a697a9e2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParser.java @@ -30,7 +30,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java index 28d127241..7c1a7f308 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/RdfParser.java @@ -31,7 +31,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java index 25fc47aa8..5bc6b8e28 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/XmlParser.java @@ -30,7 +30,7 @@ package org.hl7.fhir.r5.formats; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java index 5f45f7d8f..7978c644c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Account.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -200,8 +200,8 @@ public class Account extends DomainResource { @Block() public static class CoverageComponent extends BackboneElement implements IBaseBackboneElement { /** - * The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). - + * The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). + A coverage may only be responsible for specific types of charges, and the sequence of the coverages in the account could be important when processing billing. */ @Child(name = "coverage", type = {Coverage.class}, order=1, min=1, max=1, modifier=false, summary=true) @@ -233,8 +233,8 @@ A coverage may only be responsible for specific types of charges, and the sequen } /** - * @return {@link #coverage} (The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). - + * @return {@link #coverage} (The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). + A coverage may only be responsible for specific types of charges, and the sequence of the coverages in the account could be important when processing billing.) */ public Reference getCoverage() { @@ -251,8 +251,8 @@ A coverage may only be responsible for specific types of charges, and the sequen } /** - * @param value {@link #coverage} (The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). - + * @param value {@link #coverage} (The party(s) that contribute to payment (or part of) of the charges applied to this account (including self-pay). + A coverage may only be responsible for specific types of charges, and the sequence of the coverages in the account could be important when processing billing.) */ public CoverageComponent setCoverage(Reference value) { @@ -1340,7 +1340,9 @@ A coverage may only be responsible for specific types of charges, and the sequen protected CodeableConcept currency; /** - * The calculated account balances - these are calculated and processed by the finance system. The balances with a `term` that is not current are usually generated/updated by an invoicing or similar process. + * The calculated account balances - these are calculated and processed by the finance system. + +The balances with a `term` that is not current are usually generated/updated by an invoicing or similar process. */ @Child(name = "balance", type = {}, order=13, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Calculated account balance(s)", formalDefinition="The calculated account balances - these are calculated and processed by the finance system.\r\rThe balances with a `term` that is not current are usually generated/updated by an invoicing or similar process." ) @@ -1899,7 +1901,9 @@ A coverage may only be responsible for specific types of charges, and the sequen } /** - * @return {@link #balance} (The calculated account balances - these are calculated and processed by the finance system. The balances with a `term` that is not current are usually generated/updated by an invoicing or similar process.) + * @return {@link #balance} (The calculated account balances - these are calculated and processed by the finance system. + +The balances with a `term` that is not current are usually generated/updated by an invoicing or similar process.) */ public List getBalance() { if (this.balance == null) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java index ba2261e24..7715aab79 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActivityDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -114,6 +114,10 @@ public class ActivityDefinition extends MetadataResource { * A record of a non-patient specific request for a medication, substance, device, certain types of biologically derived product, and nutrition product used in the healthcare setting. */ SUPPLYREQUEST, + /** + * A task to be performed. + */ + TASK, /** * An authorization for the provision of glasses and/or contact lenses to a patient. */ @@ -155,6 +159,8 @@ public class ActivityDefinition extends MetadataResource { return SERVICEREQUEST; if ("SupplyRequest".equals(codeString)) return SUPPLYREQUEST; + if ("Task".equals(codeString)) + return TASK; if ("VisionPrescription".equals(codeString)) return VISIONPRESCRIPTION; if (Configuration.isAcceptInvalidEnums()) @@ -179,6 +185,7 @@ public class ActivityDefinition extends MetadataResource { case REQUESTORCHESTRATION: return "RequestOrchestration"; case SERVICEREQUEST: return "ServiceRequest"; case SUPPLYREQUEST: return "SupplyRequest"; + case TASK: return "Task"; case VISIONPRESCRIPTION: return "VisionPrescription"; case NULL: return null; default: return "?"; @@ -201,6 +208,7 @@ public class ActivityDefinition extends MetadataResource { case REQUESTORCHESTRATION: return "http://hl7.org/fhir/fhir-types"; case SERVICEREQUEST: return "http://hl7.org/fhir/fhir-types"; case SUPPLYREQUEST: return "http://hl7.org/fhir/fhir-types"; + case TASK: return "http://hl7.org/fhir/fhir-types"; case VISIONPRESCRIPTION: return "http://hl7.org/fhir/fhir-types"; case NULL: return null; default: return "?"; @@ -223,6 +231,7 @@ public class ActivityDefinition extends MetadataResource { case REQUESTORCHESTRATION: return "A set of related requests that can be used to capture intended activities that have inter-dependencies such as \"give this medication after that one\"."; case SERVICEREQUEST: return "A record of a request for service such as diagnostic investigations, treatments, or operations to be performed."; case SUPPLYREQUEST: return "A record of a non-patient specific request for a medication, substance, device, certain types of biologically derived product, and nutrition product used in the healthcare setting."; + case TASK: return "A task to be performed."; case VISIONPRESCRIPTION: return "An authorization for the provision of glasses and/or contact lenses to a patient."; case NULL: return null; default: return "?"; @@ -245,6 +254,7 @@ public class ActivityDefinition extends MetadataResource { case REQUESTORCHESTRATION: return "RequestOrchestration"; case SERVICEREQUEST: return "ServiceRequest"; case SUPPLYREQUEST: return "SupplyRequest"; + case TASK: return "Task"; case VISIONPRESCRIPTION: return "VisionPrescription"; case NULL: return null; default: return "?"; @@ -287,6 +297,8 @@ public class ActivityDefinition extends MetadataResource { return RequestResourceTypes.SERVICEREQUEST; if ("SupplyRequest".equals(codeString)) return RequestResourceTypes.SUPPLYREQUEST; + if ("Task".equals(codeString)) + return RequestResourceTypes.TASK; if ("VisionPrescription".equals(codeString)) return RequestResourceTypes.VISIONPRESCRIPTION; throw new IllegalArgumentException("Unknown RequestResourceTypes code '"+codeString+"'"); @@ -329,6 +341,8 @@ public class ActivityDefinition extends MetadataResource { return new Enumeration(this, RequestResourceTypes.SERVICEREQUEST); if ("SupplyRequest".equals(codeString)) return new Enumeration(this, RequestResourceTypes.SUPPLYREQUEST); + if ("Task".equals(codeString)) + return new Enumeration(this, RequestResourceTypes.TASK); if ("VisionPrescription".equals(codeString)) return new Enumeration(this, RequestResourceTypes.VISIONPRESCRIPTION); throw new FHIRException("Unknown RequestResourceTypes code '"+codeString+"'"); @@ -364,6 +378,8 @@ public class ActivityDefinition extends MetadataResource { return "ServiceRequest"; if (code == RequestResourceTypes.SUPPLYREQUEST) return "SupplyRequest"; + if (code == RequestResourceTypes.TASK) + return "Task"; if (code == RequestResourceTypes.VISIONPRESCRIPTION) return "VisionPrescription"; return "?"; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActorDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActorDefinition.java index 64767e60e..356bec867 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActorDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ActorDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java index 44eaa9af1..f7a1172ae 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Address.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -46,7 +46,7 @@ import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; /** - * Address Type: An address expressed using postal conventions (as opposed to GPS or other location definition formats). This data type may be used to convey addresses for use in delivering mail as well as for visiting locations which might not be valid for mail delivery. There are a variety of postal address formats defined around the world. + * Address Type: An address expressed using postal conventions (as opposed to GPS or other location definition formats). This data type may be used to convey addresses for use in delivering mail as well as for visiting locations which might not be valid for mail delivery. There are a variety of postal address formats defined around the world. The ISO21090-codedString may be used to provide a coded representation of the contents of strings in an Address. */ @DatatypeDef(name="Address") diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java index 15dceb186..02e378e68 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdministrableProductDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java index c374b3893..048767fc0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AdverseEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java index bcf7ded06..d5becacd0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Age.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java index ecc0dcc00..ae9c9e29e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AllergyIntolerance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java index 7c4b4fe02..4f185541e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Annotation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java index 565f56309..31c6b9b76 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Appointment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -1506,7 +1506,9 @@ public class Appointment extends DomainResource { protected BooleanType sunday; /** - * The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. + * The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. + +e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. */ @Child(name = "weekInterval", type = {PositiveIntType.class}, order=8, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Recurs every nth week", formalDefinition="The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more.\r\re.g. For recurring every second week this interval would be 2, or every third week the interval would be 3." ) @@ -1837,7 +1839,9 @@ public class Appointment extends DomainResource { } /** - * @return {@link #weekInterval} (The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3.). This is the underlying object with id, value and extensions. The accessor "getWeekInterval" gives direct access to the value + * @return {@link #weekInterval} (The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. + +e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3.). This is the underlying object with id, value and extensions. The accessor "getWeekInterval" gives direct access to the value */ public PositiveIntType getWeekIntervalElement() { if (this.weekInterval == null) @@ -1857,7 +1861,9 @@ public class Appointment extends DomainResource { } /** - * @param value {@link #weekInterval} (The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3.). This is the underlying object with id, value and extensions. The accessor "getWeekInterval" gives direct access to the value + * @param value {@link #weekInterval} (The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. + +e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3.). This is the underlying object with id, value and extensions. The accessor "getWeekInterval" gives direct access to the value */ public AppointmentRecurrenceTemplateWeeklyTemplateComponent setWeekIntervalElement(PositiveIntType value) { this.weekInterval = value; @@ -1865,14 +1871,18 @@ public class Appointment extends DomainResource { } /** - * @return The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. + * @return The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. + +e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. */ public int getWeekInterval() { return this.weekInterval == null || this.weekInterval.isEmpty() ? 0 : this.weekInterval.getValue(); } /** - * @param value The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. + * @param value The interval defines if the recurrence is every nth week. The default is every week, so it is expected that this value will be 2 or more. + +e.g. For recurring every second week this interval would be 2, or every third week the interval would be 3. */ public AppointmentRecurrenceTemplateWeeklyTemplateComponent setWeekInterval(int value) { if (this.weekInterval == null) @@ -2825,8 +2835,8 @@ public class Appointment extends DomainResource { protected List participant; /** - * A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within. - + * A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within. + The duration (usually in minutes) could also be provided to indicate the length of the appointment to fill and populate the start/end times for the actual allocated time. However, in other situations the duration may be calculated by the scheduling system. */ @Child(name = "requestedPeriod", type = {Period.class}, order=27, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @@ -4098,8 +4108,8 @@ The duration (usually in minutes) could also be provided to indicate the length } /** - * @return {@link #requestedPeriod} (A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within. - + * @return {@link #requestedPeriod} (A set of date ranges (potentially including times) that the appointment is preferred to be scheduled within. + The duration (usually in minutes) could also be provided to indicate the length of the appointment to fill and populate the start/end times for the actual allocated time. However, in other situations the duration may be calculated by the scheduling system.) */ public List getRequestedPeriod() { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java index 4c14e7512..e806edff6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AppointmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ArtifactAssessment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ArtifactAssessment.java index 9fa07e47b..1d57eaf89 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ArtifactAssessment.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ArtifactAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java index 67589a377..be1065c20 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Attachment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java index d0c82ec49..4b2a5b959 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/AuditEvent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Availability.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Availability.java index 447f97e02..704a51821 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Availability.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Availability.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java index a9522b230..916dd4b73 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneElement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -52,8 +52,8 @@ import ca.uhn.fhir.model.api.annotation.Block; public abstract class BackboneElement extends Element implements IBaseBackboneElement { /** - * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself). */ @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) @@ -70,8 +70,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } /** - * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).) */ public List getModifierExtension() { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java index 5f910c869..8a2c1dae3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BackboneType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -52,8 +52,8 @@ import ca.uhn.fhir.model.api.annotation.Block; public abstract class BackboneType extends DataType implements IBaseBackboneElement { /** - * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself). */ @Child(name = "modifierExtension", type = {Extension.class}, order=0, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) @@ -70,8 +70,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } /** - * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).) */ public List getModifierExtension() { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java index c5fd8c513..31ce00727 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Basic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java index 8700ecb33..ea9953d71 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Binary.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java index 5b4b6b481..0d0cfeb4f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BiologicallyDerivedProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java index 151fcd76c..48a02a315 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/BodyStructure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java index 799b7796a..3cd95bda5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Bundle.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -2798,9 +2798,9 @@ public class Bundle extends Resource implements IBaseBundle { protected List link; /** - * The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: -* invoking a create -* invoking or responding to an operation where the body is not a single identified resource + * The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: +* invoking a create +* invoking or responding to an operation where the body is not a single identified resource * invoking or returning the results of a search or history operation. */ @Child(name = "fullUrl", type = {UriType.class}, order=2, min=0, max=1, modifier=false, summary=true) @@ -2898,9 +2898,9 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return {@link #fullUrl} (The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: -* invoking a create -* invoking or responding to an operation where the body is not a single identified resource + * @return {@link #fullUrl} (The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: +* invoking a create +* invoking or responding to an operation where the body is not a single identified resource * invoking or returning the results of a search or history operation.). This is the underlying object with id, value and extensions. The accessor "getFullUrl" gives direct access to the value */ public UriType getFullUrlElement() { @@ -2921,9 +2921,9 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @param value {@link #fullUrl} (The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: -* invoking a create -* invoking or responding to an operation where the body is not a single identified resource + * @param value {@link #fullUrl} (The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: +* invoking a create +* invoking or responding to an operation where the body is not a single identified resource * invoking or returning the results of a search or history operation.). This is the underlying object with id, value and extensions. The accessor "getFullUrl" gives direct access to the value */ public BundleEntryComponent setFullUrlElement(UriType value) { @@ -2932,9 +2932,9 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @return The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: -* invoking a create -* invoking or responding to an operation where the body is not a single identified resource + * @return The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: +* invoking a create +* invoking or responding to an operation where the body is not a single identified resource * invoking or returning the results of a search or history operation. */ public String getFullUrl() { @@ -2942,9 +2942,9 @@ public class Bundle extends Resource implements IBaseBundle { } /** - * @param value The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: -* invoking a create -* invoking or responding to an operation where the body is not a single identified resource + * @param value The Absolute URL for the resource. The fullUrl SHALL NOT disagree with the id in the resource - i.e. if the fullUrl is not a urn:uuid, the URL shall be version-independent URL consistent with the Resource.id. The fullUrl is a version independent reference to the resource. Even when not required, fullUrl MAY be set to a urn:uuid to allow referencing entries in a transaction. The fullUrl can be an arbitrary URI and is not limited to urn:uuid, urn:oid, http, and https. The fullUrl element SHALL have a value except when: +* invoking a create +* invoking or responding to an operation where the body is not a single identified resource * invoking or returning the results of a search or history operation. */ public BundleEntryComponent setFullUrl(String value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java index bae536003..55de5cc23 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CanonicalResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java index 9d730f38f..f4f89bc87 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CapabilityStatement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java index 31ccaec4c..388159579 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CarePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java index 152842fc7..bc0c09c18 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CareTeam.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java index 8722f43be..4cfa6e072 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java index e8e66e2f3..080dd47f9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ChargeItemDefinition.java @@ -29,12 +29,11 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.math.*; import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.r5.model.Enumerations.*; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java index 0e8f13d0f..ebbfe94a0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Citation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java index b9573b37e..2b06fa1f0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Claim.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java index beb3a378e..b20ee6715 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClaimResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java index ed4d5ede9..15df506a4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalImpression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseDefinition.java index a2d8736f2..53f283585 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ClinicalUseDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java index 23a64b6fd..d3a9ab9b4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java index a75dc1ed0..64131f816 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableConcept.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java index 40a25f46d..c69ceb9f2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CodeableReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java index e67d870a9..7b9ec9832 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coding.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java index e73cfdedb..ba811024f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Communication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java index d90ab339d..89ea9c880 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CommunicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java index 1866d9cd7..3ab1d90ae 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CompartmentDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java index 63086af1a..ceb0c4624 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Composition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java index 4a72a86f5..8783be11c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConceptMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java index e9e63a09c..381edef23 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Condition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java index a1459a6fe..71daa18d0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ConditionDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java index e8924dd7e..2a8c4a295 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Consent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java index 2652a598d..de8342ad2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Constants.java @@ -30,7 +30,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR v5.0.0-ballot +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot @@ -41,6 +41,6 @@ public class Constants { public final static String VERSION = "5.0.0-ballot"; public final static String VERSION_MM = "5.0"; - public final static String DATE = "Mon, Sep 5, 2022 20:11+1000"; + public final static String DATE = "Sat, Nov 5, 2022 10:47+1100"; public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?(Account|ActivityDefinition|ActorDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|ArtifactAssessment|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CarePlan|CareTeam|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseDefinition|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|ConditionDefinition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceDispense|DeviceMetric|DeviceRequest|DeviceUsage|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceReport|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|FormularyItem|GenomicStudy|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingSelection|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|InventoryReport|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationUsage|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionIntake|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Permission|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|RequestOrchestration|Requirements|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SubstanceNucleicAcid|SubstancePolymer|SubstanceProtein|SubstanceReferenceInformation|SubstanceSourceMaterial|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|Transport|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?"; } \ No newline at end of file diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java index 2b5ec0e66..5d23438fb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactDetail.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java index d17e73c10..3b8976787 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ContactPoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java index 005830161..250a55f68 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contract.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java index fe27e6b18..1f50e9960 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Contributor.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java index 10f75ad4a..126920848 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Count.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java index 4cf684715..256487cea 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Coverage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java index 8d31744b2..4876e68a6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java index 2ac0c5b58..3bc026794 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/CoverageEligibilityResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java index 8e6da90e7..6d8166e46 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataRequirement.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -1778,8 +1778,8 @@ public class DataRequirement extends DataType implements ICompositeType { protected DataType subject; /** - * Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. - + * Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. + The value of mustSupport SHALL be a FHIRPath resolveable on the type of the DataRequirement. The path SHALL consist only of identifiers, constant indexers, and .resolve() (see the [Simple FHIRPath Profile](fhirpath.html#simple) for full details). */ @Child(name = "mustSupport", type = {StringType.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @@ -1996,8 +1996,8 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data } /** - * @return {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. - + * @return {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. + The value of mustSupport SHALL be a FHIRPath resolveable on the type of the DataRequirement. The path SHALL consist only of identifiers, constant indexers, and .resolve() (see the [Simple FHIRPath Profile](fhirpath.html#simple) for full details).) */ public List getMustSupport() { @@ -2024,8 +2024,8 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data } /** - * @return {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. - + * @return {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. + The value of mustSupport SHALL be a FHIRPath resolveable on the type of the DataRequirement. The path SHALL consist only of identifiers, constant indexers, and .resolve() (see the [Simple FHIRPath Profile](fhirpath.html#simple) for full details).) */ public StringType addMustSupportElement() {//2 @@ -2037,8 +2037,8 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data } /** - * @param value {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. - + * @param value {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. + The value of mustSupport SHALL be a FHIRPath resolveable on the type of the DataRequirement. The path SHALL consist only of identifiers, constant indexers, and .resolve() (see the [Simple FHIRPath Profile](fhirpath.html#simple) for full details).) */ public DataRequirement addMustSupport(String value) { //1 @@ -2051,8 +2051,8 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data } /** - * @param value {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. - + * @param value {@link #mustSupport} (Indicates that specific elements of the type are referenced by the knowledge module and must be supported by the consumer in order to obtain an effective evaluation. This does not mean that a value is required for this element, only that the consuming system must understand the element and be able to provide values for it if they are available. + The value of mustSupport SHALL be a FHIRPath resolveable on the type of the DataRequirement. The path SHALL consist only of identifiers, constant indexers, and .resolve() (see the [Simple FHIRPath Profile](fhirpath.html#simple) for full details).) */ public boolean hasMustSupport(String value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java index 683807709..6ce65fa0c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DataType.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java index 7c2b84c6e..f98a3a621 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DetectedIssue.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java index 7d50d7615..d436b9130 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Device.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -351,10 +351,10 @@ public class Device extends DomainResource { protected StringType deviceIdentifier; /** - * Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: -1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, -2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, -3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, + * Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: +1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, +2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, +3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, 4) ICCBA for other devices: http://hl7.org/fhir/NamingSystem/iccbba-other-di # Informationsstelle für Arzneispezialitäten (IFA GmbH) (EU only): http://hl7.org/fhir/NamingSystem/ifa-gmbh-di. */ @Child(name = "issuer", type = {UriType.class}, order=2, min=1, max=1, modifier=false, summary=true) @@ -454,10 +454,10 @@ public class Device extends DomainResource { } /** - * @return {@link #issuer} (Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: -1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, -2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, -3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, + * @return {@link #issuer} (Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: +1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, +2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, +3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, 4) ICCBA for other devices: http://hl7.org/fhir/NamingSystem/iccbba-other-di # Informationsstelle für Arzneispezialitäten (IFA GmbH) (EU only): http://hl7.org/fhir/NamingSystem/ifa-gmbh-di.). This is the underlying object with id, value and extensions. The accessor "getIssuer" gives direct access to the value */ public UriType getIssuerElement() { @@ -478,10 +478,10 @@ public class Device extends DomainResource { } /** - * @param value {@link #issuer} (Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: -1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, -2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, -3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, + * @param value {@link #issuer} (Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: +1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, +2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, +3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, 4) ICCBA for other devices: http://hl7.org/fhir/NamingSystem/iccbba-other-di # Informationsstelle für Arzneispezialitäten (IFA GmbH) (EU only): http://hl7.org/fhir/NamingSystem/ifa-gmbh-di.). This is the underlying object with id, value and extensions. The accessor "getIssuer" gives direct access to the value */ public DeviceUdiCarrierComponent setIssuerElement(UriType value) { @@ -490,10 +490,10 @@ public class Device extends DomainResource { } /** - * @return Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: -1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, -2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, -3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, + * @return Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: +1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, +2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, +3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, 4) ICCBA for other devices: http://hl7.org/fhir/NamingSystem/iccbba-other-di # Informationsstelle für Arzneispezialitäten (IFA GmbH) (EU only): http://hl7.org/fhir/NamingSystem/ifa-gmbh-di. */ public String getIssuer() { @@ -501,10 +501,10 @@ public class Device extends DomainResource { } /** - * @param value Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: -1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, -2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, -3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, + * @param value Organization that is charged with issuing UDIs for devices. For example, the US FDA issuers include: +1) GS1: http://hl7.org/fhir/NamingSystem/gs1-di, +2) HIBCC: http://hl7.org/fhir/NamingSystem/hibcc-diI, +3) ICCBBA for blood containers: http://hl7.org/fhir/NamingSystem/iccbba-blood-di, 4) ICCBA for other devices: http://hl7.org/fhir/NamingSystem/iccbba-other-di # Informationsstelle für Arzneispezialitäten (IFA GmbH) (EU only): http://hl7.org/fhir/NamingSystem/ifa-gmbh-di. */ public DeviceUdiCarrierComponent setIssuer(String value) { @@ -909,7 +909,7 @@ public class Device extends DomainResource { protected StringType name; /** - * The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. + * The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. RegisteredName | UserFriendlyName | PatientReportedName. */ @Child(name = "type", type = {CodeType.class}, order=2, min=1, max=1, modifier=false, summary=false) @@ -981,7 +981,7 @@ RegisteredName | UserFriendlyName | PatientReportedName. } /** - * @return {@link #type} (The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. + * @return {@link #type} (The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public Enumeration getTypeElement() { @@ -1002,7 +1002,7 @@ RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlyin } /** - * @param value {@link #type} (The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. + * @param value {@link #type} (The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public DeviceDeviceNameComponent setTypeElement(Enumeration value) { @@ -1011,7 +1011,7 @@ RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlyin } /** - * @return The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. + * @return The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. RegisteredName | UserFriendlyName | PatientReportedName. */ public DeviceNameType getType() { @@ -1019,7 +1019,7 @@ RegisteredName | UserFriendlyName | PatientReportedName. } /** - * @param value The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. + * @param value The type of deviceName. Note that ManufactureDeviceName means that the name is the name as given by the manufacturer, not the name of the manufacturer. RegisteredName | UserFriendlyName | PatientReportedName. */ public DeviceDeviceNameComponent setType(DeviceNameType value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java index 57f982e8b..28b426462 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -1468,7 +1468,7 @@ public class DeviceDefinition extends DomainResource { protected StringType name; /** - * The type of deviceName. + * The type of deviceName. RegisteredName | UserFriendlyName | PatientReportedName. */ @Child(name = "type", type = {CodeType.class}, order=2, min=1, max=1, modifier=false, summary=false) @@ -1540,7 +1540,7 @@ RegisteredName | UserFriendlyName | PatientReportedName. } /** - * @return {@link #type} (The type of deviceName. + * @return {@link #type} (The type of deviceName. RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public Enumeration getTypeElement() { @@ -1561,7 +1561,7 @@ RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlyin } /** - * @param value {@link #type} (The type of deviceName. + * @param value {@link #type} (The type of deviceName. RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public DeviceDefinitionDeviceNameComponent setTypeElement(Enumeration value) { @@ -1570,7 +1570,7 @@ RegisteredName | UserFriendlyName | PatientReportedName.). This is the underlyin } /** - * @return The type of deviceName. + * @return The type of deviceName. RegisteredName | UserFriendlyName | PatientReportedName. */ public DeviceNameType getType() { @@ -1578,7 +1578,7 @@ RegisteredName | UserFriendlyName | PatientReportedName. } /** - * @param value The type of deviceName. + * @param value The type of deviceName. RegisteredName | UserFriendlyName | PatientReportedName. */ public DeviceDefinitionDeviceNameComponent setType(DeviceNameType value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDispense.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDispense.java index 40501b69c..c4bb3a90b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDispense.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java index c1c1b6e13..ecec879af 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceMetric.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java index 12b7f6941..981566964 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUsage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUsage.java index 2a974e2c9..e661e7ef1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUsage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DeviceUsage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java index 3de4a5cc8..62140319c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DiagnosticReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java index 2dca21050..69a25c506 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Distance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java index 492471cc6..7e59df18e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentManifest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java index 138f8ae7f..1833141f5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DocumentReference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java index 440f30b17..2194b686e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/DomainResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -79,8 +79,8 @@ public abstract class DomainResource extends Resource implements IBaseHasExtensi protected List extension; /** - * May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself). */ @Child(name = "modifierExtension", type = {Extension.class}, order=3, min=0, max=Child.MAX_UNLIMITED, modifier=true, summary=true) @@ -199,8 +199,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or } /** - * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. - + * @return {@link #modifierExtension} (May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element's descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and manageable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions. + Modifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).) */ public List getModifierExtension() { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java index a6800e178..849f67520 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Dosage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java index 73c9a8308..d4c5bbc0a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Duration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java index a9a28a5c3..1d3b2499e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Element.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java index 28e38c493..551a8902f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ElementDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -5223,18 +5223,18 @@ public boolean hasTarget() { protected DataType fixed; /** - * Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have. */ @Child(name = "pattern", type = {Base64BinaryType.class, BooleanType.class, CanonicalType.class, CodeType.class, DateType.class, DateTimeType.class, DecimalType.class, IdType.class, InstantType.class, IntegerType.class, Integer64Type.class, MarkdownType.class, OidType.class, PositiveIntType.class, StringType.class, TimeType.class, UnsignedIntType.class, UriType.class, UrlType.class, UuidType.class, Address.class, Age.class, Annotation.class, Attachment.class, CodeableConcept.class, CodeableReference.class, Coding.class, ContactPoint.class, Count.class, Distance.class, Duration.class, HumanName.class, Identifier.class, Money.class, Period.class, Quantity.class, Range.class, Ratio.class, RatioRange.class, Reference.class, SampledData.class, Signature.class, Timing.class, ContactDetail.class, DataRequirement.class, Expression.class, ParameterDefinition.class, RelatedArtifact.class, TriggerDefinition.class, UsageContext.class, Availability.class, ExtendedContactDetail.class, Dosage.class, Meta.class}, order=21, min=0, max=1, modifier=false, summary=true) @@ -7906,18 +7906,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public DataType getPattern() { @@ -7925,18 +7925,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Base64BinaryType getPatternBase64BinaryType() throws FHIRException { @@ -7952,18 +7952,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public BooleanType getPatternBooleanType() throws FHIRException { @@ -7979,18 +7979,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public CanonicalType getPatternCanonicalType() throws FHIRException { @@ -8006,18 +8006,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public CodeType getPatternCodeType() throws FHIRException { @@ -8033,18 +8033,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public DateType getPatternDateType() throws FHIRException { @@ -8060,18 +8060,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public DateTimeType getPatternDateTimeType() throws FHIRException { @@ -8087,18 +8087,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public DecimalType getPatternDecimalType() throws FHIRException { @@ -8114,18 +8114,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public IdType getPatternIdType() throws FHIRException { @@ -8141,18 +8141,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public InstantType getPatternInstantType() throws FHIRException { @@ -8168,18 +8168,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public IntegerType getPatternIntegerType() throws FHIRException { @@ -8195,18 +8195,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Integer64Type getPatternInteger64Type() throws FHIRException { @@ -8222,18 +8222,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public MarkdownType getPatternMarkdownType() throws FHIRException { @@ -8249,18 +8249,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public OidType getPatternOidType() throws FHIRException { @@ -8276,18 +8276,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public PositiveIntType getPatternPositiveIntType() throws FHIRException { @@ -8303,18 +8303,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public StringType getPatternStringType() throws FHIRException { @@ -8330,18 +8330,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public TimeType getPatternTimeType() throws FHIRException { @@ -8357,18 +8357,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public UnsignedIntType getPatternUnsignedIntType() throws FHIRException { @@ -8384,18 +8384,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public UriType getPatternUriType() throws FHIRException { @@ -8411,18 +8411,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public UrlType getPatternUrlType() throws FHIRException { @@ -8438,18 +8438,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public UuidType getPatternUuidType() throws FHIRException { @@ -8465,18 +8465,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Address getPatternAddress() throws FHIRException { @@ -8492,18 +8492,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Age getPatternAge() throws FHIRException { @@ -8519,18 +8519,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Annotation getPatternAnnotation() throws FHIRException { @@ -8546,18 +8546,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Attachment getPatternAttachment() throws FHIRException { @@ -8573,18 +8573,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public CodeableConcept getPatternCodeableConcept() throws FHIRException { @@ -8600,18 +8600,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public CodeableReference getPatternCodeableReference() throws FHIRException { @@ -8627,18 +8627,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Coding getPatternCoding() throws FHIRException { @@ -8654,18 +8654,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public ContactPoint getPatternContactPoint() throws FHIRException { @@ -8681,18 +8681,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Count getPatternCount() throws FHIRException { @@ -8708,18 +8708,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Distance getPatternDistance() throws FHIRException { @@ -8735,18 +8735,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Duration getPatternDuration() throws FHIRException { @@ -8762,18 +8762,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public HumanName getPatternHumanName() throws FHIRException { @@ -8789,18 +8789,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Identifier getPatternIdentifier() throws FHIRException { @@ -8816,18 +8816,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Money getPatternMoney() throws FHIRException { @@ -8843,18 +8843,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Period getPatternPeriod() throws FHIRException { @@ -8870,18 +8870,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Quantity getPatternQuantity() throws FHIRException { @@ -8897,18 +8897,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Range getPatternRange() throws FHIRException { @@ -8924,18 +8924,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Ratio getPatternRatio() throws FHIRException { @@ -8951,18 +8951,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public RatioRange getPatternRatioRange() throws FHIRException { @@ -8978,18 +8978,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Reference getPatternReference() throws FHIRException { @@ -9005,18 +9005,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public SampledData getPatternSampledData() throws FHIRException { @@ -9032,18 +9032,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Signature getPatternSignature() throws FHIRException { @@ -9059,18 +9059,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Timing getPatternTiming() throws FHIRException { @@ -9086,18 +9086,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public ContactDetail getPatternContactDetail() throws FHIRException { @@ -9113,18 +9113,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public DataRequirement getPatternDataRequirement() throws FHIRException { @@ -9140,18 +9140,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Expression getPatternExpression() throws FHIRException { @@ -9167,18 +9167,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public ParameterDefinition getPatternParameterDefinition() throws FHIRException { @@ -9194,18 +9194,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public RelatedArtifact getPatternRelatedArtifact() throws FHIRException { @@ -9221,18 +9221,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public TriggerDefinition getPatternTriggerDefinition() throws FHIRException { @@ -9248,18 +9248,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public UsageContext getPatternUsageContext() throws FHIRException { @@ -9275,18 +9275,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Availability getPatternAvailability() throws FHIRException { @@ -9302,18 +9302,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public ExtendedContactDetail getPatternExtendedContactDetail() throws FHIRException { @@ -9329,18 +9329,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Dosage getPatternDosage() throws FHIRException { @@ -9356,18 +9356,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @return {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public Meta getPatternMeta() throws FHIRException { @@ -9387,18 +9387,18 @@ If a pattern[x] is declared on a repeating element, the pattern applies to all r } /** - * @param value {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. - -When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. - -When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. - -When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., - -1. If primitive: it must match exactly the pattern value -2. If a complex object: it must match (recursively) the pattern value -3. If an array: it must match (recursively) the pattern value - + * @param value {@link #pattern} (Specifies a value that each occurrence of the element in the instance SHALL follow - that is, any value in the pattern must be found in the instance, if the element has a value. Other additional values may be found too. This is effectively constraint by example. + +When pattern[x] is used to constrain a primitive, it means that the value provided in the pattern[x] must match the instance value exactly. + +When an element within a pattern[x] is used to constrain an array, it means that each element provided in the pattern[x] must (recursively) match at least one element from the instance array. + +When pattern[x] is used to constrain a complex object, it means that each property in the pattern must be present in the complex object, and its value must recursively match -- i.e., + +1. If primitive: it must match exactly the pattern value +2. If a complex object: it must match (recursively) the pattern value +3. If an array: it must match (recursively) the pattern value + If a pattern[x] is declared on a repeating element, the pattern applies to all repetitions. If the desire is for a pattern to apply to only one element or a subset of elements, slicing must be used. See [Examples of Patterns](elementdefinition-examples.html#pattern-examples) for examples of pattern usage and the effect it will have.) */ public ElementDefinition setPattern(DataType value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java index 43b062fdc..5ddcbb5bc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Encounter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -2507,7 +2507,9 @@ public class Encounter extends DomainResource { protected DateTimeType plannedEndDate; /** - * Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. When missing it is the time in between the start and end values. + * Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. + +When missing it is the time in between the start and end values. */ @Child(name = "length", type = {Duration.class}, order=21, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Actual quantity of time the encounter lasted (less time absent)", formalDefinition="Actual quantity of time the encounter lasted. This excludes the time during leaves of absence.\r\rWhen missing it is the time in between the start and end values." ) @@ -3490,7 +3492,9 @@ public class Encounter extends DomainResource { } /** - * @return {@link #length} (Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. When missing it is the time in between the start and end values.) + * @return {@link #length} (Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. + +When missing it is the time in between the start and end values.) */ public Duration getLength() { if (this.length == null) @@ -3506,7 +3510,9 @@ public class Encounter extends DomainResource { } /** - * @param value {@link #length} (Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. When missing it is the time in between the start and end values.) + * @param value {@link #length} (Actual quantity of time the encounter lasted. This excludes the time during leaves of absence. + +When missing it is the time in between the start and end values.) */ public Encounter setLength(Duration value) { this.length = value; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java index 4574649c1..bff5c6200 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Endpoint.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java index 1c87adc77..a5b381e58 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java index 50cb72ec9..5bcb83a99 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EnrollmentResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; 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 e9580f214..399d32d35 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 @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import org.hl7.fhir.instance.model.api.*; @@ -1677,8 +1677,8 @@ public class Enumerations { */ MEDICATIONREQUEST, /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ MEDICATIONUSAGE, @@ -8783,7 +8783,7 @@ The primary difference between a medicationusage and a medicationadministration */ DATATYPE, /** - * Address Type: An address expressed using postal conventions (as opposed to GPS or other location definition formats). This data type may be used to convey addresses for use in delivering mail as well as for visiting locations which might not be valid for mail delivery. There are a variety of postal address formats defined around the world. + * Address Type: An address expressed using postal conventions (as opposed to GPS or other location definition formats). This data type may be used to convey addresses for use in delivering mail as well as for visiting locations which might not be valid for mail delivery. There are a variety of postal address formats defined around the world. The ISO21090-codedString may be used to provide a coded representation of the contents of strings in an Address. */ ADDRESS, @@ -9420,8 +9420,8 @@ The ISO21090-codedString may be used to provide a coded representation of the co */ MEDICATIONREQUEST, /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ MEDICATIONUSAGE, @@ -12628,7 +12628,7 @@ 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_SNAPSHOT1, _4_3_0_CIBUILD, /** * R5 Preview #1 version. @@ -12775,10 +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.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)) @@ -12964,8 +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_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"; @@ -13025,8 +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_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"; @@ -13088,8 +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_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."; @@ -13150,8 +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_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"; @@ -13254,10 +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.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)) @@ -13374,10 +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.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)) @@ -13489,10 +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_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) @@ -15798,8 +15798,8 @@ The primary difference between a medicationusage and a medicationadministration */ MEDICATIONREQUEST, /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ MEDICATIONUSAGE, diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java index 818dad98c..9d4248a36 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EpisodeOfCare.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java index 2e8e8ef41..085f125dc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EventDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java index 74932b081..ae84c09d2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Evidence.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java index c863dc02a..13de5d06c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java index 92269bfa4..35925ac6f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/EvidenceVariable.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java index eb7aa22a5..11cf21e3b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExampleScenario.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java index 66eb474ad..34c668b1e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExplanationOfBenefit.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java index 1a798fe23..a7d893304 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Expression.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExtendedContactDetail.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExtendedContactDetail.java index 7a2ce5164..35904b422 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExtendedContactDetail.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ExtendedContactDetail.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java index eb3d27b37..bf4dd40ab 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Extension.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java index bda7d6a98..6e117bb83 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FamilyMemberHistory.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java index cec08687d..8d2c6e7cb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Flag.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FormularyItem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FormularyItem.java index feaf677cb..db586aada 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FormularyItem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/FormularyItem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GenomicStudy.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GenomicStudy.java index ab7f5daf8..f25ed39aa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GenomicStudy.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GenomicStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java index afdc780ad..170277a25 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Goal.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java index a75313f45..c23d1f865 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GraphDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java index ffe5b6a57..7a6bb1546 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Group.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -1093,9 +1093,9 @@ public class Group extends DomainResource { protected Enumeration type; /** - * Basis for membership in the Group: - -* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. + * Basis for membership in the Group: + +* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. * 'enumerated': The Group.characteristics are necessary but not sufficient to determine membership. Membership is determined by being listed as one of the Group.member. */ @Child(name = "membership", type = {CodeType.class}, order=3, min=1, max=1, modifier=false, summary=true) @@ -1314,9 +1314,9 @@ public class Group extends DomainResource { } /** - * @return {@link #membership} (Basis for membership in the Group: - -* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. + * @return {@link #membership} (Basis for membership in the Group: + +* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. * 'enumerated': The Group.characteristics are necessary but not sufficient to determine membership. Membership is determined by being listed as one of the Group.member.). This is the underlying object with id, value and extensions. The accessor "getMembership" gives direct access to the value */ public Enumeration getMembershipElement() { @@ -1337,9 +1337,9 @@ public class Group extends DomainResource { } /** - * @param value {@link #membership} (Basis for membership in the Group: - -* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. + * @param value {@link #membership} (Basis for membership in the Group: + +* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. * 'enumerated': The Group.characteristics are necessary but not sufficient to determine membership. Membership is determined by being listed as one of the Group.member.). This is the underlying object with id, value and extensions. The accessor "getMembership" gives direct access to the value */ public Group setMembershipElement(Enumeration value) { @@ -1348,9 +1348,9 @@ public class Group extends DomainResource { } /** - * @return Basis for membership in the Group: - -* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. + * @return Basis for membership in the Group: + +* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. * 'enumerated': The Group.characteristics are necessary but not sufficient to determine membership. Membership is determined by being listed as one of the Group.member. */ public GroupMembershipBasis getMembership() { @@ -1358,9 +1358,9 @@ public class Group extends DomainResource { } /** - * @param value Basis for membership in the Group: - -* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. + * @param value Basis for membership in the Group: + +* 'definitional': The Group.characteristics specified are both necessary and sufficient to determine membership. All entities that meet the criteria are considered to be members of the group, whether referenced by the group or not. If members are present, they are individuals that happen to be known as meeting the Group.characteristics. The list cannot be presumed to be complete. * 'enumerated': The Group.characteristics are necessary but not sufficient to determine membership. Membership is determined by being listed as one of the Group.member. */ public Group setMembership(GroupMembershipBasis value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java index f0fb2f1b0..6393ec80f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/GuidanceResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java index cda823a50..d0349f7c2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HealthcareService.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java index 02f8b9ebc..592535268 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/HumanName.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java index 50311d160..697034603 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Identifier.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingSelection.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingSelection.java index 42ab1f36b..03fddfab5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingSelection.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingSelection.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -697,11 +697,11 @@ public class ImagingSelection extends DomainResource { protected Coding sopClass; /** - * Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. - May be one of: - - A list of frame numbers selected from a multiframe SOP Instance. - - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. - - A list of segment numbers selected from a segmentation SOP Instance. + * Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. + May be one of: + - A list of frame numbers selected from a multiframe SOP Instance. + - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. + - A list of segment numbers selected from a segmentation SOP Instance. - A list of Region of Interest (ROI) numbers selected from a radiotherapy structure set SOP Instance. */ @Child(name = "subset", type = {StringType.class}, order=4, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @@ -709,7 +709,7 @@ public class ImagingSelection extends DomainResource { protected List subset; /** - * Each imaging selection instance or frame list might includes an image region, specified by a region type and a set of 2D coordinates. + * Each imaging selection instance or frame list might includes an image region, specified by a region type and a set of 2D coordinates. If the parent imagingSelection.instance contains a subset element of type frame, the image region applies to all frames in the subset list. */ @Child(name = "imageRegion", type = {}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @@ -848,11 +848,11 @@ public class ImagingSelection extends DomainResource { } /** - * @return {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. - May be one of: - - A list of frame numbers selected from a multiframe SOP Instance. - - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. - - A list of segment numbers selected from a segmentation SOP Instance. + * @return {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. + May be one of: + - A list of frame numbers selected from a multiframe SOP Instance. + - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. + - A list of segment numbers selected from a segmentation SOP Instance. - A list of Region of Interest (ROI) numbers selected from a radiotherapy structure set SOP Instance.) */ public List getSubset() { @@ -879,11 +879,11 @@ public class ImagingSelection extends DomainResource { } /** - * @return {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. - May be one of: - - A list of frame numbers selected from a multiframe SOP Instance. - - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. - - A list of segment numbers selected from a segmentation SOP Instance. + * @return {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. + May be one of: + - A list of frame numbers selected from a multiframe SOP Instance. + - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. + - A list of segment numbers selected from a segmentation SOP Instance. - A list of Region of Interest (ROI) numbers selected from a radiotherapy structure set SOP Instance.) */ public StringType addSubsetElement() {//2 @@ -895,11 +895,11 @@ public class ImagingSelection extends DomainResource { } /** - * @param value {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. - May be one of: - - A list of frame numbers selected from a multiframe SOP Instance. - - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. - - A list of segment numbers selected from a segmentation SOP Instance. + * @param value {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. + May be one of: + - A list of frame numbers selected from a multiframe SOP Instance. + - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. + - A list of segment numbers selected from a segmentation SOP Instance. - A list of Region of Interest (ROI) numbers selected from a radiotherapy structure set SOP Instance.) */ public ImagingSelectionInstanceComponent addSubset(String value) { //1 @@ -912,11 +912,11 @@ public class ImagingSelection extends DomainResource { } /** - * @param value {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. - May be one of: - - A list of frame numbers selected from a multiframe SOP Instance. - - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. - - A list of segment numbers selected from a segmentation SOP Instance. + * @param value {@link #subset} (Selected subset of the SOP Instance. The content and format of the subset item is determined by the SOP Class of the selected instance. + May be one of: + - A list of frame numbers selected from a multiframe SOP Instance. + - A list of Content Item Observation UID values selected from a DICOM SR or other structured document SOP Instance. + - A list of segment numbers selected from a segmentation SOP Instance. - A list of Region of Interest (ROI) numbers selected from a radiotherapy structure set SOP Instance.) */ public boolean hasSubset(String value) { @@ -929,7 +929,7 @@ public class ImagingSelection extends DomainResource { } /** - * @return {@link #imageRegion} (Each imaging selection instance or frame list might includes an image region, specified by a region type and a set of 2D coordinates. + * @return {@link #imageRegion} (Each imaging selection instance or frame list might includes an image region, specified by a region type and a set of 2D coordinates. If the parent imagingSelection.instance contains a subset element of type frame, the image region applies to all frames in the subset list.) */ public List getImageRegion() { @@ -1173,7 +1173,7 @@ public class ImagingSelection extends DomainResource { protected Enumeration regionType; /** - * The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. + * The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. The origin at the TLHC of the TLHC pixel is 0.0\0.0, the BRHC of the TLHC pixel is 1.0\1.0, and the BRHC of the BRHC pixel is the number of columns\rows in the image / frames. The values must be within the range 0\0 to the number of columns\rows in the image / frames. */ @Child(name = "coordinate", type = {DecimalType.class}, order=2, min=1, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @@ -1244,7 +1244,7 @@ public class ImagingSelection extends DomainResource { } /** - * @return {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. + * @return {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. The origin at the TLHC of the TLHC pixel is 0.0\0.0, the BRHC of the TLHC pixel is 1.0\1.0, and the BRHC of the BRHC pixel is the number of columns\rows in the image / frames. The values must be within the range 0\0 to the number of columns\rows in the image / frames.) */ public List getCoordinate() { @@ -1271,7 +1271,7 @@ public class ImagingSelection extends DomainResource { } /** - * @return {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. + * @return {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. The origin at the TLHC of the TLHC pixel is 0.0\0.0, the BRHC of the TLHC pixel is 1.0\1.0, and the BRHC of the BRHC pixel is the number of columns\rows in the image / frames. The values must be within the range 0\0 to the number of columns\rows in the image / frames.) */ public DecimalType addCoordinateElement() {//2 @@ -1283,7 +1283,7 @@ public class ImagingSelection extends DomainResource { } /** - * @param value {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. + * @param value {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. The origin at the TLHC of the TLHC pixel is 0.0\0.0, the BRHC of the TLHC pixel is 1.0\1.0, and the BRHC of the BRHC pixel is the number of columns\rows in the image / frames. The values must be within the range 0\0 to the number of columns\rows in the image / frames.) */ public ImagingSelectionInstanceImageRegionComponent addCoordinate(BigDecimal value) { //1 @@ -1296,7 +1296,7 @@ public class ImagingSelection extends DomainResource { } /** - * @param value {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. + * @param value {@link #coordinate} (The coordinates describing the image region. Encoded as a set of (column, row) pairs that denote positions in the selected image / frames specified with sub-pixel resolution. The origin at the TLHC of the TLHC pixel is 0.0\0.0, the BRHC of the TLHC pixel is 1.0\1.0, and the BRHC of the BRHC pixel is the number of columns\rows in the image / frames. The values must be within the range 0\0 to the number of columns\rows in the image / frames.) */ public boolean hasCoordinate(BigDecimal value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java index 36d5bbefc..c8d42d9df 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImagingStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java index 359951a22..b65d79f4e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Immunization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java index a74d87ac2..420318abe 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationEvaluation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java index 174c30e92..a7bcd80b6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImmunizationRecommendation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java index c013a9712..4ba9b89dd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ImplementationGuide.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java index be3b5337a..2df09d5f6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ingredient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java index 8720d58e8..e82c42e5f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InsurancePlan.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InventoryReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InventoryReport.java index 67c324cf4..10de5e0d1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InventoryReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/InventoryReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java index c5cc7abdf..d3e190aeb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Invoice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java index 9eda587a4..4cf88c17b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Library.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java index 1371c263f..1402c354d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Linkage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java index 7d12b2261..854be74f9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ListResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java index ca247b7d5..63ac88934 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Location.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -2190,10 +2190,12 @@ public class Location extends DomainResource { /** * Search parameter: near *

- * Description: Search for locations where the location.position is near to, or within a specified distance of, the provided coordinates expressed as [latitude]|[longitude]|[distance]|[units] (using the WGS84 datum, see notes). - -Servers which support the near parameter SHALL support the unit string 'km' for kilometers and SHOULD support '[mi_us]' for miles, support for other units is optional. If the units are omitted, then kms should be assumed. If the distance is omitted, then the server can use its own discretion as to what distances should be considered near (and units are irrelevant). If the server is unable to understand the units (and does support the near search parameter), it MIGHT return an OperationOutcome and fail the search with a http status 400 BadRequest. If the server does not support the near parameter, the parameter MIGHT report the unused parameter in a bundled OperationOutcome and still perform the search ignoring the near parameter. - + * Description: Search for locations where the location.position is near to, or within a specified distance of, the provided coordinates expressed as [latitude]|[longitude]|[distance]|[units] (using the WGS84 datum, see notes). + +Servers which support the near parameter SHALL support the unit string 'km' for kilometers and SHOULD support '[mi_us]' for miles, support for other units is optional. If the units are omitted, then kms should be assumed. If the distance is omitted, then the server can use its own discretion as to what distances should be considered near (and units are irrelevant). + +If the server is unable to understand the units (and does support the near search parameter), it MIGHT return an OperationOutcome and fail the search with a http status 400 BadRequest. If the server does not support the near parameter, the parameter MIGHT report the unused parameter in a bundled OperationOutcome and still perform the search ignoring the near parameter. + Note: The algorithm to determine the distance is not defined by the specification, and systems might have different engines that calculate things differently. They could consider geographic point to point, or path via road, or including current traffic conditions, or just simple neighboring postcodes/localities if that's all it had access to.
* Type: special
* Path: Location.position
@@ -2204,10 +2206,12 @@ Note: The algorithm to determine the distance is not defined by the specificatio /** * Fluent Client search parameter constant for near *

- * Description: Search for locations where the location.position is near to, or within a specified distance of, the provided coordinates expressed as [latitude]|[longitude]|[distance]|[units] (using the WGS84 datum, see notes). - -Servers which support the near parameter SHALL support the unit string 'km' for kilometers and SHOULD support '[mi_us]' for miles, support for other units is optional. If the units are omitted, then kms should be assumed. If the distance is omitted, then the server can use its own discretion as to what distances should be considered near (and units are irrelevant). If the server is unable to understand the units (and does support the near search parameter), it MIGHT return an OperationOutcome and fail the search with a http status 400 BadRequest. If the server does not support the near parameter, the parameter MIGHT report the unused parameter in a bundled OperationOutcome and still perform the search ignoring the near parameter. - + * Description: Search for locations where the location.position is near to, or within a specified distance of, the provided coordinates expressed as [latitude]|[longitude]|[distance]|[units] (using the WGS84 datum, see notes). + +Servers which support the near parameter SHALL support the unit string 'km' for kilometers and SHOULD support '[mi_us]' for miles, support for other units is optional. If the units are omitted, then kms should be assumed. If the distance is omitted, then the server can use its own discretion as to what distances should be considered near (and units are irrelevant). + +If the server is unable to understand the units (and does support the near search parameter), it MIGHT return an OperationOutcome and fail the search with a http status 400 BadRequest. If the server does not support the near parameter, the parameter MIGHT report the unused parameter in a bundled OperationOutcome and still perform the search ignoring the near parameter. + Note: The algorithm to determine the distance is not defined by the specification, and systems might have different engines that calculate things differently. They could consider geographic point to point, or path via road, or including current traffic conditions, or just simple neighboring postcodes/localities if that's all it had access to.
* Type: special
* Path: Location.position
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java index b3e3eec10..82320915e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ManufacturedItemDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java index 97b434a72..3861d03f4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MarketingStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java index 7512a4769..4310071a3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Measure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java index eb198842c..f4a79e708 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MeasureReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java index aa2278463..a99e7bee1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Medication.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java index 30e1f1dc0..92a2c6b4b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationAdministration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -442,7 +442,9 @@ public class MedicationAdministration extends DomainResource { @Block() public static class MedicationAdministrationDosageComponent extends BackboneElement implements IBaseBackboneElement { /** - * Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. The dosage instructions should reflect the dosage of the medication that was administered. + * Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. + +The dosage instructions should reflect the dosage of the medication that was administered. */ @Child(name = "text", type = {StringType.class}, order=1, min=0, max=1, modifier=false, summary=false) @Description(shortDefinition="Free text dosage instructions e.g. SIG", formalDefinition="Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans.\r\rThe dosage instructions should reflect the dosage of the medication that was administered." ) @@ -496,7 +498,9 @@ public class MedicationAdministration extends DomainResource { } /** - * @return {@link #text} (Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. The dosage instructions should reflect the dosage of the medication that was administered.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value + * @return {@link #text} (Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. + +The dosage instructions should reflect the dosage of the medication that was administered.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value */ public StringType getTextElement() { if (this.text == null) @@ -516,7 +520,9 @@ public class MedicationAdministration extends DomainResource { } /** - * @param value {@link #text} (Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. The dosage instructions should reflect the dosage of the medication that was administered.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value + * @param value {@link #text} (Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. + +The dosage instructions should reflect the dosage of the medication that was administered.). This is the underlying object with id, value and extensions. The accessor "getText" gives direct access to the value */ public MedicationAdministrationDosageComponent setTextElement(StringType value) { this.text = value; @@ -524,14 +530,18 @@ public class MedicationAdministration extends DomainResource { } /** - * @return Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. The dosage instructions should reflect the dosage of the medication that was administered. + * @return Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. + +The dosage instructions should reflect the dosage of the medication that was administered. */ public String getText() { return this.text == null ? null : this.text.getValue(); } /** - * @param value Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. The dosage instructions should reflect the dosage of the medication that was administered. + * @param value Free text dosage can be used for cases where the dosage administered is too complex to code. When coded dosage is present, the free text dosage may still be present for display to humans. + +The dosage instructions should reflect the dosage of the medication that was administered. */ public MedicationAdministrationDosageComponent setText(String value) { if (Utilities.noString(value)) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java index 496930429..c759bc915 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationDispense.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java index c97e0d0a9..0454721f9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationKnowledge.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java index 37d43dbd4..3df57fec1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java index 2c6bf1a5b..a18dfda3a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicationUsage.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -48,8 +48,8 @@ import ca.uhn.fhir.model.api.annotation.Description; import ca.uhn.fhir.model.api.annotation.Block; /** - * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. - + * A record of a medication that is being consumed by a patient. A MedicationUsage may indicate that the patient may be taking the medication now or has taken the medication in the past or will be taking the medication in the future. The source of this information can be the patient, significant other (such as a family member or spouse), or a clinician. A common scenario where this information is captured is during the history taking process during a patient visit or stay. The medication information may come from sources such as the patient's memory, from a prescription bottle, or from a list of medications the patient, clinician or other party maintains. + The primary difference between a medicationusage and a medicationadministration is that the medication administration has complete administration information and is based on actual administration information from the person who administered the medication. A medicationusage is often, if not always, less specific. There is no required date/time when the medication was administered, in fact we only know that a source has reported the patient is taking this medication, where details such as time, quantity, or rate or even medication product may be incomplete or missing or less precise. As stated earlier, the Medication Usage information may come from the patient's memory, from a prescription bottle or from a list of medications the patient, clinician or other party maintains. Medication administration is more formal and is not missing detailed information. */ @ResourceDef(name="MedicationUsage", profile="http://hl7.org/fhir/StructureDefinition/MedicationUsage") diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java index 96794b33c..8db97fe38 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MedicinalProductDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java index 2eba6c59f..77eb26185 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java index b176e5142..b48a75009 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MessageHeader.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java index 6c8d8453a..71bf923b2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Meta.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java index 2f9dfed87..7d0bfc2fb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MetadataResource.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java index 6b6e3ad5d..74c9a76fe 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MolecularSequence.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MonetaryComponent.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MonetaryComponent.java index 1729560b5..74e1e0bfd 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MonetaryComponent.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/MonetaryComponent.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java index 16dcf8ae7..5ef6777d0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Money.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java index 292154e7b..2cd9fd4ed 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java index 4765c8be1..75d2499e1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java index 66ca1d393..bbb2b2f95 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionIntake.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java index ee1230b5e..c3a3152e4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionOrder.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java index b956fc746..8a3e8fe6b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NutritionProduct.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java index d6cb8f153..31bae0343 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Observation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -175,7 +175,7 @@ public class Observation extends DomainResource { protected Reference observation; /** - * The type of trigger. + * The type of trigger. Reflex | Repeat | Re-run. */ @Child(name = "type", type = {CodeType.class}, order=2, min=1, max=1, modifier=false, summary=true) @@ -233,7 +233,7 @@ Reflex | Repeat | Re-run. } /** - * @return {@link #type} (The type of trigger. + * @return {@link #type} (The type of trigger. Reflex | Repeat | Re-run.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public Enumeration getTypeElement() { @@ -254,7 +254,7 @@ Reflex | Repeat | Re-run.). This is the underlying object with id, value and ext } /** - * @param value {@link #type} (The type of trigger. + * @param value {@link #type} (The type of trigger. Reflex | Repeat | Re-run.). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public ObservationTriggeredByComponent setTypeElement(Enumeration value) { @@ -263,7 +263,7 @@ Reflex | Repeat | Re-run.). This is the underlying object with id, value and ext } /** - * @return The type of trigger. + * @return The type of trigger. Reflex | Repeat | Re-run. */ public TriggeredBytype getType() { @@ -271,7 +271,7 @@ Reflex | Repeat | Re-run. } /** - * @param value The type of trigger. + * @param value The type of trigger. Reflex | Repeat | Re-run. */ public ObservationTriggeredByComponent setType(TriggeredBytype value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java index 147a44a39..6ecc6c553 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ObservationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java index ae993eb4d..f711ef1fc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java index f34dfed78..6bc57acf2 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OperationOutcome.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -776,8 +776,8 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu protected StringType diagnostics; /** - * This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. - + * This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. + For resource issues, this will be a simple XPath limited to element names, repetition indicators and the default child accessor that identifies one of the elements in the resource that caused this issue to be raised. For HTTP errors, will be "http." + the parameter name. */ @Child(name = "location", type = {StringType.class}, order=5, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @@ -973,8 +973,8 @@ For resource issues, this will be a simple XPath limited to element names, repet } /** - * @return {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. - + * @return {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. + For resource issues, this will be a simple XPath limited to element names, repetition indicators and the default child accessor that identifies one of the elements in the resource that caused this issue to be raised. For HTTP errors, will be "http." + the parameter name.) */ public List getLocation() { @@ -1001,8 +1001,8 @@ For resource issues, this will be a simple XPath limited to element names, repet } /** - * @return {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. - + * @return {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. + For resource issues, this will be a simple XPath limited to element names, repetition indicators and the default child accessor that identifies one of the elements in the resource that caused this issue to be raised. For HTTP errors, will be "http." + the parameter name.) */ public StringType addLocationElement() {//2 @@ -1014,8 +1014,8 @@ For resource issues, this will be a simple XPath limited to element names, repet } /** - * @param value {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. - + * @param value {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. + For resource issues, this will be a simple XPath limited to element names, repetition indicators and the default child accessor that identifies one of the elements in the resource that caused this issue to be raised. For HTTP errors, will be "http." + the parameter name.) */ public OperationOutcomeIssueComponent addLocation(String value) { //1 @@ -1028,8 +1028,8 @@ For resource issues, this will be a simple XPath limited to element names, repet } /** - * @param value {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. - + * @param value {@link #location} (This element is deprecated because it is XML specific. It is replaced by issue.expression, which is format independent, and simpler to parse. + For resource issues, this will be a simple XPath limited to element names, repetition indicators and the default child accessor that identifies one of the elements in the resource that caused this issue to be raised. For HTTP errors, will be "http." + the parameter name.) */ public boolean hasLocation(String value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java index a8888c96f..a93d406ce 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Organization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -453,7 +453,9 @@ public class Organization extends DomainResource { protected List endpoint; /** - * The official certifications, accreditations, training, designations and licenses that authorize and/or otherwise endorse the provision of care by the organization. For example, an approval to provide a type of services issued by a certifying body (such as the US Joint Commission) to an organization. + * The official certifications, accreditations, training, designations and licenses that authorize and/or otherwise endorse the provision of care by the organization. + +For example, an approval to provide a type of services issued by a certifying body (such as the US Joint Commission) to an organization. */ @Child(name = "qualification", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Qualifications, certifications, accreditations, licenses, training, etc pertaining to the provision of care", formalDefinition="The official certifications, accreditations, training, designations and licenses that authorize and/or otherwise endorse the provision of care by the organization.\r\rFor example, an approval to provide a type of services issued by a certifying body (such as the US Joint Commission) to an organization." ) @@ -909,7 +911,9 @@ public class Organization extends DomainResource { } /** - * @return {@link #qualification} (The official certifications, accreditations, training, designations and licenses that authorize and/or otherwise endorse the provision of care by the organization. For example, an approval to provide a type of services issued by a certifying body (such as the US Joint Commission) to an organization.) + * @return {@link #qualification} (The official certifications, accreditations, training, designations and licenses that authorize and/or otherwise endorse the provision of care by the organization. + +For example, an approval to provide a type of services issued by a certifying body (such as the US Joint Commission) to an organization.) */ public List getQualification() { if (this.qualification == null) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java index 1a3ea031f..c8a45ab07 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/OrganizationAffiliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java index 4e0905061..e7223958a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PackagedProductDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java index 7e70b10b3..d70c524d5 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ParameterDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java index d9102117b..70f55bf8e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Parameters.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java index 2b1524940..8df92f18c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Patient.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -1178,11 +1178,11 @@ public class Patient extends DomainResource { protected List identifier; /** - * Whether this patient record is in active use. -Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. - -It is often used to filter patient lists to exclude inactive patients - + * Whether this patient record is in active use. +Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. + +It is often used to filter patient lists to exclude inactive patients + Deceased patients may also be marked as inactive for the same reasons, but may be active for some time after death. */ @Child(name = "active", type = {BooleanType.class}, order=1, min=0, max=1, modifier=true, summary=true) @@ -1352,11 +1352,11 @@ Deceased patients may also be marked as inactive for the same reasons, but may b } /** - * @return {@link #active} (Whether this patient record is in active use. -Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. - -It is often used to filter patient lists to exclude inactive patients - + * @return {@link #active} (Whether this patient record is in active use. +Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. + +It is often used to filter patient lists to exclude inactive patients + Deceased patients may also be marked as inactive for the same reasons, but may be active for some time after death.). This is the underlying object with id, value and extensions. The accessor "getActive" gives direct access to the value */ public BooleanType getActiveElement() { @@ -1377,11 +1377,11 @@ Deceased patients may also be marked as inactive for the same reasons, but may b } /** - * @param value {@link #active} (Whether this patient record is in active use. -Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. - -It is often used to filter patient lists to exclude inactive patients - + * @param value {@link #active} (Whether this patient record is in active use. +Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. + +It is often used to filter patient lists to exclude inactive patients + Deceased patients may also be marked as inactive for the same reasons, but may be active for some time after death.). This is the underlying object with id, value and extensions. The accessor "getActive" gives direct access to the value */ public Patient setActiveElement(BooleanType value) { @@ -1390,11 +1390,11 @@ Deceased patients may also be marked as inactive for the same reasons, but may b } /** - * @return Whether this patient record is in active use. -Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. - -It is often used to filter patient lists to exclude inactive patients - + * @return Whether this patient record is in active use. +Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. + +It is often used to filter patient lists to exclude inactive patients + Deceased patients may also be marked as inactive for the same reasons, but may be active for some time after death. */ public boolean getActive() { @@ -1402,11 +1402,11 @@ Deceased patients may also be marked as inactive for the same reasons, but may b } /** - * @param value Whether this patient record is in active use. -Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. - -It is often used to filter patient lists to exclude inactive patients - + * @param value Whether this patient record is in active use. +Many systems use this property to mark as non-current patients, such as those that have not been seen for a period of time based on an organization's business rules. + +It is often used to filter patient lists to exclude inactive patients + Deceased patients may also be marked as inactive for the same reasons, but may be active for some time after death. */ public Patient setActive(boolean value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java index 7d0f89baa..a047ab93d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentNotice.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java index 7ef7fcc1d..4ec89cdb7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PaymentReconciliation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java index 20757427a..c695972f1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Period.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java index 735546afa..2f81cc78f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Permission.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java index af970f9a8..8b2ca5968 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Person.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java index f0009ecb9..46a2ec426 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PlanDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java index 8eeccb3d7..f4e43e242 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Population.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java index fb7ab9496..33c6bad62 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Practitioner.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -440,7 +440,8 @@ public class Practitioner extends DomainResource { protected DataType deceased; /** - * Address(es) of the practitioner that are not role specific (typically home address). Work addresses are not typically entered in this property as they are usually role dependent. + * Address(es) of the practitioner that are not role specific (typically home address). +Work addresses are not typically entered in this property as they are usually role dependent. */ @Child(name = "address", type = {Address.class}, order=7, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=true) @Description(shortDefinition="Address(es) of the practitioner that are not role specific (typically home address)", formalDefinition="Address(es) of the practitioner that are not role specific (typically home address). \rWork addresses are not typically entered in this property as they are usually role dependent." ) @@ -454,7 +455,9 @@ public class Practitioner extends DomainResource { protected List photo; /** - * The official qualifications, certifications, accreditations, training, licenses (and other types of educations/skills/capabilities) that authorize or otherwise pertain to the provision of care by the practitioner. For example, a medical license issued by a medical board of licensure authorizing the practitioner to practice medicine within a certain locality. + * The official qualifications, certifications, accreditations, training, licenses (and other types of educations/skills/capabilities) that authorize or otherwise pertain to the provision of care by the practitioner. + +For example, a medical license issued by a medical board of licensure authorizing the practitioner to practice medicine within a certain locality. */ @Child(name = "qualification", type = {}, order=9, min=0, max=Child.MAX_UNLIMITED, modifier=false, summary=false) @Description(shortDefinition="Qualifications, certifications, accreditations, licenses, training, etc pertaining to the provision of care", formalDefinition="The official qualifications, certifications, accreditations, training, licenses (and other types of educations/skills/capabilities) that authorize or otherwise pertain to the provision of care by the practitioner.\r\rFor example, a medical license issued by a medical board of licensure authorizing the practitioner to practice medicine within a certain locality." ) @@ -831,7 +834,8 @@ public class Practitioner extends DomainResource { } /** - * @return {@link #address} (Address(es) of the practitioner that are not role specific (typically home address). Work addresses are not typically entered in this property as they are usually role dependent.) + * @return {@link #address} (Address(es) of the practitioner that are not role specific (typically home address). +Work addresses are not typically entered in this property as they are usually role dependent.) */ public List

getAddress() { if (this.address == null) @@ -937,7 +941,9 @@ public class Practitioner extends DomainResource { } /** - * @return {@link #qualification} (The official qualifications, certifications, accreditations, training, licenses (and other types of educations/skills/capabilities) that authorize or otherwise pertain to the provision of care by the practitioner. For example, a medical license issued by a medical board of licensure authorizing the practitioner to practice medicine within a certain locality.) + * @return {@link #qualification} (The official qualifications, certifications, accreditations, training, licenses (and other types of educations/skills/capabilities) that authorize or otherwise pertain to the provision of care by the practitioner. + +For example, a medical license issued by a medical board of licensure authorizing the practitioner to practice medicine within a certain locality.) */ public List getQualification() { if (this.qualification == null) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java index 8c9017213..21882626a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/PractitionerRole.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java index c38dbe1cf..7cb0bda04 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Procedure.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java index 8f153cb5d..8a23aee70 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ProductShelfLife.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java index 2ecd15143..25b1f1c94 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Provenance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java index ed7d0f367..04c626709 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Quantity.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java index 5479c1cbf..e8c42dc3b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Questionnaire.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java index e9b592b68..2763771d8 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/QuestionnaireResponse.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java index e29ae8106..08f84b1a0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Range.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java index 0242142c2..635499309 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Ratio.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RatioRange.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RatioRange.java index c559da848..4469b96c0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RatioRange.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RatioRange.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java index 8668b7265..b9f22ab9e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Reference.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -63,8 +63,8 @@ public class Reference extends BaseReference implements IBaseReference, IComposi protected StringType reference; /** - * The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. - + * The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. + The type is the Canonical URL of Resource Definition that is the type this reference refers to. References are URLs that are relative to http://hl7.org/fhir/StructureDefinition/ e.g. "Patient" is a reference to http://hl7.org/fhir/StructureDefinition/Patient. Absolute URLs are only allowed for logical models (and can only be used in references in logical models, not resources). */ @Child(name = "type", type = {UriType.class}, order=1, min=0, max=1, modifier=false, summary=true) @@ -172,8 +172,8 @@ The type is the Canonical URL of Resource Definition that is the type this refer } /** - * @return {@link #type} (The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. - + * @return {@link #type} (The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. + The type is the Canonical URL of Resource Definition that is the type this reference refers to. References are URLs that are relative to http://hl7.org/fhir/StructureDefinition/ e.g. "Patient" is a reference to http://hl7.org/fhir/StructureDefinition/Patient. Absolute URLs are only allowed for logical models (and can only be used in references in logical models, not resources).). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public UriType getTypeElement() { @@ -194,8 +194,8 @@ The type is the Canonical URL of Resource Definition that is the type this refer } /** - * @param value {@link #type} (The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. - + * @param value {@link #type} (The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. + The type is the Canonical URL of Resource Definition that is the type this reference refers to. References are URLs that are relative to http://hl7.org/fhir/StructureDefinition/ e.g. "Patient" is a reference to http://hl7.org/fhir/StructureDefinition/Patient. Absolute URLs are only allowed for logical models (and can only be used in references in logical models, not resources).). This is the underlying object with id, value and extensions. The accessor "getType" gives direct access to the value */ public Reference setTypeElement(UriType value) { @@ -204,8 +204,8 @@ The type is the Canonical URL of Resource Definition that is the type this refer } /** - * @return The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. - + * @return The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. + The type is the Canonical URL of Resource Definition that is the type this reference refers to. References are URLs that are relative to http://hl7.org/fhir/StructureDefinition/ e.g. "Patient" is a reference to http://hl7.org/fhir/StructureDefinition/Patient. Absolute URLs are only allowed for logical models (and can only be used in references in logical models, not resources). */ public String getType() { @@ -213,8 +213,8 @@ The type is the Canonical URL of Resource Definition that is the type this refer } /** - * @param value The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. - + * @param value The expected type of the target of the reference. If both Reference.type and Reference.reference are populated and Reference.reference is a FHIR URL, both SHALL be consistent. + The type is the Canonical URL of Resource Definition that is the type this reference refers to. References are URLs that are relative to http://hl7.org/fhir/StructureDefinition/ e.g. "Patient" is a reference to http://hl7.org/fhir/StructureDefinition/Patient. Absolute URLs are only allowed for logical models (and can only be used in references in logical models, not resources). */ public Reference setType(String value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java index 30f7e6d3d..098bcceee 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RegulatedAuthorization.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java index 091c07ebb..db27d8df3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedArtifact.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java index 7c54cfeeb..be99397dc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RelatedPerson.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java index 0807ba173..811d61dfb 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestGroup.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestOrchestration.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestOrchestration.java index 36158ea0c..750254d56 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestOrchestration.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RequestOrchestration.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Requirements.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Requirements.java index cff1f73a3..e6350425e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Requirements.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Requirements.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java index 1df50fa6f..a65773413 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchStudy.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java index 625e5d34d..c4ad88416 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResearchSubject.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java index ce1131d54..3e4ebb91e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceFactory.java @@ -28,7 +28,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java index bc219234c..8e5ffce1e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ResourceType.java @@ -28,7 +28,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java index b5c6e4ebb..d1df27a14 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/RiskAssessment.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java index 5fbf9287b..ede681535 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SampledData.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java index db33aaae1..b593f488b 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Schedule.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java index 675369187..1d6d2be31 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SearchParameter.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java index c0d8ca215..bfa9c5509 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ServiceRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java index e8c5f61a4..d07e6b9a0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Signature.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java index 62f565d7d..609f0828d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Slot.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java index da99fedc5..7eec049c4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Specimen.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java index 69c73fe61..3e4f2563c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SpecimenDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java index a1c132799..7ef211884 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java index 408ca0315..42dc07ea4 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/StructureMap.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java index 87343d3d5..b151a267c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Subscription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java index ee279f44c..2290be9b3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionStatus.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java index b1cf20e36..ba7368ade 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubscriptionTopic.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java index 69a9fee88..ecabb5aa1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Substance.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java index 5801a535a..c9f6f895d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java index e3dcb9748..feb0f667d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceNucleicAcid.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java index 4b65ebead..aeb819107 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstancePolymer.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java index 1ab1302e8..0833b4130 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceProtein.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java index d0c6d12e5..793290e09 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceReferenceInformation.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java index c10a3c9d5..e8faa9981 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SubstanceSourceMaterial.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java index 3f13947e1..9487a0c7c 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyDelivery.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java index 5c3d3a17e..0f490550d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/SupplyRequest.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java index 4f87bfead..776980834 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Task.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java index 78262a9f8..ce5f55e81 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TerminologyCapabilities.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java index 81a743a0b..e320a0d56 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestReport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java index bbd8aff70..356d4cec7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TestScript.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java index cbb9097e2..e4e77a051 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Timing.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; @@ -762,7 +762,7 @@ public class Timing extends BackboneType implements ICompositeType { protected DecimalType durationMax; /** - * The units of time for the duration, in UCUM units + * The units of time for the duration, in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ @Child(name = "durationUnit", type = {CodeType.class}, order=6, min=0, max=1, modifier=false, summary=true) @@ -799,7 +799,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the protected DecimalType periodMax; /** - * The units of time for the period in UCUM units + * The units of time for the period in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ @Child(name = "periodUnit", type = {CodeType.class}, order=11, min=0, max=1, modifier=false, summary=true) @@ -1137,7 +1137,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @return {@link #durationUnit} (The units of time for the duration, in UCUM units + * @return {@link #durationUnit} (The units of time for the duration, in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence.). This is the underlying object with id, value and extensions. The accessor "getDurationUnit" gives direct access to the value */ public Enumeration getDurationUnitElement() { @@ -1158,7 +1158,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @param value {@link #durationUnit} (The units of time for the duration, in UCUM units + * @param value {@link #durationUnit} (The units of time for the duration, in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence.). This is the underlying object with id, value and extensions. The accessor "getDurationUnit" gives direct access to the value */ public TimingRepeatComponent setDurationUnitElement(Enumeration value) { @@ -1167,7 +1167,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @return The units of time for the duration, in UCUM units + * @return The units of time for the duration, in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ public UnitsOfTime getDurationUnit() { @@ -1175,7 +1175,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @param value The units of time for the duration, in UCUM units + * @param value The units of time for the duration, in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ public TimingRepeatComponent setDurationUnit(UnitsOfTime value) { @@ -1414,7 +1414,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @return {@link #periodUnit} (The units of time for the period in UCUM units + * @return {@link #periodUnit} (The units of time for the period in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence.). This is the underlying object with id, value and extensions. The accessor "getPeriodUnit" gives direct access to the value */ public Enumeration getPeriodUnitElement() { @@ -1435,7 +1435,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @param value {@link #periodUnit} (The units of time for the period in UCUM units + * @param value {@link #periodUnit} (The units of time for the period in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence.). This is the underlying object with id, value and extensions. The accessor "getPeriodUnit" gives direct access to the value */ public TimingRepeatComponent setPeriodUnitElement(Enumeration value) { @@ -1444,7 +1444,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @return The units of time for the period in UCUM units + * @return The units of time for the period in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ public UnitsOfTime getPeriodUnit() { @@ -1452,7 +1452,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the } /** - * @param value The units of time for the period in UCUM units + * @param value The units of time for the period in UCUM units Normal practice is to use the 'mo' code as a calendar month when calculating the next occurrence. */ public TimingRepeatComponent setPeriodUnit(UnitsOfTime value) { diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Transport.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Transport.java index 45d123a64..ccf3e32fc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Transport.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Transport.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java index dfa014433..6c8a69a13 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TriggerDefinition.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java index 50917306e..aa108613d 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/UsageContext.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java index 9b9480478..e7f162c1e 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/ValueSet.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java index b54261ad6..7c6b5de1a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VerificationResult.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VirtualServiceDetail.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VirtualServiceDetail.java index c333266ab..617667cec 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VirtualServiceDetail.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VirtualServiceDetail.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java index 80b0d8807..5bd2b9d0a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/VisionPrescription.java @@ -29,7 +29,7 @@ package org.hl7.fhir.r5.model; POSSIBILITY OF SUCH DAMAGE. */ -// Generated on Mon, Sep 5, 2022 20:11+1000 for FHIR vcurrent +// Generated on Sat, Nov 5, 2022 10:47+1100 for FHIR v5.0.0-ballot import java.util.ArrayList; import java.util.Date; 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 ce696f24a..5448e9966 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 @@ -218,7 +218,16 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } private String getSDCLink(String path) { - return Utilities.pathURL("http://hl7.org/fhir/uv/sdc", path); // for now? + if (Utilities.isAbsoluteUrl(path)) { + StructureDefinition sd = context.getContext().fetchResource(StructureDefinition.class, path); + if (sd != null) { + return sd.getUserString("path"); + } else { + return path.replace("StructureDefinition/", "StructureDefinition-")+".html"; + } + } else { + return Utilities.pathURL("http://hl7.org/fhir/uv/sdc", path); // for now? + } } private boolean renderTreeItem(HierarchicalTableGenerator gen, List rows, Questionnaire q, QuestionnaireItemComponent i, boolean hasFlags) throws IOException { @@ -257,7 +266,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { 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")))); + flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-observationLinkPeriod.html"), 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(ToolingExtensions.EXT_Q_CHOICE_ORIENT)) { String code = ToolingExtensions.readStringExtension(i, ToolingExtensions.EXT_Q_CHOICE_ORIENT); @@ -266,7 +275,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { 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")))); + flags.addPiece(gen.new Piece(getSDCLink("StructureDefinition-sdc-questionnaire-displayCategory.html"), null, "Category: "+code).addHtml(new XhtmlNode(NodeType.Element, "img").attribute("alt", "icon").attribute("src", Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")))); } } Cell defn = gen.new Cell(); @@ -680,7 +689,7 @@ public class QuestionnaireRenderer extends TerminologyRenderer { if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-isSubject")) { 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"); + flags.ah(getSDCLink("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, ToolingExtensions.EXT_Q_HIDDEN)) { hasFlag = true; @@ -689,17 +698,17 @@ public class QuestionnaireRenderer extends TerminologyRenderer { } if (ToolingExtensions.readBoolExtension(i, ToolingExtensions.EXT_Q_OTP_DISP)) { hasFlag = true; - flags.ah(ToolingExtensions.EXT_Q_OTP_DISP, "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png"), "icon"); + flags.ah(getSDCLink(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"); + flags.ah(getSDCLink("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(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"); + flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-displayCategory"), "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png"), "icon"); } if (i.hasMaxLength()) { 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 7c9c7f001..41505c839 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 (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject")) { // hasFlag = true; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject", "Can change the subject of the QuestionnaireResponse").img(Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-isSubject", "Can change the subject of the QuestionnaireResponse").img(Utilities.path(context.getLocalPrefix(), "icon-qi-subject.png")); // } // if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse-hidden")) { // hasFlag = true; @@ -438,17 +438,17 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // } // if (ToolingExtensions.readBoolExtension(i, "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay")) { // hasFlag = true; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay", "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-optionalDisplay", "Is optional to display").img(Utilities.path(context.getLocalPrefix(), "icon-qi-optional.png")); // } // if (i.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod")) { // 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")); +// flags.ah(getSDCLink("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")) { // 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; -// flags.ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-displayCategory", "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")); +// flags.ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-displayCategory", "Category: "+code).img(Utilities.path(context.getLocalPrefix(), "icon-qi-"+code+".png")); // } // // if (i.hasMaxLength()) { @@ -741,7 +741,7 @@ public class QuestionnaireResponseRenderer extends ResourceRenderer { // } // if (qi.hasExtension("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod")) { // XhtmlNode tr = tbl.tr(); -// tr.td().ah("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod").tx("Observation Link Period"); +// tr.td().ah(getSDCLink("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod").tx("Observation Link Period"); // render(tr.td(), qi.getExtensionByUrl("http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-QuestionnaireResponse-observationLinkPeriod").getValue()); // } // diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java index 71d22a073..3c4529739 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/JurisdictionUtilities.java @@ -11,6 +11,9 @@ public class JurisdictionUtilities { } public static String getJurisdictionFromLocale(String s) { + if (s == null) { + return null; + } if (Utilities.existsInList(s.toUpperCase(), "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB", diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java index ea46412e5..116eff7e5 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/TerminologyCacheTests.java @@ -33,6 +33,7 @@ import org.hl7.fhir.utilities.validation.ValidationMessage; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.MethodSource; import com.google.gson.JsonElement; @@ -238,6 +239,8 @@ public class TerminologyCacheTests implements ResourceLoaderTests { assertTrue(cacheToken.hasVersion()); } + + @Test public void testCodableConceptCacheTokenGeneration() throws IOException, URISyntaxException { @@ -453,4 +456,41 @@ public class TerminologyCacheTests implements ResourceLoaderTests { assertEquals("http://dummy.org", extracted); } + + @ParameterizedTest + @CsvSource({ + "http://terminology.hl7.org/CodeSystem/id,id", + "http://hl7.org/fhir/id,id", + "http://hl7.org/fhir/sid/id,id", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://snomed.info/sct,snomed", + "http://www.nlm.nih.gov/research/umls/rxnorm,rxnorm", + "http://loinc.org,loinc", + "http://unitsofmeasure.org,ucum", + "urn:iso:std:iso:id,isoid", + "urn:ietf:bcp:47,lang", + "urn:ietf:bcp:13,mimetypes", + "urn:iso:std:iso:11073:10101,11073", + "my://random/system?with#chars,my___random_systemXwithXchars", + "http://dicom.nema.org/resources/ontology/DCM,dicom" + }) + public void testCacheTokenGeneration(String system, String expectedName) throws IOException, URISyntaxException { + + TerminologyCache terminologyCache = createTerminologyCache(); + ValueSet valueSet = new ValueSet(); + { + Coding coding = new Coding(); + coding.setSystem(system); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName, cacheToken.getName()); + } + { + Coding coding = new Coding(); + coding.setSystem(system + "|dummyVersion"); + TerminologyCache.CacheToken cacheToken = terminologyCache.generateValidationToken(CacheTestUtils.validationOptions, + coding, valueSet); + assertEquals(expectedName + "_dummyVersion", cacheToken.getName()); + } + } } diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index b79e64824..249ac6800 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 7f8dfdfa0..c13532568 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml 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 507792cb2..33eb4436d 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 @@ -28,7 +28,7 @@ public class PackageHacker { private static boolean useSecureReferences = false; public static void main(String[] args) throws FileNotFoundException, IOException { - new PackageHacker().edit(args[0]); + new PackageHacker().edit("/Users/grahamegrieve/web/hl7.org/fhir/us/sdoh-clinicalcare/2022Jan/package.tgz"); } private void edit(String name) throws FileNotFoundException, IOException { @@ -48,6 +48,7 @@ public class PackageHacker { if (pck.getFolders().containsKey("xml")) { fixContent(pck.getFolders().get("xml").getContent()); } + fixExampleContent(pck.getFolders().get("example").getContent()); System.out.println("Revised Package"); System.out.println("======================="); @@ -61,8 +62,14 @@ public class PackageHacker { } } + private void fixExampleContent(Map content) { + byte[] cnt = content.get("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json"); + content.put("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssist.json", cnt); + content.remove("ServiceRequest-SDOHCC-ServiceRequestCompletedFoodPantryApplicationAssistExample.json"); + } + private void fixContent(Map content) { - fixVersionInContent(content); +// fixVersionInContent(content); } @@ -72,7 +79,7 @@ public class PackageHacker { private void change(JsonObject npm) throws FileNotFoundException, IOException { // fixVersions(npm); - npm.remove("notForPublication"); +// 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"); @@ -95,6 +102,7 @@ public class PackageHacker { // dep.addProperty("hl7.fhir.r4.examples", "4.0.1"); // dep.addProperty("hl7.fhir.r4.expansions", "4.0.1"); // dep.addProperty("hl7.fhir.r4.elements", "4.0.1"); + npm.addProperty("jurisdiction", "urn:iso:std:iso:3166#US"); } private void fixVersionInContent(Map content) { diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 8c4b2028a..e82194147 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index e288a2e3c..20e91b455 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.76-SNAPSHOT + 5.6.77-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java index cb6291153..6d76395aa 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/IgLoader.java @@ -18,6 +18,7 @@ import org.hl7.fhir.convertors.factory.VersionConvertorFactory_10_50; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_14_50; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_50; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50; +import org.hl7.fhir.convertors.factory.VersionConvertorFactory_43_50; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.context.SimpleWorkerContext; import org.hl7.fhir.r5.elementmodel.Manager; @@ -790,6 +791,17 @@ public class IgLoader { else throw new FHIRException("Unsupported format for " + fn); r = VersionConvertorFactory_40_50.convertResource(res); + } else if (fhirVersion.startsWith("4.3")) { + org.hl7.fhir.r4b.model.Resource res; + if (fn.endsWith(".xml") && !fn.endsWith("template.xml")) + res = new org.hl7.fhir.r4b.formats.XmlParser().parse(new ByteArrayInputStream(content)); + else if (fn.endsWith(".json") && !fn.endsWith("template.json")) + res = new org.hl7.fhir.r4b.formats.JsonParser().parse(new ByteArrayInputStream(content)); + else if (fn.endsWith(".txt") || fn.endsWith(".map")) + res = new org.hl7.fhir.r4b.utils.structuremap.StructureMapUtilities(null).parse(new String(content), fn); + else + throw new FHIRException("Unsupported format for " + fn); + r = VersionConvertorFactory_43_50.convertResource(res); } else if (fhirVersion.startsWith("1.4")) { org.hl7.fhir.dstu2016may.model.Resource res; if (fn.endsWith(".xml") && !fn.endsWith("template.xml")) @@ -808,7 +820,7 @@ public class IgLoader { else throw new FHIRException("Unsupported format for " + fn); r = VersionConvertorFactory_10_50.convertResource(res, new org.hl7.fhir.convertors.misc.IGR2ConvertorAdvisor5()); - } else if (fhirVersion.equals(Constants.VERSION) || "current".equals(fhirVersion)) { + } else if (fhirVersion.startsWith("5.0")) { if (fn.endsWith(".xml") && !fn.endsWith("template.xml")) r = new XmlParser().parse(new ByteArrayInputStream(content)); else if (fn.endsWith(".json") && !fn.endsWith("template.json")) 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 8f0bdfc24..c8a75d490 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 @@ -375,6 +375,9 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP if (VersionUtilities.isR4Ver(version)) { pid = "hl7.terminology.r4"; } + if (VersionUtilities.isR4BVer(version)) { + pid = "hl7.terminology.r4"; + } if (VersionUtilities.isR5Ver(version)) { pid = "hl7.terminology.r5"; } diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java index 570ea6b9e..9315748ef 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/ValidatorCli.java @@ -5,6 +5,7 @@ import java.net.Authenticator; import java.net.PasswordAuthentication; import java.util.ArrayList; import java.util.List; +import java.util.Locale; /* Copyright (c) 2011+, HL7, Inc. @@ -255,7 +256,11 @@ public class ValidatorCli { if (cliContext.getSv() == null) { cliContext.setSv(validationService.determineVersion(cliContext)); } - System.out.println(" Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction())); + if (cliContext.getJurisdiction() == null) { + System.out.println(" Jurisdiction: None specified (locale = "+Locale.getDefault().getCountry()+")"); + } else { + System.out.println(" Jurisdiction: "+JurisdictionUtilities.displayJurisdiction(cliContext.getJurisdiction())); + } System.out.println("Loading"); // Comment this out because definitions filename doesn't necessarily contain version (and many not even be 14 characters long). diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java index 890060788..e33d16291 100644 --- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java +++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/tests/ValidationEngineTests.java @@ -26,7 +26,7 @@ public class ValidationEngineTests { public static boolean inbuild; @Test - public void testCurrentXml() throws Exception { + public void test401Xml() throws Exception { if (!TestUtilities.silent) System.out.println("TestCurrentXml: Validate patient-example.xml in Current version"); ValidationEngine ve = TestUtilities.getValidationEngine("hl7.fhir.r4.core#4.0.1", DEF_TX, FhirPublication.R4, "4.0.1"); @@ -49,7 +49,7 @@ public class ValidationEngineTests { } @Test - public void testCurrentJson() throws Exception { + public void test401Json() throws Exception { if (!TestUtilities.silent) System.out.println("TestCurrentJson: Validate patient-example.json in Current version"); ValidationEngine ve = TestUtilities.getValidationEngine("hl7.fhir.r4.core#4.0.1", DEF_TX, FhirPublication.R4, "4.0.1"); @@ -67,6 +67,54 @@ public class ValidationEngineTests { System.out.println(" .. done: " + Integer.toString(e) + " errors, " + Integer.toString(w) + " warnings, " + Integer.toString(h) + " information messages"); } + @Test + public void test430Xml() throws Exception { + if (!TestUtilities.silent) + System.out.println("TestCurrentXml: Validate patient-example.xml in Current version"); + ValidationEngine ve = TestUtilities.getValidationEngine("hl7.fhir.r4b.core#4.3.0", DEF_TX, FhirPublication.R4, "4.3.0"); + CacheVerificationLogger logger = new CacheVerificationLogger(); + ve.getContext().getTxClient().setLogger(logger); + OperationOutcome op = ve.validate(FhirFormat.XML, TestingUtilities.loadTestResourceStream("validator", "patient-example.xml"), null); + int e = errors(op); + int w = warnings(op); + int h = hints(op); + if (!TestUtilities.silent) { + System.out.println(" .. done: " + Integer.toString(e) + " errors, " + Integer.toString(w) + " warnings, " + Integer.toString(h) + " information messages"); + for (OperationOutcomeIssueComponent iss : op.getIssue()) { + System.out.println(" " + iss.getDetails().getText()); + } + } + Assertions.assertEquals(0, e); + Assertions.assertEquals(0, w); + Assertions.assertEquals(1, h); + assertTrue(logger.verifyHasNoRequests(), "Unexpected request to TX server"); + } + + @Test + public void test430Json() throws Exception { + if (!TestUtilities.silent) + System.out.println("TestCurrentJson: Validate patient-example.json in Current version"); + ValidationEngine ve = TestUtilities.getValidationEngine("hl7.fhir.r4b.core#4.3.0", DEF_TX, FhirPublication.R4, "4.3.0"); + CacheVerificationLogger logger = new CacheVerificationLogger(); + ve.getContext().getTxClient().setLogger(logger); + OperationOutcome op = ve.validate(FhirFormat.JSON, TestingUtilities.loadTestResourceStream("validator", "patient-example.json"), null); + int e = errors(op); + int w = warnings(op); + int h = hints(op); + if (!TestUtilities.silent) { + System.out.println(" .. done: " + Integer.toString(e) + " errors, " + Integer.toString(w) + " warnings, " + Integer.toString(h) + " information messages"); + for (OperationOutcomeIssueComponent iss : op.getIssue()) { + System.out.println(" " + iss.getDetails().getText()); + } + } + Assertions.assertEquals(0, e); + Assertions.assertEquals(0, w); + Assertions.assertEquals(1, h); + assertTrue(logger.verifyHasNoRequests(), "Unexpected request to TX server"); + if (!TestUtilities.silent) + System.out.println(" .. done: " + Integer.toString(e) + " errors, " + Integer.toString(w) + " warnings, " + Integer.toString(h) + " information messages"); + } + @Test public void test140() throws Exception { if (inbuild) { @@ -230,8 +278,8 @@ public class ValidationEngineTests { public static void execute() throws Exception { ValidationEngineTests self = new ValidationEngineTests(); - self.testCurrentXml(); - self.testCurrentJson(); + self.test401Xml(); + self.test401Json(); self.test102(); self.test140(); self.test301USCore(); diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0131.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0131.cache new file mode 100644 index 000000000..d9af53d35 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0131.cache @@ -0,0 +1,31 @@ +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131", + "code" : "N" +}, "url": "http://hl7.org/fhir/ValueSet/patient-contactrelationship--0", "version": "4.3.0", "lang":"null", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +v: { + "display" : "Next-of-Kin", + "code" : "N", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131", + "code" : "N" +}, "url": "http://hl7.org/fhir/ValueSet/patient-contactrelationship", "version": "4.3.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "versionFlexible":"true"}#### +v: { + "display" : "Next-of-Kin", + "code" : "N", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131" +} +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131", + "code" : "N" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +v: { + "display" : "Next-of-Kin", + "code" : "N", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0131" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0203.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0203.cache new file mode 100644 index 000000000..a767fdd14 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/v2-0203.cache @@ -0,0 +1,31 @@ +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203", + "code" : "MR" +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type--0", "version": "4.3.0", "lang":"null", "useServer":"true", "useClient":"false", "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" +}, "url": "http://hl7.org/fhir/ValueSet/identifier-type", "version": "4.3.0", "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "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":"true"}#### +v: { + "display" : "Medical record number", + "code" : "MR", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0203" +} +------------------------------------------------------------------------------------- diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360_2.7.cache b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360_2.7.cache new file mode 100644 index 000000000..00f2436f5 --- /dev/null +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/v2-0360_2.7.cache @@ -0,0 +1,12 @@ +------------------------------------------------------------------------------------- +{"code" : { + "system" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.7", + "code" : "BS", + "display" : "Bachelor of Science" +}, "valueSet" :null, "lang":"null", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "versionFlexible":"true"}#### +v: { + "display" : "Bachelor of Science", + "code" : "BS", + "system" : "http://terminology.hl7.org/CodeSystem/v2-0360|2.7" +} +------------------------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c4bd1e5dc..8f3ebe38b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,12 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.76-SNAPSHOT + 5.6.77-SNAPSHOT pom 5.4.0 - 1.1.122-SNAPSHOT + 1.1.122 5.7.1 1.8.2 3.0.0-M5