diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d8ccce15b76..fae7d6b9106 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ pool: jobs: - job: Build timeoutInMinutes: 360 - container: maven:3-openjdk-15 + container: maven:3.8-openjdk-17 steps: - task: DockerInstaller@0 displayName: Docker Installer @@ -32,11 +32,11 @@ jobs: script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER) - task: Maven@3 env: - JAVA_HOME_11_X64: /usr/java/openjdk-15 + JAVA_HOME_11_X64: /usr/java/openjdk-17 inputs: goals: 'clean install' # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy - options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)' + options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -Dmaven.wagon.http.pool=false -Dhttp.keepAlive=false -Dstyle.color=always -Djansi.force=true' # These are JVM options (and don't show up in the build logs) mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto' jdkVersionOption: 1.11 diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index 65cdd576cb8..029918fdab7 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml index 9af31157559..3005124dd21 100644 --- a/hapi-fhir-android/pom.xml +++ b/hapi-fhir-android/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index b0cd834ab62..000441be247 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java index e691c080d1c..9d252be3504 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/ModelScanner.java @@ -399,7 +399,13 @@ class ModelScanner { ourLog.warn(b.toString()); continue; } - providesMembershipInCompartments.add(next.name()); + String name = next.name(); + + // As of 2021-12-28 the R5 structures incorrectly have this prefix + if (name.startsWith("Base FHIR compartment definition for ")) { + name = name.substring("Base FHIR compartment definition for ".length()); + } + providesMembershipInCompartments.add(name); } List components = null; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java index 14d8e3dcc57..2ed42861dc6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ClasspathUtil.java @@ -50,7 +50,12 @@ public class ClasspathUtil { // nothing } - public static String loadResource(String theClasspath) { + /** + * Load a classpath resource, throw an {@link InternalErrorException} if not found + * + * @throws InternalErrorException If the resource can't be found + */ + public static String loadResource(String theClasspath) throws InternalErrorException { return loadResource(theClasspath, Function.identity()); } @@ -60,7 +65,7 @@ public class ClasspathUtil { * @throws InternalErrorException If the resource can't be found */ @Nonnull - public static InputStream loadResourceAsStream(String theClasspath) { + public static InputStream loadResourceAsStream(String theClasspath) throws InternalErrorException { String classpath = theClasspath; if (classpath.startsWith("classpath:")) { classpath = classpath.substring("classpath:".length()); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java index 4c6396fb344..17b1a784f9c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/FhirTerser.java @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.IdentityHashMap; @@ -339,6 +338,10 @@ public class FhirTerser { @SuppressWarnings("unchecked") private List getValues(BaseRuntimeElementCompositeDefinition theCurrentDef, IBase theCurrentObj, List theSubList, Class theWantedClass, boolean theCreate, boolean theAddExtension) { + if (theSubList.isEmpty()) { + return Collections.emptyList(); + } + String name = theSubList.get(0); List retVal = new ArrayList<>(); @@ -683,7 +686,15 @@ public class FhirTerser { parts.add(thePath.substring(currentStart)); - if (parts.size() > 0 && parts.get(0).equals(theElementDef.getName())) { + String firstPart = parts.get(0); + if (Character.isUpperCase(firstPart.charAt(0)) && theElementDef instanceof RuntimeResourceDefinition) { + if (firstPart.equals(theElementDef.getName())) { + parts = parts.subList(1, parts.size()); + } else { + parts = Collections.emptyList(); + return parts; + } + } else if (firstPart.equals(theElementDef.getName())) { parts = parts.subList(1, parts.size()); } diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/AsyncUtilTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/AsyncUtilTest.java index 21341963775..43921ca3f5a 100644 --- a/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/AsyncUtilTest.java +++ b/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/AsyncUtilTest.java @@ -7,6 +7,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import static ca.uhn.fhir.util.TestUtil.sleepAtLeast; import static org.awaitility.Awaitility.await; public class AsyncUtilTest { @@ -24,6 +25,7 @@ public class AsyncUtilTest { outcomeHolder.set(outcome); }); thread.start(); + sleepAtLeast(1000); thread.interrupt(); await().until(()-> outcomeHolder.get() == false); } diff --git a/hapi-fhir-batch/pom.xml b/hapi-fhir-batch/pom.xml index 9cd242b38f5..d3a141cc9a3 100644 --- a/hapi-fhir-batch/pom.xml +++ b/hapi-fhir-batch/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml index 18f0ae4d6bf..b7d6824ba8f 100644 --- a/hapi-fhir-bom/pom.xml +++ b/hapi-fhir-bom/pom.xml @@ -10,7 +10,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml index 379929b22bd..12f78c32fe0 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/test/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommandTest.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/test/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommandTest.java index db2420516a8..f51191c52b9 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/test/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommandTest.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/test/java/ca/uhn/fhir/cli/HapiFlywayMigrateDatabaseCommandTest.java @@ -44,8 +44,8 @@ public class HapiFlywayMigrateDatabaseCommandTest { File location = getLocation("migrator_h2_test_340_current"); - String url = "jdbc:h2:" + location.getAbsolutePath() + ";create=true"; - DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "", ""); + String url = "jdbc:h2:" + location.getAbsolutePath(); + DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "SA", "SA"); String initSql = "/persistence_create_h2_340.sql"; executeSqlStatements(connectionProperties, initSql); @@ -60,8 +60,8 @@ public class HapiFlywayMigrateDatabaseCommandTest { BaseFlywayMigrateDatabaseCommand.MIGRATE_DATABASE, "-d", "H2_EMBEDDED", "-u", url, - "-n", "", - "-p", "" + "-n", "SA", + "-p", "SA" }; assertFalse(JdbcUtils.getTableNames(connectionProperties).contains("HFJ_RES_REINDEX_JOB")); @@ -119,7 +119,7 @@ public class HapiFlywayMigrateDatabaseCommandTest { File location = getLocation("migrator_h2_test_340_current_noflyway"); - String url = "jdbc:h2:" + location.getAbsolutePath() + ";create=true"; + String url = "jdbc:h2:" + location.getAbsolutePath(); DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "", ""); String initSql = "/persistence_create_h2_340.sql"; @@ -160,7 +160,7 @@ public class HapiFlywayMigrateDatabaseCommandTest { File location = getLocation("migrator_h2_test_340_dryrun"); - String url = "jdbc:h2:" + location.getAbsolutePath() + ";create=true"; + String url = "jdbc:h2:" + location.getAbsolutePath(); DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "", ""); String initSql = "/persistence_create_h2_340.sql"; @@ -229,8 +229,8 @@ public class HapiFlywayMigrateDatabaseCommandTest { File location = getLocation("migrator_h2_test_empty_current"); - String url = "jdbc:h2:" + location.getAbsolutePath() + ";create=true"; - DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "", ""); + String url = "jdbc:h2:" + location.getAbsolutePath(); + DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "SA", "SA"); ourLog.info("**********************************************"); ourLog.info("Starting Migration..."); @@ -240,8 +240,8 @@ public class HapiFlywayMigrateDatabaseCommandTest { BaseFlywayMigrateDatabaseCommand.MIGRATE_DATABASE, "-d", "H2_EMBEDDED", "-u", url, - "-n", "", - "-p", "" + "-n", "SA", + "-p", "SA" }; assertFalse(JdbcUtils.getTableNames(connectionProperties).contains("HFJ_RESOURCE")); @@ -256,7 +256,7 @@ public class HapiFlywayMigrateDatabaseCommandTest { File location = getLocation("migrator_h2_test_empty_current_noflyway"); - String url = "jdbc:h2:" + location.getAbsolutePath() + ";create=true"; + String url = "jdbc:h2:" + location.getAbsolutePath(); DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(url, "", ""); ourLog.info("**********************************************"); diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml index d1f10c1dbb3..592b72b8aa9 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-fhir-cli - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml index f361b22bcd7..4c8d83abf53 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../hapi-deployable-pom diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java index d480f068b5c..f783076c32f 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java +++ b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/CommonConfig.java @@ -25,7 +25,7 @@ import ca.uhn.fhir.jpa.model.config.PartitionSettings; import ca.uhn.fhir.jpa.model.entity.ModelConfig; import ca.uhn.fhir.jpa.search.HapiLuceneAnalysisConfigurer; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings; import org.hibernate.search.engine.cfg.BackendSettings; @@ -83,7 +83,7 @@ public class CommonConfig { Properties extraProperties = new Properties(); //Regular Hibernate Settings - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); extraProperties.put("hibernate.format_sql", "true"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml index 7a9089303e9..c15ac9ed915 100644 --- a/hapi-fhir-cli/pom.xml +++ b/hapi-fhir-cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml index 76cead9ad85..d4085fca4ec 100644 --- a/hapi-fhir-client-okhttp/pom.xml +++ b/hapi-fhir-client-okhttp/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml index d08e5f0a1cb..e01efa5c2eb 100644 --- a/hapi-fhir-client/pom.xml +++ b/hapi-fhir-client/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml index 2516a139863..eaafe36e289 100644 --- a/hapi-fhir-converter/pom.xml +++ b/hapi-fhir-converter/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index 2bb72fdaf28..0406b285e72 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml index 24448e36168..d65832e3ebd 100644 --- a/hapi-fhir-docs/pom.xml +++ b/hapi-fhir-docs/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_0/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_0/changes.yaml index 4840021ad25..7df82b223c7 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_0/changes.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_0/changes.yaml @@ -4,9 +4,26 @@ title: "The version of a few dependencies have been bumped to the latest versions (dependent HAPI modules listed in brackets):
    -
  • Spring (JPA): 5.3.7 -> 5.3.13
    • -
  • Thymeleaf (Testpage Overlay): 3.0.12.RELEASE -> 3.0.13.RELEASE (Addresses CVE-2021-43466)
    • -
  • log4j-api (JPA): 2.11.1 -> 2.15.0 (Addresses CVE-2021-44228 - HAPI FHIR was not vulnerable to this issue but this upgrade avoids unnecessary OWASP scan notices)
    • +
  • log4j-api (JPA): 2.11.1 -> 2.17.1 (Addresses CVE-2021-44228 - HAPI FHIR was not vulnerable to this issue but this upgrade avoids unnecessary OWASP scan notices)
    • +
  • SLF4j (All): 1.7.30 -> 1.7.32
    • +
  • Logback (All): 1.2.8 -> 1.2.10
    • +
  • Commons-IO (All): 2.8.0 -> 2.11.0
    • +
  • Jackson (All): 2.13.0 -> 2.13.1
    • +
  • Guava (All): 30.1.1-jre -> 31.0.1-jre
    • +
  • JDOM (XML Patch Support): 2.0.6 -> 2.0.6.1 (Addresses CVE-2021-33813)
    • +
  • Spring (JPA): 5.3.7 -> 5.3.14
    • +
  • Spring-Data (JPA): 2.5.0 -> 2.6.0
    • +
  • Hibernate ORM (JPA): 5.4.30.Final -> 5.4.33
    • +
  • Flyway (JPA): 6.5.4 -> 8.3.0
    • +
  • H2 (JPA): 1.4.200 -> 2.0.204 (Note that this change requires the use of the HapiFhirH2Dialect instead of the built-in Hibernate H2Dialect due to Hibernate issue HHH-15002
    • +
  • Commons-DBCP2 (JPA): .8.0 -> .8.0 -> 2.9.0
    • +
  • Swagger-Models (OpenAPI Support): 2.1.7 -> 2.1.12
    • +
  • Thymeleaf (Testpage Overlay): 3.0.12.RELEASE -> 3.0.14.RELEASE (Addresses CVE-2021-43466)
    • +
  • Commons-CLI (CLI): 1.4 -> 1.5.0
    • +
  • JANSI (CLI): 2.3.2 -> 2.4.0
    • +
  • Jetty Server (CLI): 9.4.43.v20210629 -> 9.4.44.v20210927
    • +
  • Spring Boot (Boot): 2.5.0 -> 2.6.2
    • +
  • Swagger UI (OpenAPI): 3.46.0 -> 4.1.3
" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/getting_started/versions.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/getting_started/versions.md index e5e71fb65d4..402614d0d78 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/getting_started/versions.md +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/docs/getting_started/versions.md @@ -25,6 +25,36 @@ Note also that after the release of the FHIR DSTU2 specification, the FHIR + + HAPI FHIR 5.7.0 + JDK8 + + 1.0.2 + 1.4.0 + 3.0.2 + 4.0.1 + 5.0.0-snapshot1
0394b96b14 + + + HAPI FHIR 5.6.0 + JDK8 + + 1.0.2 + 1.4.0 + 3.0.2 + 4.0.1 + 4.6.0
9b829d9714 + + + HAPI FHIR 5.5.0 + JDK8 + + 1.0.2 + 1.4.0 + 3.0.2 + 4.0.1 + 4.6.0
9b829d9714 + HAPI FHIR 5.4.0 JDK8 diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index ddeafb42d33..9719106ec4f 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -11,7 +11,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml index c489233c51d..4e86e70a461 100644 --- a/hapi-fhir-jaxrsserver-base/pom.xml +++ b/hapi-fhir-jaxrsserver-base/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderDstu3Test.java b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderDstu3Test.java index 497a458c860..5879df0fb89 100644 --- a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderDstu3Test.java +++ b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderDstu3Test.java @@ -46,7 +46,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatcher; import org.mockito.ArgumentMatchers; -import org.mockito.Matchers; import java.util.ArrayList; import java.util.Arrays; @@ -178,7 +177,7 @@ public class AbstractJaxRsResourceProviderDstu3Test { toCreate.getIdentifier().add(new Identifier().setValue("myIdentifier")); outcome.setResource(toCreate); - when(mock.create(patientCaptor.capture(), isNull(String.class))).thenReturn(outcome); + when(mock.create(patientCaptor.capture(), isNull())).thenReturn(outcome); client.setEncoding(EncodingEnum.JSON); final MethodOutcome response = client.create().resource(toCreate).prefer(PreferReturnEnum.REPRESENTATION) .execute(); @@ -295,11 +294,11 @@ public class AbstractJaxRsResourceProviderDstu3Test { @Test public void testSearchUsingGenericClientBySearch() { // Perform a search - when(mock.search(any(StringParam.class), Matchers.isNull(StringAndListParam.class))) + when(mock.search(any(StringParam.class), isNull())) .thenReturn(Arrays.asList(createPatient(1))); final Bundle results = client.search().forResource(Patient.class) .where(Patient.NAME.matchesExactly().value(PATIENT_NAME)).returnBundle(Bundle.class).execute(); - verify(mock).search(any(StringParam.class), Matchers.isNull(StringAndListParam.class)); + verify(mock).search(any(StringParam.class), isNull()); IBaseResource resource = results.getEntry().get(0).getResource(); compareResultId(1, resource); diff --git a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderTest.java b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderTest.java index d852ac00dd7..c6271d0bb60 100644 --- a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderTest.java +++ b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderTest.java @@ -43,7 +43,6 @@ import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import java.util.ArrayList; import java.util.Arrays; @@ -169,7 +168,7 @@ public class AbstractJaxRsResourceProviderTest { toCreate.getIdentifierFirstRep().setValue("myIdentifier"); outcome.setResource(toCreate); - when(mock.create(patientCaptor.capture(), isNull(String.class))).thenReturn(outcome); + when(mock.create(patientCaptor.capture(), isNull())).thenReturn(outcome); client.setEncoding(EncodingEnum.JSON); final MethodOutcome response = client.create().resource(toCreate).prefer(PreferReturnEnum.REPRESENTATION) .execute(); @@ -269,11 +268,11 @@ public class AbstractJaxRsResourceProviderTest { @Test public void testSearchUsingGenericClientBySearch() { // Perform a search - when(mock.search(any(StringParam.class), Matchers.isNull(StringAndListParam.class))) + when(mock.search(any(StringParam.class), isNull())) .thenReturn(Arrays.asList(createPatient(1))); Bundle results = client.search().forResource(Patient.class) .where(Patient.NAME.matchesExactly().value(PATIENT_NAME)).returnBundle(Bundle.class).execute(); - verify(mock).search(any(StringParam.class), Matchers.isNull(StringAndListParam.class)); + verify(mock).search(any(StringParam.class), isNull()); IResource resource = results.getEntry().get(0).getResource(); compareResultId(1, resource); diff --git a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptorTest.java b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptorTest.java index 249fe726368..044d00b10b7 100644 --- a/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptorTest.java +++ b/hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptorTest.java @@ -1,8 +1,8 @@ package ca.uhn.fhir.jaxrs.server.interceptor; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.*; import java.net.URI; @@ -10,7 +10,6 @@ import java.util.HashMap; import javax.interceptor.InvocationContext; import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.*; import org.junit.jupiter.api.BeforeEach; @@ -57,10 +56,10 @@ public class JaxRsExceptionInterceptorTest { } @Test - public void testIntercepWithServletError() throws Throwable { + public void testInterceptorWithServletError() throws Throwable { ExceptionHandlingInterceptor exceptionHandler = mock(ExceptionHandlingInterceptor.class); when(exceptionHandler.preProcessOutgoingException(any(RequestDetails.class), any(Throwable.class), - isNull(HttpServletRequest.class))).thenThrow(new ServletException("someMessage")); + isNull())).thenThrow(new ServletException("someMessage")); interceptor = new JaxRsExceptionInterceptor(exceptionHandler); when(context.proceed()).thenThrow(new ServletException()); try { diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml index 79eb51c0eab..d097a52b6d9 100644 --- a/hapi-fhir-jpa/pom.xml +++ b/hapi-fhir-jpa/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml 4.0.0 diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 9c654cd6d35..84322581d08 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java index b8348427857..70f6eb4f7e0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseConfig.java @@ -156,6 +156,7 @@ import org.hl7.fhir.common.hapi.validation.support.UnknownCodeSystemWarningValid import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices; import org.hl7.fhir.utilities.npm.FilesystemPackageCacheManager; +import org.hl7.fhir.utilities.npm.PackageClient; import org.springframework.batch.core.configuration.JobRegistry; import org.springframework.batch.core.configuration.annotation.BatchConfigurer; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; @@ -377,8 +378,8 @@ public abstract class BaseConfig { public IHapiPackageCacheManager packageCacheManager() { JpaPackageCache retVal = new JpaPackageCache(); retVal.getPackageServers().clear(); - retVal.getPackageServers().add(FilesystemPackageCacheManager.PRIMARY_SERVER); - retVal.getPackageServers().add(FilesystemPackageCacheManager.SECONDARY_SERVER); + retVal.getPackageServers().add(PackageClient.PRIMARY_SERVER); + retVal.getPackageServers().add(PackageClient.SECONDARY_SERVER); return retVal; } diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java index 95efe95f065..526c985b4e0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IPartitionDao.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.jpa.dao.data; import ca.uhn.fhir.jpa.entity.PartitionEntity; -import org.checkerframework.checker.nullness.Opt; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java index 32db55df2f1..14031005250 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/ISearchDao.java @@ -43,7 +43,7 @@ public interface ISearchDao extends JpaRepository, IHapiFhirJpaRep @Query("SELECT s.myId FROM Search s WHERE s.myDeleted = TRUE") Slice findDeleted(Pageable thePage); - @Query("SELECT s FROM Search s WHERE s.myResourceType = :type AND mySearchQueryStringHash = :hash AND (s.myCreated > :cutoff) AND s.myDeleted = false AND s.myStatus <> 'FAILED'") + @Query("SELECT s FROM Search s WHERE s.myResourceType = :type AND mySearchQueryStringHash = :hash AND (s.myCreated > :cutoff) AND s.myDeleted = FALSE AND s.myStatus <> 'FAILED'") Collection findWithCutoffOrExpiry(@Param("type") String theResourceType, @Param("hash") int theHashCode, @Param("cutoff") Date theCreatedCutoff); @Query("SELECT COUNT(s) FROM Search s WHERE s.myDeleted = TRUE") diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java index badf4632278..362144dd913 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/expunge/ResourceForeignKey.java @@ -23,6 +23,7 @@ package ca.uhn.fhir.jpa.dao.expunge; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; public class ResourceForeignKey { public final String table; @@ -57,7 +58,7 @@ public class ResourceForeignKey { @Override public String toString() { - return new ToStringBuilder(this) + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) .append("table", table) .append("key", key) .toString(); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoCodeSystemR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoCodeSystemR5.java index ba39c889c70..883407de993 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoCodeSystemR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoCodeSystemR5.java @@ -74,7 +74,7 @@ public class FhirResourceDaoCodeSystemR5 extends BaseHapiFhirResourceDao findCodeSystemIdsContainingSystemAndCode(String theCode, String theSystem, RequestDetails theRequest) { List valueSetIds; - Set ids = searchForIds(new SearchParameterMap(CodeSystem.SP_CODE, new TokenParam(theSystem, theCode)), theRequest); + Set ids = searchForIds(new SearchParameterMap(org.hl7.fhir.r4.model.CodeSystem.SP_CODE, new TokenParam(theSystem, theCode)), theRequest); valueSetIds = new ArrayList<>(); for (ResourcePersistentId next : ids) { IIdType id = myIdHelperService.translatePidIdToForcedId(myFhirContext, "CodeSystem", next); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java index 535697e9d87..38ba0d55610 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoObservationR5.java @@ -54,22 +54,22 @@ public class FhirResourceDaoObservationR5 extends BaseHapiFhirResourceDaoObserva @Override protected String getEffectiveParamName() { - return Observation.SP_DATE; + return org.hl7.fhir.r4.model.Observation.SP_DATE; } @Override protected String getCodeParamName() { - return Observation.SP_CODE; + return org.hl7.fhir.r4.model.Observation.SP_CODE; } @Override protected String getSubjectParamName() { - return Observation.SP_SUBJECT; + return org.hl7.fhir.r4.model.Observation.SP_SUBJECT; } @Override protected String getPatientParamName() { - return Observation.SP_PATIENT; + return org.hl7.fhir.r4.model.Observation.SP_PATIENT; } @Override diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderObservationR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderObservationR5.java index 1fd9b0665c0..de70ad9fd50 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderObservationR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderObservationR5.java @@ -81,14 +81,14 @@ public class BaseJpaResourceProviderObservationR5 extends JpaResourceProviderR5< startRequest(theServletRequest); try { SearchParameterMap paramMap = new SearchParameterMap(); - paramMap.add(Observation.SP_CATEGORY, theCategory); - paramMap.add(Observation.SP_CODE, theCode); - paramMap.add(Observation.SP_DATE, theDate); + paramMap.add(org.hl7.fhir.r4.model.Observation.SP_CATEGORY, theCategory); + paramMap.add(org.hl7.fhir.r4.model.Observation.SP_CODE, theCode); + paramMap.add(org.hl7.fhir.r4.model.Observation.SP_DATE, theDate); if (thePatient != null) { - paramMap.add(Observation.SP_PATIENT, thePatient); + paramMap.add(org.hl7.fhir.r4.model.Observation.SP_PATIENT, thePatient); } if (theSubject != null) { - paramMap.add(Observation.SP_SUBJECT, theSubject); + paramMap.add(org.hl7.fhir.r4.model.Observation.SP_SUBJECT, theSubject); } if (theMax != null) { paramMap.setLastNMax(theMax.getValue()); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderStructureDefinitionR5.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderStructureDefinitionR5.java index bdde58dd11f..2bd3025fab0 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderStructureDefinitionR5.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r5/BaseJpaResourceProviderStructureDefinitionR5.java @@ -60,7 +60,7 @@ public class BaseJpaResourceProviderStructureDefinitionR5 extends JpaResourcePro } else { SearchParameterMap map = new SearchParameterMap(); map.setLoadSynchronousUpTo(2); - map.add(StructureDefinition.SP_URL, new UriParam(theUrl.getValue())); + map.add(org.hl7.fhir.r4.model.StructureDefinition.SP_URL, new UriParam(theUrl.getValue())); IBundleProvider outcome = getDao().search(map, theRequestDetails); Integer numResults = outcome.size(); assert numResults != null; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteTasklet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteTasklet.java index 854c5ae8cce..06b65d7a439 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteTasklet.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermCodeSystemDeleteTasklet.java @@ -22,6 +22,7 @@ package ca.uhn.fhir.jpa.term.job; import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemDao; import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemVersionDao; +import ca.uhn.fhir.jpa.entity.TermCodeSystem; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,15 +42,13 @@ public class TermCodeSystemDeleteTasklet implements Tasklet { @Autowired private ITermCodeSystemDao myTermCodeSystemDao; - @Autowired - private ITermCodeSystemVersionDao myCodeSystemVersionDao; - @Override public RepeatStatus execute(@NotNull StepContribution contribution, ChunkContext context) throws Exception { long codeSystemPid = (Long) context.getStepContext().getJobParameters().get(JOB_PARAM_CODE_SYSTEM_ID); - ourLog.info("Deleting code system {}", codeSystemPid); - myTermCodeSystemDao.findById(codeSystemPid).orElseThrow(IllegalStateException::new); + TermCodeSystem cs = myTermCodeSystemDao.findById(codeSystemPid).orElseThrow(IllegalStateException::new); + ourLog.info("Deleting code system {} / {}", codeSystemPid, cs.getCodeSystemUri()); + myTermCodeSystemDao.deleteById(codeSystemPid); ourLog.info("Code system {} deleted", codeSystemPid); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermConceptDeleteTasklet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermConceptDeleteTasklet.java deleted file mode 100644 index dd708bc401d..00000000000 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/job/TermConceptDeleteTasklet.java +++ /dev/null @@ -1,64 +0,0 @@ -package ca.uhn.fhir.jpa.term.job; - -/* - * #%L - * HAPI FHIR JPA Server - * %% - * Copyright (C) 2014 - 2021 Smile CDR, Inc. - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemDao; -import ca.uhn.fhir.jpa.dao.data.ITermCodeSystemVersionDao; -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.batch.core.StepContribution; -import org.springframework.batch.core.scope.context.ChunkContext; -import org.springframework.batch.core.step.tasklet.Tasklet; -import org.springframework.batch.repeat.RepeatStatus; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.annotation.Nonnull; - -import static ca.uhn.fhir.jpa.batch.config.BatchConstants.JOB_PARAM_CODE_SYSTEM_ID; - -/** - * Deletes the TermConcept(s) related to the TermCodeSystemVersion being deleted - * Executes in its own step to be in own transaction because it is a DB-heavy operation - */ -@Component -public class TermConceptDeleteTasklet implements Tasklet { - private static final Logger ourLog = LoggerFactory.getLogger(TermConceptDeleteTasklet.class); - - @Autowired - private ITermCodeSystemDao myTermCodeSystemDao; - - @Autowired - private ITermCodeSystemVersionDao myCodeSystemVersionDao; - - @Override - public RepeatStatus execute(@Nonnull StepContribution contribution, ChunkContext context) throws Exception { - long codeSystemPid = (Long) context.getStepContext().getJobParameters().get(JOB_PARAM_CODE_SYSTEM_ID); - ourLog.info("Deleting code system {}", codeSystemPid); - - myTermCodeSystemDao.findById(codeSystemPid).orElseThrow(IllegalStateException::new); - myTermCodeSystemDao.deleteById(codeSystemPid); - - return RepeatStatus.FINISHED; - } - -} diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java index 0014407fb09..9253de45a58 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/ElasticsearchWithPrefixConfig.java @@ -20,7 +20,7 @@ import org.elasticsearch.client.RequestOptions; import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.indices.PutIndexTemplateRequest; import org.elasticsearch.common.settings.Settings; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.jpa.HibernatePersistenceProvider; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchBackendSettings; import org.hibernate.search.backend.elasticsearch.cfg.ElasticsearchIndexSettings; @@ -101,7 +101,7 @@ public class ElasticsearchWithPrefixConfig { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); //Override default lucene settings // Force elasticsearch to start first int httpPort = elasticContainer().getMappedPort(9200);//9200 is the HTTP port diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java index fa6f055c222..cf0013d8113 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu2Config.java @@ -9,7 +9,7 @@ import ca.uhn.fhir.validation.ResultSeverityEnum; import net.ttddyy.dsproxy.listener.ThreadQueryCountHolder; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; @@ -148,7 +148,7 @@ public class TestDstu2Config extends BaseJavaConfigDstu2 { extraProperties.put("hibernate.format_sql", "true"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); boolean enableLucene = myEnv.getProperty(BaseJpaTest.CONFIG_ENABLE_LUCENE, Boolean.TYPE, BaseJpaTest.CONFIG_ENABLE_LUCENE_DEFAULT_VALUE); Map hibernateSearchProperties = BaseJpaTest.buildHibernateSearchProperties(enableLucene); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java index 393c22b5ec5..d710671edea 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu3Config.java @@ -12,7 +12,7 @@ import ca.uhn.fhir.rest.server.mail.MailSvc; import ca.uhn.fhir.validation.ResultSeverityEnum; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -154,7 +154,7 @@ public class TestDstu3Config extends BaseJavaConfigDstu3 { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); boolean enableLucene = myEnv.getProperty(BaseJpaTest.CONFIG_ENABLE_LUCENE, Boolean.TYPE, BaseJpaTest.CONFIG_ENABLE_LUCENE_DEFAULT_VALUE); Map hibernateSearchProperties = BaseJpaTest.buildHibernateSearchProperties(enableLucene); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java index a86d3b1d25f..83c82755bb1 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4Config.java @@ -14,7 +14,7 @@ import net.ttddyy.dsproxy.listener.SingleQueryCountHolder; import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.jpa.HibernatePersistenceProvider; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.annotation.Bean; @@ -166,7 +166,7 @@ public class TestR4Config extends BaseJavaConfigR4 { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); boolean enableLucene = myEnv.getProperty(BaseJpaTest.CONFIG_ENABLE_LUCENE, Boolean.TYPE, BaseJpaTest.CONFIG_ENABLE_LUCENE_DEFAULT_VALUE); Map hibernateSearchProperties = BaseJpaTest.buildHibernateSearchProperties(enableLucene); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4WithLuceneDisabledConfig.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4WithLuceneDisabledConfig.java index 8786552e85c..8203307d705 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4WithLuceneDisabledConfig.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR4WithLuceneDisabledConfig.java @@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.config; import java.util.Properties; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.search.backend.elasticsearch.index.layout.IndexLayoutStrategy; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.engine.cfg.BackendSettings; @@ -42,7 +42,7 @@ public class TestR4WithLuceneDisabledConfig extends TestR4Config { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); extraProperties.put(HibernateOrmMapperSettings.ENABLED, "false"); return extraProperties; } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java index fba231423d6..3ad3351ef23 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestR5Config.java @@ -10,7 +10,7 @@ import ca.uhn.fhir.validation.ResultSeverityEnum; import net.ttddyy.dsproxy.listener.SingleQueryCountHolder; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.annotation.Bean; @@ -149,7 +149,7 @@ public class TestR5Config extends BaseJavaConfigR5 { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); boolean enableLucene = myEnv.getProperty(BaseJpaTest.CONFIG_ENABLE_LUCENE, Boolean.TYPE, BaseJpaTest.CONFIG_ENABLE_LUCENE_DEFAULT_VALUE); Map hibernateSearchProperties = BaseJpaTest.buildHibernateSearchProperties(enableLucene); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java index a6aa030a02b..9d33c2b666c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java @@ -11,7 +11,6 @@ import ca.uhn.fhir.jpa.api.model.ExpungeOptions; import ca.uhn.fhir.jpa.api.svc.ISearchCoordinatorSvc; import ca.uhn.fhir.jpa.bulk.export.api.IBulkDataExportSvc; import ca.uhn.fhir.jpa.config.BaseConfig; -import ca.uhn.fhir.jpa.config.TestDstu2Config; import ca.uhn.fhir.jpa.dao.data.IForcedIdDao; import ca.uhn.fhir.jpa.dao.data.IResourceHistoryTableDao; import ca.uhn.fhir.jpa.dao.data.IResourceIndexedComboTokensNonUniqueDao; @@ -72,7 +71,6 @@ import org.hl7.fhir.dstu3.model.Resource; import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java index 84a951e8185..9cabd9fdb35 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu2/BaseJpaDstu2Test.java @@ -17,7 +17,6 @@ import ca.uhn.fhir.jpa.dao.data.IResourceIndexedSearchParamTokenDao; import ca.uhn.fhir.jpa.dao.data.IResourceLinkDao; import ca.uhn.fhir.jpa.dao.data.IResourceTableDao; import ca.uhn.fhir.jpa.model.entity.ModelConfig; -import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.provider.JpaSystemProviderDstu2; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.reindex.IResourceReindexingSvc; @@ -61,8 +60,6 @@ import ca.uhn.fhir.parser.IParser; import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; import org.apache.commons.io.IOUtils; -import org.hibernate.search.mapper.orm.Search; -import org.hibernate.search.mapper.orm.session.SearchSession; import org.hl7.fhir.instance.model.api.IBaseResource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java index 9ad9d7ab388..38d10588ec4 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/BaseJpaDstu3Test.java @@ -33,7 +33,6 @@ import ca.uhn.fhir.jpa.dao.data.ITermValueSetDao; import ca.uhn.fhir.jpa.dao.dstu2.FhirResourceDaoDstu2SearchNoFtTest; import ca.uhn.fhir.jpa.dao.r4.BaseJpaR4Test; import ca.uhn.fhir.jpa.model.entity.ModelConfig; -import ca.uhn.fhir.jpa.model.entity.ResourceTable; import ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3; import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider; import ca.uhn.fhir.jpa.search.IStaleSearchDeletingSvc; @@ -55,8 +54,6 @@ import ca.uhn.fhir.rest.server.provider.ResourceProviderFactory; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.util.UrlUtil; import org.apache.commons.io.IOUtils; -import org.hibernate.search.mapper.orm.Search; -import org.hibernate.search.mapper.orm.session.SearchSession; import org.hl7.fhir.convertors.advisors.impl.BaseAdvisor_30_40; import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_40; import org.hl7.fhir.dstu3.model.AllergyIntolerance; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java index 25bb507169c..7e93f1b5151 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3ValueSetMultiVersionTest.java @@ -199,7 +199,10 @@ public class FhirResourceDaoDstu3ValueSetMultiVersionTest extends BaseJpaDstu3Te if (optionalTermValueSet.isPresent()) { fail(); } - myTermValueSetDao.findTermValueSetByUrlAndVersion(URL_MY_VALUE_SET, "v2").orElseThrow(() -> new IllegalArgumentException("No TerValueSet found for " + URL_MY_VALUE_SET + " version v2")); + optionalTermValueSet = myTermValueSetDao.findTermValueSetByUrlAndVersion(URL_MY_VALUE_SET, "v2"); + if (!optionalTermValueSet.isPresent()) { + fail("No TerValueSet found for " + URL_MY_VALUE_SET + " version v2"); + } myValueSetDao.delete(myValueSets.get(ValueSetVersions.V2).getResource().getIdElement()); assertEquals(0, myTermValueSetDao.findTermValueSetByUrl(PageRequest.of(0, 10), URL_MY_VALUE_SET).size()); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java index e93f912da3b..722e3f46d38 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/expunge/ResourceTableFKProviderTest.java @@ -5,13 +5,18 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashSet; import java.util.List; -import java.util.stream.Collectors; +import java.util.Set; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; @@ -24,21 +29,45 @@ class ResourceTableFKProviderTest extends BaseJpaR4Test { protected EntityManager myEntityManager; @Autowired ResourceTableFKProvider myResourceTableFKProvider; + @Autowired + private DataSource myDataSource; + @Test - public void testWeHaveAllForeignKeys() { - runInTransaction(()-> { - List result = myEntityManager.createNativeQuery("SELECT FKTABLE_NAME, FKCOLUMN_NAME FROM INFORMATION_SCHEMA.CROSS_REFERENCES WHERE PKTABLE_NAME = 'HFJ_RESOURCE'").getResultList(); - List expected = result.stream().map(a -> new ResourceForeignKey(a[0].toString(), a[1].toString())).collect(Collectors.toList()); + public void testWeHaveAllForeignKeys() throws SQLException { + Set expected = new HashSet<>(); - // Add the extra FKs that are not available in the CROSS_REFERENCES table - expected.add(new ResourceForeignKey("HFJ_HISTORY_TAG", "RES_ID")); - //expected.add(new ResourceForeignKey("TRM_CODESYSTEM_VER", "RES_ID")); - //expected.add(new ResourceForeignKey("HFJ_RES_VER_PROV", "RES_PID")); - // If this assertion fails, it means hapi-fhir has added a new foreign-key dependency to HFJ_RESOURCE. To fix - // the test, add the missing key to myResourceTableFKProvider.getResourceForeignKeys() - assertThat(myResourceTableFKProvider.getResourceForeignKeys(), containsInAnyOrder(expected.toArray())); - }); + try (Connection connection = myDataSource.getConnection()) { + DatabaseMetaData metadata = connection.getMetaData(); + + Set tableNames = new HashSet<>(); + ResultSet tables = metadata.getTables(null, null, null, null); + while (tables.next()) { + tableNames.add(tables.getString("TABLE_NAME")); + } + tableNames.remove("HFJ_RESOURCE"); + + for (String nextTargetTable : tableNames) { + String sourceTable = "HFJ_RESOURCE"; + ResultSet crossRefs = metadata.getCrossReference(null, null, sourceTable, null, null, nextTargetTable); + while (crossRefs.next()) { + String fkTableName = crossRefs.getString("FKTABLE_NAME"); + String fkColumnName = crossRefs.getString("FKCOLUMN_NAME"); + ResourceForeignKey foreignKey = new ResourceForeignKey(fkTableName, fkColumnName); + ourLog.info("Found FK to HFJ_RESOURCE: {}", foreignKey); + expected.add(foreignKey); + } + + } + + } + + // Add the extra FKs that are not available in the CROSS_REFERENCES table + expected.add(new ResourceForeignKey("HFJ_HISTORY_TAG", "RES_ID")); + + // If this assertion fails, it means hapi-fhir has added a new foreign-key dependency to HFJ_RESOURCE. To fix + // the test, add the missing key to myResourceTableFKProvider.getResourceForeignKeys() + List actual = myResourceTableFKProvider.getResourceForeignKeys(); + assertThat(actual, containsInAnyOrder(expected.toArray())); } - } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java index caf3cae8c0d..eba2178e567 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4InterceptorTest.java @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; @@ -463,14 +463,14 @@ public class FhirResourceDaoR4InterceptorTest extends BaseJpaR4Test { IServerOperationInterceptor interceptor = mock(IServerOperationInterceptor.class); myInterceptorRegistry.registerInterceptor(interceptor); - verify(interceptor, times(0)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); + verify(interceptor, times(0)).resourceCreated(Mockito.isNull(), any()); Patient p = new Patient(); p.addName().setFamily("PATIENT"); IIdType id = myPatientDao.create(p, (RequestDetails) null).getId(); assertEquals(1L, id.getVersionIdPartAsLong().longValue()); - verify(interceptor, times(1)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); + verify(interceptor, times(1)).resourceCreated(Mockito.isNull(), any()); } @Test @@ -478,8 +478,8 @@ public class FhirResourceDaoR4InterceptorTest extends BaseJpaR4Test { IServerOperationInterceptor interceptor = mock(IServerOperationInterceptor.class); myInterceptorRegistry.registerInterceptor(interceptor); - verify(interceptor, times(0)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(0)).resourceDeleted(Mockito.isNull(RequestDetails.class), any()); + verify(interceptor, times(0)).resourceCreated(Mockito.isNull(), any()); + verify(interceptor, times(0)).resourceDeleted(Mockito.isNull(), any()); Patient p = new Patient(); p.addName().setFamily("PATIENT"); @@ -489,8 +489,8 @@ public class FhirResourceDaoR4InterceptorTest extends BaseJpaR4Test { p.addName().setFamily("2"); myPatientDao.delete(p.getIdElement().toUnqualifiedVersionless()); - verify(interceptor, times(1)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(1)).resourceDeleted(Mockito.isNull(RequestDetails.class), any()); + verify(interceptor, times(1)).resourceCreated(Mockito.isNull(), any()); + verify(interceptor, times(1)).resourceDeleted(Mockito.isNull(), any()); } /** @@ -602,9 +602,9 @@ public class FhirResourceDaoR4InterceptorTest extends BaseJpaR4Test { IServerOperationInterceptor interceptor = mock(IServerOperationInterceptor.class); myInterceptorRegistry.registerInterceptor(interceptor); - verify(interceptor, times(0)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(0)).resourceUpdated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(0)).resourceUpdated(Mockito.isNull(RequestDetails.class), any(), any()); + verify(interceptor, times(0)).resourceCreated(Mockito.isNull(), any()); + verify(interceptor, times(0)).resourceUpdated(Mockito.isNull(), any()); + verify(interceptor, times(0)).resourceUpdated(Mockito.isNull(), any(), any()); Patient p = new Patient(); p.addName().setFamily("PATIENT"); @@ -614,9 +614,9 @@ public class FhirResourceDaoR4InterceptorTest extends BaseJpaR4Test { p.addName().setFamily("2"); myPatientDao.update(p); - verify(interceptor, times(1)).resourceCreated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(1)).resourceUpdated(Mockito.isNull(RequestDetails.class), any()); - verify(interceptor, times(1)).resourceUpdated(Mockito.isNull(RequestDetails.class), any(), any()); + verify(interceptor, times(1)).resourceCreated(Mockito.isNull(), any()); + verify(interceptor, times(1)).resourceUpdated(Mockito.isNull(), any()); + verify(interceptor, times(1)).resourceUpdated(Mockito.isNull(), any(), any()); } private class MyOneResourceAnswer implements Answer { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java index e6ca3e66e27..7976407eab1 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/AuthorizationInterceptorJpaR5Test.java @@ -1,68 +1,27 @@ package ca.uhn.fhir.jpa.provider.r5; -import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor; -import ca.uhn.fhir.jpa.provider.r5.BaseResourceProviderR5Test; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.api.RestOperationTypeEnum; import ca.uhn.fhir.rest.api.server.RequestDetails; -import ca.uhn.fhir.rest.client.interceptor.SimpleRequestHeaderInterceptor; -import ca.uhn.fhir.rest.server.exceptions.AuthenticationException; import ca.uhn.fhir.rest.server.exceptions.ForbiddenOperationException; -import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException; import ca.uhn.fhir.rest.server.interceptor.auth.AuthorizationInterceptor; import ca.uhn.fhir.rest.server.interceptor.auth.IAuthRule; -import ca.uhn.fhir.rest.server.interceptor.auth.IAuthRuleTester; import ca.uhn.fhir.rest.server.interceptor.auth.PolicyEnum; import ca.uhn.fhir.rest.server.interceptor.auth.RuleBuilder; -import ca.uhn.fhir.rest.server.provider.ProviderConstants; -import ca.uhn.fhir.util.UrlUtil; -import org.apache.commons.io.IOUtils; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r5.model.Bundle; -import org.hl7.fhir.r5.model.CodeableConcept; -import org.hl7.fhir.r5.model.Coding; -import org.hl7.fhir.r5.model.Condition; -import org.hl7.fhir.r5.model.Encounter; import org.hl7.fhir.r5.model.Enumerations; -import org.hl7.fhir.r5.model.IdType; -import org.hl7.fhir.r5.model.Identifier; import org.hl7.fhir.r5.model.Observation; -import org.hl7.fhir.r5.model.Organization; -import org.hl7.fhir.r5.model.Parameters; import org.hl7.fhir.r5.model.Patient; -import org.hl7.fhir.r5.model.Practitioner; -import org.hl7.fhir.r5.model.Reference; -import org.hl7.fhir.r5.model.StringType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; import java.util.List; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.fail; public class AuthorizationInterceptorJpaR5Test extends BaseResourceProviderR5Test { - private static final Logger ourLog = LoggerFactory.getLogger(AuthorizationInterceptorJpaR5Test.class); - @BeforeEach @Override public void before() throws Exception { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java index 51d441b1032..140cd1ffad3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r5/ResourceProviderR5Test.java @@ -21,11 +21,13 @@ import org.apache.http.entity.StringEntity; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.r5.model.Bundle; import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent; +import org.hl7.fhir.r5.model.CapabilityStatement; import org.hl7.fhir.r5.model.CodeableConcept; import org.hl7.fhir.r5.model.DateTimeType; import org.hl7.fhir.r5.model.IdType; import org.hl7.fhir.r5.model.Observation; import org.hl7.fhir.r5.model.Observation.ObservationComponentComponent; +import org.hl7.fhir.r5.model.OperationOutcome; import org.hl7.fhir.r5.model.Patient; import org.hl7.fhir.r5.model.Quantity; import org.junit.jupiter.api.AfterEach; @@ -96,7 +98,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { Bundle output = myClient .search() .forResource("Patient") - .where(Patient.NAME.contains().value("ZAB")) + .where(org.hl7.fhir.r4.model.Patient.NAME.contains().value("ZAB")) .returnBundle(Bundle.class) .execute(); List ids = output.getEntry().stream().map(t -> t.getResource().getIdElement().toUnqualifiedVersionless().getValue()).collect(Collectors.toList()); @@ -105,7 +107,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { output = myClient .search() .forResource("Patient") - .where(Patient.NAME.contains().value("zab")) + .where(org.hl7.fhir.r4.model.Patient.NAME.contains().value("zab")) .returnBundle(Bundle.class) .execute(); ids = output.getEntry().stream().map(t -> t.getResource().getIdElement().toUnqualifiedVersionless().getValue()).collect(Collectors.toList()); @@ -122,7 +124,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { // Perform the search Bundle response0 = myClient.search() .forResource("Patient") - .where(Patient.NAME.matches().value("Hello")) + .where(org.hl7.fhir.r4.model.Patient.NAME.matches().value("Hello")) .returnBundle(Bundle.class) .execute(); assertEquals(1, response0.getEntry().size()); @@ -130,7 +132,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { // Perform the search again (should return the same) Bundle response1 = myClient.search() .forResource("Patient") - .where(Patient.NAME.matches().value("Hello")) + .where(org.hl7.fhir.r4.model.Patient.NAME.matches().value("Hello")) .returnBundle(Bundle.class) .execute(); assertEquals(1, response1.getEntry().size()); @@ -142,7 +144,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { // Perform the search again (shouldn't return the errored out search) Bundle response3 = myClient.search() .forResource("Patient") - .where(Patient.NAME.matches().value("Hello")) + .where(org.hl7.fhir.r4.model.Patient.NAME.matches().value("Hello")) .returnBundle(Bundle.class) .execute(); assertEquals(1, response3.getEntry().size()); @@ -182,7 +184,7 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { // Perform a search for the first page Bundle response0 = myClient.search() .forResource("Patient") - .where(Patient.NAME.matches().value("Hello")) + .where(org.hl7.fhir.r4.model.Patient.NAME.matches().value("Hello")) .returnBundle(Bundle.class) .count(1) .execute(); @@ -222,7 +224,15 @@ public class ResourceProviderR5Test extends BaseResourceProviderR5Test { try (CloseableHttpResponse resp = ourHttpClient.execute(post)) { String respString = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8); ourLog.info(respString); - assertEquals(200, resp.getStatusLine().getStatusCode()); +// assertEquals(200, resp.getStatusLine().getStatusCode()); + + // As of 2021-12-28, the R5 structures return a version string that isn't + // actually in the fhirVersion ValueSet. If this stops being the case this + // test will fail and the line above should be restored + OperationOutcome oo = myFhirCtx.newJsonParser().parseResource(OperationOutcome.class, respString); + assertEquals(1, oo.getIssue().size()); + assertEquals("The value provided ('5.0.0-snapshot1') is not in the value set 'FHIRVersion' (http://hl7.org/fhir/ValueSet/FHIR-version|4.6.0), and a code is required from this value set) (error message = Unknown code '5.0.0-snapshot1' for in-memory expansion of ValueSet 'http://hl7.org/fhir/ValueSet/FHIR-version')", oo.getIssue().get(0).getDiagnostics()); + } } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java index 2b3f655c76d..d97f519cd9c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/reindex/ResourceReindexingSvcImplTest.java @@ -1,7 +1,6 @@ package ca.uhn.fhir.jpa.search.reindex; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.jpa.api.config.DaoConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao; import ca.uhn.fhir.jpa.dao.BaseHapiFhirDao; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java index 80ec81f1dae..732b1023aad 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/stresstest/GiantTransactionPerfTest.java @@ -66,6 +66,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.data.domain.Sort; +import org.springframework.data.repository.query.FluentQuery; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; @@ -96,6 +97,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; +import java.util.function.Function; import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; @@ -525,6 +527,11 @@ public class GiantTransactionPerfTest { public boolean exists(Example example) { throw new UnsupportedOperationException(); } + + @Override + public R findBy(Example example, Function, R> queryFunction) { + throw new UnsupportedOperationException(); + } } private class MockEntityManager implements EntityManager { diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java index ad78b968e45..ad210a3d84c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcSnomedCtTest.java @@ -82,7 +82,7 @@ public class TerminologyLoaderSvcSnomedCtTest extends BaseLoaderTest { mySvc.loadSnomedCt(myFiles.getFiles(), mySrd); - verify(myTermCodeSystemStorageSvc).storeNewCodeSystemVersion(any(CodeSystem.class), myCsvCaptor.capture(), any(RequestDetails.class), anyList(), anyListOf(ConceptMap.class)); + verify(myTermCodeSystemStorageSvc).storeNewCodeSystemVersion(any(CodeSystem.class), myCsvCaptor.capture(), any(RequestDetails.class), anyList(), anyList()); TermCodeSystemVersion csv = myCsvCaptor.getValue(); TreeSet allCodes = toCodes(csv, true); diff --git a/hapi-fhir-jpaserver-cql/pom.xml b/hapi-fhir-jpaserver-cql/pom.xml index e0d5337d757..cf14637ea4b 100644 --- a/hapi-fhir-jpaserver-cql/pom.xml +++ b/hapi-fhir-jpaserver-cql/pom.xml @@ -7,7 +7,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/common/helper/TranslatorHelperTest.java b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/common/helper/TranslatorHelperTest.java index ed94139951b..3d67a741603 100644 --- a/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/common/helper/TranslatorHelperTest.java +++ b/hapi-fhir-jpaserver-cql/src/test/java/ca/uhn/fhir/cql/common/helper/TranslatorHelperTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; @@ -130,7 +130,7 @@ public class TranslatorHelperTest implements CqlProviderTestBase { CqlTranslator translator = null; try { MockedStatic cqlTranslator = mockStatic(CqlTranslator.class); - when(CqlTranslator.fromStream(any(InputStream.class), any(ModelManager.class), any(LibraryManager.class), Matchers.anyVararg())).thenThrow(IOException.class); + when(CqlTranslator.fromStream(any(InputStream.class), any(ModelManager.class), any(LibraryManager.class), any())).thenThrow(IOException.class); translator = TranslatorHelper.getTranslator(new ByteArrayInputStream("INVALID-FILENAME".getBytes(StandardCharsets.UTF_8)), libraryManager, modelManager); fail(); } catch (IllegalArgumentException | IOException e) { diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml index a239bddcbe4..443a1c489cc 100644 --- a/hapi-fhir-jpaserver-mdm/pom.xml +++ b/hapi-fhir-jpaserver-mdm/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmEventIT.java b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmEventIT.java index cafbdebbff2..e3dc1f4a9ae 100644 --- a/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmEventIT.java +++ b/hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmEventIT.java @@ -13,7 +13,7 @@ import ca.uhn.fhir.mdm.api.MdmMatchResultEnum; import ca.uhn.fhir.mdm.model.MdmTransactionContext; import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.server.messaging.ResourceOperationMessage; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings; import org.hibernate.search.engine.cfg.BackendSettings; diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml index 0d3cba0e196..fef345ffe45 100644 --- a/hapi-fhir-jpaserver-model/pom.xml +++ b/hapi-fhir-jpaserver-model/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java new file mode 100644 index 00000000000..7d714143dbd --- /dev/null +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java @@ -0,0 +1,18 @@ +package ca.uhn.fhir.jpa.model.dialect; + +import org.hibernate.dialect.H2Dialect; + +/** + * HAPI FHIR dialect for H2 database + */ +public class HapiFhirH2Dialect extends H2Dialect { + + /** + * Workaround until this bug is fixed: + * https://hibernate.atlassian.net/browse/HHH-15002 + */ + @Override + public String toBooleanValueString(boolean bool) { + return bool ? "true" : "false"; + } +} diff --git a/hapi-fhir-jpaserver-searchparam/pom.xml b/hapi-fhir-jpaserver-searchparam/pom.xml index 2d0a5103be4..fccf183cdcb 100755 --- a/hapi-fhir-jpaserver-searchparam/pom.xml +++ b/hapi-fhir-jpaserver-searchparam/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java index 2fcdb593094..a22b54197fc 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR4.java @@ -29,7 +29,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.annotations.VisibleForTesting; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.PathEngineException; -import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.context.IWorkerContext; import org.hl7.fhir.r4.hapi.ctx.HapiWorkerContext; @@ -43,7 +42,6 @@ import org.hl7.fhir.r4.model.ValueSet; import org.hl7.fhir.r4.utils.FHIRPathEngine; import javax.annotation.PostConstruct; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java index aca9d83e770..a556413d686 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorR5.java @@ -28,7 +28,6 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.PathEngineException; -import org.hl7.fhir.instance.model.api.IBase; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r5.context.IWorkerContext; import org.hl7.fhir.r5.hapi.ctx.HapiWorkerContext; @@ -42,7 +41,6 @@ import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.utils.FHIRPathEngine; import javax.annotation.PostConstruct; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java index ccb32b41b9d..a56cfb95f91 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/SearchParamExtractorService.java @@ -61,7 +61,6 @@ import org.hl7.fhir.instance.model.api.IIdType; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Nonnull; -import javax.validation.constraints.NotNull; import java.util.Collection; import java.util.Date; import java.util.HashSet; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java index 19c8cb40b60..3d53e26dd80 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java @@ -50,7 +50,6 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.regex.Pattern; public class InMemoryResourceMatcher { diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java index a62359290a2..5b036c2076e 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/ReadOnlySearchParamCache.java @@ -66,8 +66,8 @@ public class ReadOnlySearchParamCache { } protected Map getSearchParamMap(String theResourceName) { - Map retval = myResourceNameToSpNameToSp.get(theResourceName); - if (retval == null) { + Map retVal = myResourceNameToSpNameToSp.get(theResourceName); + if (retVal == null) { return Collections.emptyMap(); } return Collections.unmodifiableMap(myResourceNameToSpNameToSp.get(theResourceName)); @@ -92,11 +92,36 @@ public class ReadOnlySearchParamCache { Set resourceNames = theFhirContext.getResourceTypes(); + IBaseBundle allSearchParameterBundle = null; if (theFhirContext.getVersion().getVersion() == FhirVersionEnum.R4) { - IBaseBundle allSearchParameterBundle = (IBaseBundle) theFhirContext.newJsonParser().parseResource(ClasspathUtil.loadResourceAsStream("org/hl7/fhir/r4/model/sp/search-parameters.json")); + allSearchParameterBundle = (IBaseBundle) theFhirContext.newJsonParser().parseResource(ClasspathUtil.loadResourceAsStream("org/hl7/fhir/r4/model/sp/search-parameters.json")); + } else if (theFhirContext.getVersion().getVersion() == FhirVersionEnum.R5) { + allSearchParameterBundle = (IBaseBundle) theFhirContext.newXmlParser().parseResource(ClasspathUtil.loadResourceAsStream("org/hl7/fhir/r5/model/sp/search-parameters.xml")); + } + + if (allSearchParameterBundle != null) { for (IBaseResource next : BundleUtil.toListOfResources(theFhirContext, allSearchParameterBundle)) { RuntimeSearchParam nextCanonical = theCanonicalizer.canonicalizeSearchParameter(next); + if (nextCanonical != null) { + + // Force status to ACTIVE - For whatever reason the R5 draft SPs ship with + // a status of DRAFT which means the server doesn't actually apply them. + // At least this was the case as of 2021-12-24 - JA + nextCanonical = new RuntimeSearchParam( + nextCanonical.getId(), + nextCanonical.getUri(), + nextCanonical.getName(), + nextCanonical.getDescription(), + nextCanonical.getPath(), + nextCanonical.getParamType(), + nextCanonical.getProvidesMembershipInCompartments(), + nextCanonical.getTargets(), + RuntimeSearchParam.RuntimeSearchParamStatusEnum.ACTIVE, + nextCanonical.getComboSearchParamType(), + nextCanonical.getComponents(), + nextCanonical.getBase()); + Collection base = nextCanonical.getBase(); if (base.contains("Resource") || base.contains("DomainResource")) { base = resourceNames; diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java index 009e7ab29c5..823643d1088 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/RuntimeSearchParamCache.java @@ -46,7 +46,7 @@ public class RuntimeSearchParamCache extends ReadOnlySearchParamCache { // so it may get added more than once by this method ourLog.trace("Search param was previously registered for url: {}", uri); } else if (existingForUrl != null) { - ourLog.warn("Multiple search parameters have URL: {}", uri); + ourLog.debug("Multiple search parameters have URL: {}", uri); } else { myUrlToParam.put(uri, theSearchParam); } @@ -69,7 +69,8 @@ public class RuntimeSearchParamCache extends ReadOnlySearchParamCache { for (Map.Entry> nextBuiltInEntry : builtInSps) { for (RuntimeSearchParam nextParam : nextBuiltInEntry.getValue().values()) { String nextResourceName = nextBuiltInEntry.getKey(); - add(nextResourceName, nextParam.getName(), nextParam); + String nextParamName = nextParam.getName(); + add(nextResourceName, nextParamName, nextParam); } ourLog.trace("Have {} built-in SPs for: {}", nextBuiltInEntry.getValue().size(), nextBuiltInEntry.getKey()); @@ -95,8 +96,8 @@ public class RuntimeSearchParamCache extends ReadOnlySearchParamCache { } public static RuntimeSearchParamCache fromReadOnlySearchParmCache(ReadOnlySearchParamCache theBuiltInSearchParams) { - RuntimeSearchParamCache retval = new RuntimeSearchParamCache(); - retval.putAll(theBuiltInSearchParams); - return retval; + RuntimeSearchParamCache retVal = new RuntimeSearchParamCache(); + retVal.putAll(theBuiltInSearchParams); + return retVal; } } diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java index bc6231affde..b9e53bc23f0 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/registry/SearchParamRegistryImpl.java @@ -88,6 +88,13 @@ public class SearchParamRegistryImpl implements ISearchParamRegistry, IResourceC private IInterceptorService myInterceptorBroadcaster; private IResourceChangeListenerCache myResourceChangeListenerCache; + /** + * Constructor + */ + public SearchParamRegistryImpl() { + super(); + } + @Override public RuntimeSearchParam getActiveSearchParam(String theResourceName, String theParamName) { requiresActiveSearchParams(); @@ -156,7 +163,8 @@ public class SearchParamRegistryImpl implements ISearchParamRegistry, IResourceC private void initializeActiveSearchParams(Collection theJpaSearchParams) { StopWatch sw = new StopWatch(); - RuntimeSearchParamCache searchParams = RuntimeSearchParamCache.fromReadOnlySearchParmCache(getBuiltInSearchParams()); + ReadOnlySearchParamCache builtInSearchParams = getBuiltInSearchParams(); + RuntimeSearchParamCache searchParams = RuntimeSearchParamCache.fromReadOnlySearchParmCache(builtInSearchParams); long overriddenCount = overrideBuiltinSearchParamsWithActiveJpaSearchParams(searchParams, theJpaSearchParams); ourLog.trace("Have overridden {} built-in search parameters", overriddenCount); removeInactiveSearchParams(searchParams); diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java index 752cb2e3d33..e49295683f4 100644 --- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java +++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/LastNParameterHelper.java @@ -58,7 +58,7 @@ public class LastNParameterHelper { private static boolean isLastNParameterDstu3(String theParamName) { return (theParamName.equals(org.hl7.fhir.dstu3.model.Observation.SP_SUBJECT) || theParamName.equals(org.hl7.fhir.dstu3.model.Observation.SP_PATIENT) - || theParamName.equals(org.hl7.fhir.dstu3.model.Observation.SP_CATEGORY) || theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_CODE)) + || theParamName.equals(org.hl7.fhir.dstu3.model.Observation.SP_CATEGORY) || theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_CODE)) || theParamName.equals(org.hl7.fhir.dstu3.model.Observation.SP_DATE); } @@ -69,14 +69,14 @@ public class LastNParameterHelper { } private static boolean isLastNParameterR5(String theParamName) { - return (theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_SUBJECT) || theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_PATIENT) - || theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_CATEGORY) || theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_CODE)) - || theParamName.equals(org.hl7.fhir.r5.model.Observation.SP_DATE); + return (theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_SUBJECT) || theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_PATIENT) + || theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_CATEGORY) || theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_CODE)) + || theParamName.equals(org.hl7.fhir.r4.model.Observation.SP_DATE); } public static String getSubjectParamName(FhirContext theContext) { if (theContext.getVersion().getVersion() == FhirVersionEnum.R5) { - return org.hl7.fhir.r5.model.Observation.SP_SUBJECT; + return org.hl7.fhir.r4.model.Observation.SP_SUBJECT; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.R4) { return org.hl7.fhir.r4.model.Observation.SP_SUBJECT; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU3) { @@ -88,7 +88,7 @@ public class LastNParameterHelper { public static String getPatientParamName(FhirContext theContext) { if (theContext.getVersion().getVersion() == FhirVersionEnum.R5) { - return org.hl7.fhir.r5.model.Observation.SP_PATIENT; + return org.hl7.fhir.r4.model.Observation.SP_PATIENT; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.R4) { return org.hl7.fhir.r4.model.Observation.SP_PATIENT; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU3) { @@ -100,7 +100,7 @@ public class LastNParameterHelper { public static String getEffectiveParamName(FhirContext theContext) { if (theContext.getVersion().getVersion() == FhirVersionEnum.R5) { - return org.hl7.fhir.r5.model.Observation.SP_DATE; + return org.hl7.fhir.r4.model.Observation.SP_DATE; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.R4) { return org.hl7.fhir.r4.model.Observation.SP_DATE; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU3) { @@ -112,7 +112,7 @@ public class LastNParameterHelper { public static String getCategoryParamName(FhirContext theContext) { if (theContext.getVersion().getVersion() == FhirVersionEnum.R5) { - return org.hl7.fhir.r5.model.Observation.SP_CATEGORY; + return org.hl7.fhir.r4.model.Observation.SP_CATEGORY; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.R4) { return org.hl7.fhir.r4.model.Observation.SP_CATEGORY; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU3) { @@ -124,7 +124,7 @@ public class LastNParameterHelper { public static String getCodeParamName(FhirContext theContext) { if (theContext.getVersion().getVersion() == FhirVersionEnum.R5) { - return org.hl7.fhir.r5.model.Observation.SP_CODE; + return org.hl7.fhir.r4.model.Observation.SP_CODE; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.R4) { return org.hl7.fhir.r4.model.Observation.SP_CODE; } else if (theContext.getVersion().getVersion() == FhirVersionEnum.DSTU3) { diff --git a/hapi-fhir-jpaserver-subscription/pom.xml b/hapi-fhir-jpaserver-subscription/pom.xml index 8013008ff2f..bd75f589e1b 100644 --- a/hapi-fhir-jpaserver-subscription/pom.xml +++ b/hapi-fhir-jpaserver-subscription/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-utilities/pom.xml b/hapi-fhir-jpaserver-test-utilities/pom.xml index 5f6fd3e2dd2..82ff8cf32d3 100644 --- a/hapi-fhir-jpaserver-test-utilities/pom.xml +++ b/hapi-fhir-jpaserver-test-utilities/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml @@ -36,7 +36,6 @@ com.h2database h2 - 1.4.199 org.apache.commons diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java index 72d063dcb65..70b9e89f328 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java @@ -31,7 +31,7 @@ import net.ttddyy.dsproxy.listener.SingleQueryCountHolder; import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings; import org.hibernate.search.engine.cfg.BackendSettings; @@ -107,7 +107,7 @@ public class TestJpaDstu3Config extends BaseJavaConfigDstu3 { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); extraProperties.put(BackendSettings.backendKey(BackendSettings.TYPE), "lucene"); extraProperties.put(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName()); diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaR4Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaR4Config.java index 988cea91c3a..1c87e66a57c 100644 --- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaR4Config.java +++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaR4Config.java @@ -33,7 +33,7 @@ import net.ttddyy.dsproxy.listener.SingleQueryCountHolder; import net.ttddyy.dsproxy.listener.logging.SLF4JLogLevel; import net.ttddyy.dsproxy.support.ProxyDataSourceBuilder; import org.apache.commons.dbcp2.BasicDataSource; -import org.hibernate.dialect.H2Dialect; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings; import org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings; import org.hibernate.search.engine.cfg.BackendSettings; @@ -109,7 +109,7 @@ public class TestJpaR4Config extends BaseJavaConfigR4 { extraProperties.put("hibernate.format_sql", "false"); extraProperties.put("hibernate.show_sql", "false"); extraProperties.put("hibernate.hbm2ddl.auto", "update"); - extraProperties.put("hibernate.dialect", H2Dialect.class.getName()); + extraProperties.put("hibernate.dialect", HapiFhirH2Dialect.class.getName()); extraProperties.put(BackendSettings.backendKey(BackendSettings.TYPE), "lucene"); extraProperties.put(BackendSettings.backendKey(LuceneBackendSettings.ANALYSIS_CONFIGURER), HapiLuceneAnalysisConfigurer.class.getName()); diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index 7c5fc0d18f4..74ca1677c1f 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-server-mdm/pom.xml b/hapi-fhir-server-mdm/pom.xml index 38d32276475..e9b7630d99c 100644 --- a/hapi-fhir-server-mdm/pom.xml +++ b/hapi-fhir-server-mdm/pom.xml @@ -7,7 +7,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java index ef33f9b95c6..3052f3cd9fd 100644 --- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java +++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/config/MdmRuleValidator.java @@ -35,21 +35,18 @@ import ca.uhn.fhir.mdm.rules.json.MdmSimilarityJson; import ca.uhn.fhir.parser.DataFormatException; import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.util.FhirTerser; -import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.xml.crypto.Data; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; @Service public class MdmRuleValidator implements IMdmRuleValidator { diff --git a/hapi-fhir-server-openapi/pom.xml b/hapi-fhir-server-openapi/pom.xml index a6a0037c09d..f7094308d6c 100644 --- a/hapi-fhir-server-openapi/pom.xml +++ b/hapi-fhir-server-openapi/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml index 622386d5cf8..b53da5662e2 100644 --- a/hapi-fhir-server/pom.xml +++ b/hapi-fhir-server/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java index 43076546c14..b391978106a 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServerConfiguration.java @@ -32,7 +32,6 @@ import ca.uhn.fhir.rest.server.util.ISearchParamRegistry; import ca.uhn.fhir.util.VersionUtil; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; -import com.google.common.collect.Multimap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -49,7 +48,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.IdentityHashMap; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java index fe8d849d097..b70f32de2ae 100644 --- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java +++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/util/ISearchParamRegistry.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Collectors; // TODO: JA remove default methods public interface ISearchParamRegistry { @@ -52,8 +53,6 @@ public interface ISearchParamRegistry { default void forceRefresh() { } - ; - /** * Request that the cache be refreshed at the next convenient time (in a different thread) */ @@ -103,4 +102,5 @@ public interface ISearchParamRegistry { */ @Nullable RuntimeSearchParam getActiveSearchParamByUrl(String theUrl); + } diff --git a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOpTest.java b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOpTest.java index e2a70516e48..312ea1cae2c 100644 --- a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOpTest.java +++ b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleImplOpTest.java @@ -10,6 +10,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -20,7 +21,7 @@ public class RuleImplOpTest { @Test public void testToString() { - new RuleImplOp("").toString(); + assertEquals("RuleImplOp[op=,transactionAppliesToOp=,appliesTo=,appliesToTypes=,classifierCompartmentName=,classifierCompartmentOwners=,classifierType=]", new RuleImplOp("").toString()); } @Test diff --git a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/VerdictTest.java b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/VerdictTest.java index b0d627e0c25..ebff8e05289 100644 --- a/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/VerdictTest.java +++ b/hapi-fhir-server/src/test/java/ca/uhn/fhir/rest/server/interceptor/auth/VerdictTest.java @@ -3,12 +3,14 @@ package ca.uhn.fhir.rest.server.interceptor.auth; import ca.uhn.fhir.rest.server.interceptor.auth.AuthorizationInterceptor.Verdict; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class VerdictTest { @Test public void testToString() { Verdict v = new AuthorizationInterceptor.Verdict(PolicyEnum.ALLOW, new RuleImplOp("foo")); - v.toString(); + assertEquals("AuthorizationInterceptor.Verdict[rule=foo,decision=ALLOW]", v.toString()); } } diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml index 9ecabc2ee01..a58d45d5e6c 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml index 7a106807826..00dee7139df 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir-spring-boot-samples - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT hapi-fhir-spring-boot-sample-client-apache diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml index 7f241b9db41..b8fd7574636 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir-spring-boot-samples - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT hapi-fhir-spring-boot-sample-client-okhttp diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml index 51a42a52f75..558c05424f0 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir-spring-boot-samples - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT hapi-fhir-spring-boot-sample-server-jersey diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml index 838a244678f..6f4bf42ceed 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir-spring-boot - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT hapi-fhir-spring-boot-samples diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml index b131b65f6aa..07d70624b48 100644 --- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml +++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml index a26ee4511aa..dbade0e81d2 100644 --- a/hapi-fhir-spring-boot/pom.xml +++ b/hapi-fhir-spring-boot/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-sql-migrate/pom.xml b/hapi-fhir-sql-migrate/pom.xml index bb763b57317..442d163e596 100644 --- a/hapi-fhir-sql-migrate/pom.xml +++ b/hapi-fhir-sql-migrate/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigrationTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigrationTask.java index c8993985c7a..0f813d9a1d4 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigrationTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigrationTask.java @@ -64,6 +64,11 @@ public class FlywayMigrationTask implements JavaMigration { return false; } + @Override + public boolean isBaselineMigration() { + return false; + } + @Override public boolean canExecuteInTransaction() { return false; diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java index c20cc70d7d0..77e48120a6d 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java @@ -46,6 +46,7 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.ColumnMapRowMapper; +import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Nullable; import javax.sql.DataSource; @@ -234,7 +235,8 @@ public class JdbcUtils { DataSource dataSource = Objects.requireNonNull(theConnectionProperties.getDataSource()); try (Connection connection = dataSource.getConnection()) { - return theConnectionProperties.getTxTemplate().execute(t -> { + TransactionTemplate txTemplate = theConnectionProperties.getTxTemplate(); + return txTemplate.execute(t -> { DatabaseMetaData metadata; try { metadata = connection.getMetaData(); diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java index 4a9a7acee6c..5e5eb40ad49 100644 --- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java +++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/DropIndexTask.java @@ -133,7 +133,7 @@ public class DropIndexTask extends BaseTableTask { */ if (getDriverType() == DriverTypeEnum.H2_EMBEDDED) { - @Language("SQL") String findConstraintSql = "SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.INDEXES WHERE constraint_name = ? AND table_name = ?"; + @Language("SQL") String findConstraintSql = "SELECT DISTINCT constraint_name FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE constraint_name = ? AND table_name = ?"; @Language("SQL") String dropConstraintSql = "ALTER TABLE " + getTableName() + " DROP CONSTRAINT ?"; findAndDropConstraint(findConstraintSql, dropConstraintSql); } else if (getDriverType() == DriverTypeEnum.DERBY_EMBEDDED) { diff --git a/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/SchemaMigratorTest.java b/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/SchemaMigratorTest.java index 2eb015b0535..8a27475208f 100644 --- a/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/SchemaMigratorTest.java +++ b/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/SchemaMigratorTest.java @@ -5,6 +5,7 @@ import ca.uhn.fhir.jpa.migrate.taskdef.AddTableRawSqlTask; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTask; import ca.uhn.fhir.jpa.migrate.taskdef.BaseTest; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import org.flywaydb.core.api.FlywayException; import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; @@ -72,7 +73,9 @@ public class SchemaMigratorTest extends BaseTest { SchemaMigrator schemaMigrator = createSchemaMigrator("SOMETABLE", "create table SOMETABLE (PID bigint not null, TEXTCOL varchar(255))", "2"); schemaMigrator.migrate(); - schemaMigrator = createSchemaMigrator("SOMETABLE", "create table SOMEOTHERTABLE (PID bigint not null, TEXTCOL varchar(255))", "1"); + AddTableRawSqlTask task1 = createAddTableTask("SOMEOTHERTABLE", "create table SOMEOTHERTABLE (PID bigint not null, TEXTCOL varchar(255))", "1"); + AddTableRawSqlTask task2 = createAddTableTask("SOMETABLE", "create table SOMETABLE (PID bigint not null, TEXTCOL varchar(255))", "2"); + schemaMigrator = createSchemaMigrator(task1, task2); schemaMigrator.setStrictOrder(true); try { @@ -147,11 +150,22 @@ public class SchemaMigratorTest extends BaseTest { @Nonnull private SchemaMigrator createSchemaMigrator(String theTableName, String theSql, String theSchemaVersion) { + AddTableRawSqlTask task = createAddTableTask(theTableName, theSql, theSchemaVersion); + return createSchemaMigrator(task); + } + + @Nonnull + private SchemaMigrator createSchemaMigrator(BaseTask... tasks) { + SchemaMigrator retVal = new SchemaMigrator(getUrl(), SchemaMigrator.HAPI_FHIR_MIGRATION_TABLENAME, getDataSource(), new Properties(), Lists.newArrayList(tasks)); + retVal.setDriverType(getDriverType()); + return retVal; + } + + @Nonnull + private AddTableRawSqlTask createAddTableTask(String theTableName, String theSql, String theSchemaVersion) { AddTableRawSqlTask task = new AddTableRawSqlTask("1", theSchemaVersion); task.setTableName(theTableName); task.addSql(getDriverType(), theSql); - SchemaMigrator retval = new SchemaMigrator(getUrl(), SchemaMigrator.HAPI_FHIR_MIGRATION_TABLENAME, getDataSource(), new Properties(), ImmutableList.of(task)); - retval.setDriverType(getDriverType()); - return retval; + return task; } } diff --git a/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTest.java b/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTest.java index f750af7b93d..19001f1dc8b 100644 --- a/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTest.java +++ b/hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/ModifyColumnTest.java @@ -6,6 +6,7 @@ import org.flywaydb.core.internal.command.DbMigrate; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; +import javax.annotation.Nonnull; import java.sql.SQLException; import java.util.function.Supplier; @@ -109,7 +110,7 @@ public class ModifyColumnTest extends BaseTest { executeSql("create table SOMETABLE (PID bigint not null, TEXTCOL varchar(255) not null)"); assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.STRING, 255), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); // PID @@ -134,7 +135,7 @@ public class ModifyColumnTest extends BaseTest { assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.STRING, 255), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); // Make sure additional migrations don't crash @@ -152,7 +153,7 @@ public class ModifyColumnTest extends BaseTest { executeSql("create table SOMETABLE (PID bigint not null, DATECOL timestamp not null)"); assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "DATECOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(ColumnTypeEnum.DATE_TIMESTAMP, JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "DATECOL").getColumnTypeEnum()); getMigrator().setNoColumnShrink(true); @@ -178,7 +179,7 @@ public class ModifyColumnTest extends BaseTest { assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "DATECOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(ColumnTypeEnum.DATE_TIMESTAMP, JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "DATECOL").getColumnTypeEnum()); // Make sure additional migrations don't crash @@ -194,7 +195,7 @@ public class ModifyColumnTest extends BaseTest { executeSql("create table SOMETABLE (PID bigint, TEXTCOL varchar(255))"); assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertTrue(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.STRING, 255), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); // PID @@ -219,7 +220,7 @@ public class ModifyColumnTest extends BaseTest { assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "PID")); assertFalse(JdbcUtils.isColumnNullable(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); - assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); + assertEquals(getLongColumnType(theTestDatabaseDetails), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID")); assertEquals(new JdbcUtils.ColumnType(ColumnTypeEnum.STRING, 255), JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "TEXTCOL")); // Make sure additional migrations don't crash @@ -228,6 +229,19 @@ public class ModifyColumnTest extends BaseTest { } + @SuppressWarnings("EnumSwitchStatementWhichMissesCases") + @Nonnull + private JdbcUtils.ColumnType getLongColumnType(Supplier theTestDatabaseDetails) { + switch (theTestDatabaseDetails.get().getDriverType()) { + case H2_EMBEDDED: + return new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 64); + case DERBY_EMBEDDED: + return new JdbcUtils.ColumnType(ColumnTypeEnum.LONG, 19); + default: + throw new UnsupportedOperationException(); + } + } + @ParameterizedTest(name = "{index}: {0}") @MethodSource("data") public void testColumnDoesntAlreadyExist(Supplier theTestDatabaseDetails) throws SQLException { @@ -306,8 +320,7 @@ public class ModifyColumnTest extends BaseTest { task.setNullable(true); JdbcUtils.ColumnType existingColumnType = JdbcUtils.getColumnType(getConnectionProperties(), "SOMETABLE", "PID"); - assertEquals(ColumnTypeEnum.LONG, existingColumnType.getColumnTypeEnum()); - assertEquals(19L, existingColumnType.getLength().longValue()); + assertEquals(getLongColumnType(theTestDatabaseDetails), existingColumnType); assertTrue(existingColumnType.equals(task.getColumnType(), task.getColumnLength())); } diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml index 78290fec158..41d9b893a90 100644 --- a/hapi-fhir-storage/pom.xml +++ b/hapi-fhir-storage/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java index b0521c2a7b7..a46dd6c21c1 100644 --- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java +++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseStorageDao.java @@ -76,10 +76,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java index 07eca474676..e55a610ac72 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/parser/JsonParserTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java index 18c03b7e24f..19784c26c65 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/InterceptorTest.java @@ -1,6 +1,6 @@ package ca.uhn.fhir.rest.server; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/PagingTest.java b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/PagingTest.java index 0cde8845801..4d0ab382570 100644 --- a/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/PagingTest.java +++ b/hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/PagingTest.java @@ -4,8 +4,8 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml index ff60fd89f7b..1e3a6e3ec7b 100644 --- a/hapi-fhir-structures-dstu2.1/pom.xml +++ b/hapi-fhir-structures-dstu2.1/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java index 3adaa2c9d56..82a4f6a7648 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java +++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2_1Test.java @@ -83,7 +83,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2_1Test.java b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2_1Test.java index 8137f604b77..679a7c33e26 100644 --- a/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2_1Test.java +++ b/hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2_1Test.java @@ -21,7 +21,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -36,6 +35,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -94,7 +94,7 @@ public class ClientServerValidationDstu2_1Test { myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123")); // Conformance only loaded once, then 3 reads - verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class)); + verify(myHttpClient, times(4)).execute(any(HttpUriRequest.class)); } @Test diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index a1b1c3e8834..a820c433a84 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/UriDtTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/UriDtTest.java index 90a6c98056d..87d778a4ce0 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/UriDtTest.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/model/primitive/UriDtTest.java @@ -15,19 +15,19 @@ public class UriDtTest { @Test public void testFromOidNull() { UriDt uri = UriDt.fromOid(null); - assertEquals(null, uri.getValue()); + assertNull(uri.getValue()); } @Test public void testEqualsObject() { UriDt dt = new UriDt("http://example.com/foo"); - assertTrue(dt.equals(dt)); + assertEquals(dt, dt); assertFalse(dt.equals(null)); - assertFalse(dt.equals(new UriDt())); - assertTrue(dt.equals(new UriDt("http://example.com/foo"))); - assertTrue(dt.equals(new UriDt("http://example.com/foo/"))); - assertFalse(dt.equals(new UriDt("http://blah.com/foo/"))); - assertFalse(dt.equals(new StringDt("http://example.com/foo"))); + assertNotEquals(dt, new UriDt()); + assertEquals(dt, new UriDt("http://example.com/foo")); + assertEquals(dt, new UriDt("http://example.com/foo/")); + assertNotEquals(dt, new UriDt("http://blah.com/foo/")); + assertNotEquals(dt, new StringDt("http://example.com/foo")); } @Test @@ -50,7 +50,7 @@ public class UriDtTest { public void testSetInvalid() { UriDt dt = new UriDt(); dt.setValue("blah : // AA"); - dt.hashCode(); + assertEquals(-1078724630, dt.hashCode()); } } diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2Test.java index efc06ba529f..600aa9e3b5e 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2Test.java @@ -67,6 +67,7 @@ import org.mockito.internal.stubbing.answers.ThrowsException; import org.slf4j.LoggerFactory; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -2093,7 +2094,7 @@ public class JsonParserDstu2Test { Patient p = parser.parseResource(Patient.class, input); ArgumentCaptor capt = ArgumentCaptor.forClass(String.class); - verify(peh, times(0)).unknownElement(Mockito.isNull(IParseLocation.class), capt.capture()); + verify(peh, times(0)).unknownElement(Mockito.isNull(), capt.capture()); assertEquals("Smith", p.getName().get(0).getGiven().get(0).getValue()); assertExtensionMetadata(p, "fhir-request-method", false, StringDt.class, "POST"); @@ -2104,7 +2105,7 @@ public class JsonParserDstu2Test { @Test public void testParseWithWrongTypeObjectShouldBeArray() throws Exception { - String input = IOUtils.toString(getClass().getResourceAsStream("/invalid_metadata.json")); + String input = IOUtils.toString(getClass().getResourceAsStream("/invalid_metadata.json"), StandardCharsets.UTF_8); try { ourCtx.newJsonParser().parseResource(Conformance.class, input); fail(); diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientMockingTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientMockingTest.java index 222e4dd2ea0..e1027f115f8 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientMockingTest.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientMockingTest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2Test.java index 64fe0540563..4328bd21fed 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu2Test.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -32,6 +31,7 @@ import org.mockito.stubbing.Answer; import java.io.InputStream; import java.io.StringReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -41,6 +41,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -223,7 +224,7 @@ public class ClientServerValidationDstu2Test { myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123")); // Conformance only loaded once, then 3 reads - verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class)); + verify(myHttpClient, times(4)).execute(any(HttpUriRequest.class)); } @Test @@ -263,7 +264,7 @@ public class ClientServerValidationDstu2Test { myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123")); // Conformance only loaded once, then 3 reads - verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class)); + verify(myHttpClient, times(4)).execute(any(HttpUriRequest.class)); } @Test @@ -278,7 +279,7 @@ public class ClientServerValidationDstu2Test { when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java index afa5206c61f..1f57b2a167d 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/RestfulClientFactoryDstu2Test.java @@ -23,7 +23,7 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ServerActionInterceptorTest.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ServerActionInterceptorTest.java index cb6e14e8ebe..1ee99c467b2 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ServerActionInterceptorTest.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ServerActionInterceptorTest.java @@ -46,8 +46,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml index 680b9b8850b..925ca6564c0 100644 --- a/hapi-fhir-structures-dstu3/pom.xml +++ b/hapi-fhir-structures-dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java index ae7f018f50f..5672b7c87cc 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/XmlParserDstu3Test.java @@ -120,7 +120,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.times; diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu3Test.java index 99fb3f6a337..4325149dcee 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationDstu3Test.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -29,6 +29,7 @@ import org.mockito.stubbing.Answer; import java.io.InputStream; import java.io.StringReader; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -94,7 +95,7 @@ public class ClientServerValidationDstu3Test { myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123")); // Conformance only loaded once, then 3 reads - verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class)); + verify(myHttpClient, times(4)).execute(ArgumentMatchers.any(HttpUriRequest.class)); } @Test @@ -109,7 +110,7 @@ public class ClientServerValidationDstu3Test { when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML_NEW + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8"))); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java index 9efad04ab1a..a69235ea2e3 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/InterceptorDstu3Test.java @@ -189,7 +189,6 @@ public class InterceptorDstu3Test { doAnswer(t->{ RestOperationTypeEnum type = (RestOperationTypeEnum) t.getArguments()[0]; ActionRequestDetails det = (ActionRequestDetails) t.getArguments()[1]; - type.toString(); return null; }).when(myInterceptor1).incomingRequestPreHandled(any(), any()); diff --git a/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/model/CodesystemsDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/model/CodesystemsDstu3Test.java index 91d60e48785..f30698224ee 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/model/CodesystemsDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/model/CodesystemsDstu3Test.java @@ -1,35 +1,13 @@ package org.hl7.fhir.dstu3.model; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.either; -import static org.hamcrest.Matchers.endsWith; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.*; - -import org.apache.commons.lang3.time.FastDateFormat; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.*; import static org.hamcrest.MatcherAssert.assertThat; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.model.api.TemporalPrecisionEnum; -import ca.uhn.fhir.parser.DataFormatException; -import ca.uhn.fhir.util.TestUtil; -import ca.uhn.fhir.validation.ValidationResult; public class CodesystemsDstu3Test { @Test public void testCodesystemsPresent() { - org.hl7.fhir.dstu3.model.codesystems.XdsRelationshipType.class.toString(); + assertNotNull(org.hl7.fhir.dstu3.model.codesystems.XdsRelationshipType.class.toString()); } } diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml index 2a6bdb1aa8b..21c4ac5ab9f 100644 --- a/hapi-fhir-structures-hl7org-dstu2/pom.xml +++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestHl7OrgDstu2.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestHl7OrgDstu2.java index 4e10ccc2f44..ac50090c348 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestHl7OrgDstu2.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestHl7OrgDstu2.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -94,7 +94,7 @@ public class ClientServerValidationTestHl7OrgDstu2 { myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123")); // Conformance only loaded once, then 3 reads - verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class)); + verify(myHttpClient, times(4)).execute(ArgumentMatchers.any(HttpUriRequest.class)); } @Test diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml index 343def30fcc..c986d0bf967 100644 --- a/hapi-fhir-structures-r4/pom.xml +++ b/hapi-fhir-structures-r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/GenericClientR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/GenericClientR4Test.java index 1eb1a5caf74..cd55bdd9e74 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/GenericClientR4Test.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/client/GenericClientR4Test.java @@ -7,52 +7,72 @@ import ca.uhn.fhir.model.primitive.StringDt; import ca.uhn.fhir.parser.CustomTypeR4Test; import ca.uhn.fhir.parser.CustomTypeR4Test.MyCustomPatient; import ca.uhn.fhir.parser.IParser; +import ca.uhn.fhir.rest.api.CacheControlDirective; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.api.DeleteCascadeModeEnum; import ca.uhn.fhir.rest.api.EncodingEnum; import ca.uhn.fhir.rest.api.MethodOutcome; import ca.uhn.fhir.rest.api.PreferReturnEnum; +import ca.uhn.fhir.rest.api.SearchStyleEnum; import ca.uhn.fhir.rest.api.SortOrderEnum; import ca.uhn.fhir.rest.api.SortSpec; import ca.uhn.fhir.rest.client.api.IGenericClient; import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException; import ca.uhn.fhir.rest.client.exceptions.NonFhirResponseException; +import ca.uhn.fhir.rest.client.impl.GenericClient; import ca.uhn.fhir.rest.client.interceptor.CookieInterceptor; import ca.uhn.fhir.rest.client.interceptor.UserInfoInterceptor; import ca.uhn.fhir.rest.param.DateParam; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.rest.param.ParamPrefixEnum; import ca.uhn.fhir.rest.param.StringParam; +import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; +import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.NotImplementedOperationException; import ca.uhn.fhir.rest.server.exceptions.UnclassifiedServerFailureException; import ca.uhn.fhir.util.BundleBuilder; +import ca.uhn.fhir.util.BundleUtil; import ca.uhn.fhir.util.UrlUtil; import com.google.common.base.Charsets; import com.helger.commons.io.stream.StringInputStream; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.ReaderInputStream; +import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; import org.apache.http.ProtocolVersion; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicStatusLine; +import org.hamcrest.Matchers; +import org.hamcrest.core.StringContains; import org.hl7.fhir.instance.model.api.IBaseBundle; +import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IPrimitiveType; import org.hl7.fhir.r4.model.Binary; import org.hl7.fhir.r4.model.BooleanType; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.Bundle.BundleType; import org.hl7.fhir.r4.model.CapabilityStatement; +import org.hl7.fhir.r4.model.Coding; import org.hl7.fhir.r4.model.Device; import org.hl7.fhir.r4.model.Encounter; import org.hl7.fhir.r4.model.EpisodeOfCare; import org.hl7.fhir.r4.model.IdType; +import org.hl7.fhir.r4.model.InstantType; +import org.hl7.fhir.r4.model.MessageHeader; import org.hl7.fhir.r4.model.Observation; import org.hl7.fhir.r4.model.OperationOutcome; +import org.hl7.fhir.r4.model.Organization; import org.hl7.fhir.r4.model.Parameters; import org.hl7.fhir.r4.model.Patient; +import org.hl7.fhir.r4.model.Provenance; +import org.hl7.fhir.r4.model.StringType; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; @@ -81,6 +101,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.when; @@ -1526,301 +1547,6 @@ public class GenericClientR4Test extends BaseGenericClientR4Test { } - @Test - public void testSearchByDate() throws Exception { - ArgumentCaptor capt = prepareClientForSearchResponse(); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - int idx = 0; - - DateTimeDt now = DateTimeDt.withCurrentTime(); - String dateString = now.getValueAsString().substring(0, 10); - - DateTimeDt nowWithMillis = new DateTimeDt(new Date(), TemporalPrecisionEnum.MILLI, TimeZone.getDefault()); - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().day(dateString)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().day(now.getValue())) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.afterOrEquals().day(dateString)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=ge" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.before().day(dateString)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=lt" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.beforeOrEquals().day(dateString)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=le" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.exactly().day(dateString)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=" + dateString, capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().second("2011-01-02T22:33:01Z")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt2011-01-02T22:33:01Z", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().second(now.getValueAsString())) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt" + now.getValueAsString(), UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().millis("2011-01-02T22:33:01.123Z")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt2011-01-02T22:33:01.123Z", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().millis(nowWithMillis.getValue())) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=gt" + nowWithMillis.getValueAsString(), UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.BIRTHDATE.after().now()) - .returnBundle(Bundle.class) - .execute(); - - assertThat(capt.getAllValues().get(idx).getURI().toString(), startsWith("http://example.com/fhir/Patient?birthdate=gt2")); - dateString = UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString()).substring(44); - ourLog.info(dateString); - assertEquals(TemporalPrecisionEnum.SECOND, new DateTimeDt(dateString).getPrecision()); - idx++; - } - - @Test - public void testSearchByQuantity() throws Exception { - ArgumentCaptor capt = prepareClientForSearchResponse(); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - int idx = 0; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.approximately().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Observation?value-quantity=ap123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.approximately().number("123").andUnits("CODE")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Observation?value-quantity=ap123||CODE", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.approximately().number("123").andUnits("SYSTEM", "CODE")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=ap123|SYSTEM|CODE", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.exactly().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.exactly().number("123").andUnits("CODE")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=123||CODE", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.exactly().number("123").andUnits("SYSTEM", "CODE")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=123|SYSTEM|CODE", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.greaterThan().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=gt123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.lessThan().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=lt123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.greaterThanOrEquals().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=ge123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.lessThanOrEquals().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=le123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Observation") - .where(Observation.VALUE_QUANTITY.withPrefix(ParamPrefixEnum.GREATERTHAN).number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Observation?value-quantity=gt123||", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - } - - @Test - public void testSearchByString() throws Exception { - ArgumentCaptor capt = prepareClientForSearchResponse(); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - int idx = 0; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value("AAA")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=AAA", capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value(new StringDt("AAA"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=AAA", capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matches().values("AAA", "BBB")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=AAA,BBB", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matches().values(Arrays.asList("AAA", "BBB"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=AAA,BBB", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matchesExactly().value("AAA")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name%3Aexact=AAA", capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matchesExactly().value(new StringDt("AAA"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name%3Aexact=AAA", capt.getAllValues().get(idx).getURI().toString()); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matchesExactly().values("AAA", "BBB")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name:exact=AAA,BBB", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - client.search() - .forResource("Patient") - .where(Patient.NAME.matchesExactly().values(Arrays.asList("AAA", "BBB"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name:exact=AAA,BBB", UrlUtil.unescape(capt.getAllValues().get(idx).getURI().toString())); - idx++; - - } - @Test public void testSearchByUrl() throws Exception { ArgumentCaptor capt = prepareClientForSearchResponse(); @@ -2490,4 +2216,1750 @@ public class GenericClientR4Test extends BaseGenericClientR4Test { } + @SuppressWarnings("unused") + @Test + public void testCacheControlNoStore() throws Exception { + + String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Observation.class) + .returnBundle(Bundle.class) + .cacheControl(new CacheControlDirective().setNoStore(true)) + .execute(); + + assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); + assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); + assertEquals("no-store", capt.getValue().getHeaders("Cache-Control")[0].getValue()); + } + + @SuppressWarnings("unused") + @Test + public void testCacheControlNoStoreMaxResults() throws Exception { + + String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Observation.class) + .returnBundle(Bundle.class) + .cacheControl(new CacheControlDirective().setNoStore(true).setMaxResults(100)) + .execute(); + + assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); + assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); + assertEquals("no-store, max-results=100", capt.getValue().getHeaders("Cache-Control")[0].getValue()); + } + + @SuppressWarnings("unused") + @Test + public void testCacheControlNoStoreNoCache() throws Exception { + + String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Observation.class) + .returnBundle(Bundle.class) + .cacheControl(new CacheControlDirective().setNoStore(true).setNoCache(true)) + .execute(); + + assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); + assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); + assertEquals("no-cache, no-store", capt.getValue().getHeaders("Cache-Control")[0].getValue()); + } + + private Patient createPatientP1() { + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("foo:bar").setValue("12345"); + p1.addName().setFamily("Smith").addGiven("John"); + return p1; + } + + + @Test + public void testCreatePopulatesIsCreated() throws Exception { + + Patient p1 = createPatientP1(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + MethodOutcome resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); + assertTrue(resp.getCreated()); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); + assertNull(resp.getCreated()); + + ourLog.info("lastRequest: {}", ((GenericClient) client).getLastRequest()); + ourLog.info("lastResponse: {}", ((GenericClient) client).getLastResponse()); + ourLog.info("lastResponseBody: {}", ((GenericClient) client).getLastResponseBody()); + } + + private Bundle createTransactionBundleInput() { + Bundle input = new Bundle(); + input.setType(BundleType.TRANSACTION); + input + .addEntry() + .setResource(createPatientP1()) + .getRequest() + .setMethod(Bundle.HTTPVerb.POST); + return input; + } + + private Bundle createTransactionBundleOutput() { + Bundle output = new Bundle(); + output.setType(BundleType.TRANSACTIONRESPONSE); + output + .addEntry() + .setResource(createPatientP1()) + .getResponse() + .setLocation(createPatientP1().getId()); + return output; + } + + private String extractBody(ArgumentCaptor capt, int count) throws IOException { + String body = IOUtils.toString(((HttpEntityEnclosingRequestBase) capt.getAllValues().get(count)).getEntity().getContent(), StandardCharsets.UTF_8); + return body; + } + + private String getResourceResult() { + String msg = + "" + + "
John Cardinal: 444333333
" + + "" + + "" + + "" + + "" + + "" + + "
" + + ""; + return msg; + } + + @Test + public void testCreateWithStringAutoDetectsEncoding() throws Exception { + + Patient p1 = createPatientP1(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int count = 0; + client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("value=\"John\"")); + count++; + + String resourceAsString = ourCtx.newJsonParser().encodeResourceToString(p1); + client + .create() + .resource(resourceAsString) + .execute(); + + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("[\"John\"]")); + count++; + + /* + * e.g. Now try with reversed encoding (provide a string that's in JSON and ask the client to use XML) + */ + + client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).encodedJson().execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("[\"John\"]")); + count++; + + client.create().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).encodedXml().execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("value=\"John\"")); + + } + + @Test + public void testCreateWithTag() throws Exception { + + Patient p1 = createPatientP1(); + p1.getMeta().addTag("http://hl7.org/fhir/tag", "urn:happytag", "This is a happy resource"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + MethodOutcome outcome = client.create().resource(p1).withAdditionalHeader("myHeaderName", "myHeaderValue").execute(); + assertEquals("44", outcome.getId().getIdPart()); + assertEquals("22", outcome.getId().getVersionIdPart()); + + int count = 0; + + assertEquals("http://example.com/fhir/Patient", capt.getValue().getURI().toString()); + assertEquals("POST", capt.getValue().getMethod()); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + count++; + + /* + * Try fluent options + */ + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + client.create().resource(p1).execute(); + assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(1).getURI().toString()); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + count++; + + String resourceText = " "; + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + client.create().resource(resourceText).execute(); + assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(2).getURI().toString()); + assertEquals(resourceText, IOUtils.toString(((HttpPost) capt.getAllValues().get(2)).getEntity().getContent())); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + count++; + } + + @Test + public void testCreateWithTagNonFluent() throws Exception { + + Patient p1 = createPatientP1(); + p1.getMeta().addTag("http://hl7.org/fhir/tag", "urn:happytag", "This is a happy resource"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + MethodOutcome outcome = client.create().resource(p1).execute(); + assertEquals("44", outcome.getId().getIdPart()); + assertEquals("22", outcome.getId().getVersionIdPart()); + + assertEquals("http://example.com/fhir/Patient", capt.getValue().getURI().toString()); + assertEquals("POST", capt.getValue().getMethod()); + Header catH = capt.getValue().getFirstHeader("Category"); + assertNull(catH); + } + + /** + * Test for issue #60 + */ + @Test + public void testCreateWithUtf8Characters() throws Exception { + String name = "測試醫院"; + Organization org = new Organization(); + org.setName(name); + org.addIdentifier().setSystem("urn:system").setValue("testCreateWithUtf8Characters_01"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int count = 0; + client.create().resource(org).prettyPrint().encodedXml().execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("")); + count++; + + } + + @Test + public void testDelete() throws Exception { + OperationOutcome oo = new OperationOutcome(); + oo.addIssue().addLocation("testDelete01"); + String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ooStr), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + MethodOutcome outcome = client + .delete() + .resourceById("Patient", "123") + .withAdditionalHeader("myHeaderName", "myHeaderValue") + .execute(); + + oo = (OperationOutcome) outcome.getOperationOutcome(); + assertEquals("http://example.com/fhir/Patient/123", capt.getValue().getURI().toString()); + assertEquals("DELETE", capt.getValue().getMethod()); + assertEquals("testDelete01", oo.getIssueFirstRep().getLocation().get(0).getValue()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + + } + + + @Test + public void testDeleteInvalidResponse() throws Exception { + OperationOutcome oo = new OperationOutcome(); + oo.addIssue().addLocation("testDelete01"); + String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("LKJHLKJGLKJKLL"), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + // Try with invalid response + try { + client + .delete() + .resourceById(new IdType("Location", "123", "456")) + .prettyPrint() + .encodedJson() + .execute(); + } catch (FhirClientConnectionException e) { + assertEquals(500, e.getStatusCode()); + assertThat(e.getMessage(), containsString("Failed to parse response from server when performing DELETE to URL")); + } + + } + + + @Test + public void testDeleteNoResponse() throws Exception { + OperationOutcome oo = new OperationOutcome(); + oo.addIssue().addLocation("testDelete01"); + String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ooStr), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + MethodOutcome outcome = client + .delete() + .resourceById("Patient", "123") + .withAdditionalHeader("myHeaderName", "myHeaderValue") + .execute(); + + oo = (OperationOutcome) outcome.getOperationOutcome(); + assertEquals("http://example.com/fhir/Patient/123", capt.getValue().getURI().toString()); + assertEquals("DELETE", capt.getValue().getMethod()); + assertEquals("testDelete01", oo.getIssueFirstRep().getLocation().get(0).getValue()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + + } + + + @Test + public void testHistory() throws Exception { + + final String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(t -> + new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int idx = 0; + Bundle response; + + response = client + .history() + .onServer() + .returnBundle(Bundle.class) + .withAdditionalHeader("myHeaderName", "myHeaderValue") + .execute(); + assertEquals("http://example.com/fhir/_history", capt.getAllValues().get(idx).getURI().toString()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + assertEquals(1, response.getEntry().size()); + idx++; + + response = client + .history() + .onType(Patient.class) + .returnBundle(Bundle.class) + .withAdditionalHeader("myHeaderName", "myHeaderValue1") + .withAdditionalHeader("myHeaderName", "myHeaderValue2") + .execute(); + assertEquals("http://example.com/fhir/Patient/_history", capt.getAllValues().get(idx).getURI().toString()); + assertEquals(1, response.getEntry().size()); + assertEquals("myHeaderValue1", capt.getValue().getHeaders("myHeaderName")[0].getValue()); + assertEquals("myHeaderValue2", capt.getValue().getHeaders("myHeaderName")[1].getValue()); + idx++; + + response = client + .history() + .onInstance(new IdType("Patient", "123")) + .andReturnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient/123/_history", capt.getAllValues().get(idx).getURI().toString()); + assertEquals(1, response.getEntry().size()); + idx++; + } + + @Test + @Disabled + public void testInvalidCalls() { + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + try { + client.meta(); + fail(); + } catch (IllegalStateException e) { + assertEquals("Can not call $meta operations on a DSTU1 client", e.getMessage()); + } + try { + client.operation(); + fail(); + } catch (IllegalStateException e) { + assertEquals("Operations are only supported in FHIR DSTU2 and later. This client was created using a context configured for DSTU1", e.getMessage()); + } + } + + @Test + public void testLoadPageAndReturnDstu1Bundle() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); + client + .loadPage() + .byUrl("http://example.com/page1") + .andReturnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/page1", capt.getValue().getURI().toString()); + } + + @Test + public void testMissing() throws Exception { + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { + @Override + public InputStream answer(InvocationOnMock theInvocation) throws Throwable { + return (new ReaderInputStream(new StringReader(getPatientFeedWithOneResult()), StandardCharsets.UTF_8)); + } + }); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + + client.search().forResource("Patient").where(Patient.NAME.isMissing(true)).returnBundle(Bundle.class).execute(); + assertEquals("http://example.com/fhir/Patient?name%3Amissing=true", capt.getValue().getRequestLine().getUri()); + + client.search().forResource("Patient").where(Patient.NAME.isMissing(false)).returnBundle(Bundle.class).execute(); + assertEquals("http://example.com/fhir/Patient?name%3Amissing=false", capt.getValue().getRequestLine().getUri()); + } + + @Test + public void testProcessMessage() throws IOException { + Bundle respBundle = new Bundle(); + respBundle.setType(BundleType.MESSAGE); + String respString = ourCtx.newJsonParser().encodeResourceToString(respBundle); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(respString), StandardCharsets.UTF_8)); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[0]); + + Bundle bundle = new Bundle(); + bundle.setType(BundleType.MESSAGE); + + Parameters parameters = new Parameters(); + parameters.addParameter() + .setName("content") + .setResource(bundle); + + int count = 0; + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + client.operation().onType(MessageHeader.class).named("$process-message").withParameters(parameters).execute(); + + assertEquals("http://example.com/fhir/MessageHeader/$process-message", capt.getAllValues().get(count).getURI().toString()); + String requestContent = IOUtils.toString(((HttpPost) capt.getAllValues().get(count)).getEntity().getContent(), Charsets.UTF_8); + assertThat(requestContent, containsString("{\"resourceType\":\"Parameters\"")); + count++; + } + + @Test + public void testRead() throws Exception { + + String msg = getResourceResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + Header[] headers = new Header[]{ + new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), + new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + }; + when(myHttpResponse.getAllHeaders()).thenReturn(headers); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Patient response = client + .read() + .resource(Patient.class) + .withId(new IdType("Patient/1234")) + .execute(); + + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + + assertEquals("http://foo.com/Patient/123/_history/2333", response.getIdElement().getValue()); + + InstantType lm = response.getMeta().getLastUpdatedElement(); + lm.setTimeZoneZulu(true); + assertEquals("1995-11-15T04:58:08.000Z", lm.getValueAsString()); + + } + + @Test + public void testReadFluent() throws Exception { + + String msg = getResourceResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + Header[] headers = new Header[]{ + new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), + new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + }; + when(myHttpResponse.getAllHeaders()).thenReturn(headers); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int count = 0; + + Patient response = client.read().resource(Patient.class).withId(new IdType("Patient/1234")).execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://example.com/fhir/Patient/1234", capt.getAllValues().get(count++).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = (Patient) client.read().resource("Patient").withId("1234").execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://example.com/fhir/Patient/1234", capt.getAllValues().get(count++).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = (Patient) client.read().resource("Patient").withId(567L).execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://example.com/fhir/Patient/567", capt.getAllValues().get(count++).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client.read().resource(Patient.class).withIdAndVersion("1234", "22").execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://example.com/fhir/Patient/1234/_history/22", capt.getAllValues().get(count++).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client.read().resource(Patient.class).withUrl("http://foo/Patient/22").execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://foo/Patient/22", capt.getAllValues().get(count++).getURI().toString()); + + } + + @Test + public void testReadWithAbsoluteUrl() throws Exception { + + String msg = getResourceResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + Header[] headers = new Header[]{new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), + new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + }; + when(myHttpResponse.getAllHeaders()).thenReturn(headers); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Patient response = client + .read() + .resource(Patient.class) + .withUrl(new IdType("http://somebase.com/path/to/base/Patient/1234")) + .execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://somebase.com/path/to/base/Patient/1234", capt.getAllValues().get(0).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client + .read() + .resource(Patient.class) + .withUrl(new IdType("http://somebase.com/path/to/base/Patient/1234/_history/222")) + .execute(); + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://somebase.com/path/to/base/Patient/1234/_history/222", capt.getAllValues().get(1).getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchAllResources() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forAllResources() + .where(Patient.NAME.matches().value("james")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/?name=james", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchAutomaticallyUsesPost() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + String longValue = StringUtils.leftPad("", 20000, 'B'); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().value(longValue)) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient/_search", capt.getValue().getURI().toString()); + + HttpEntityEnclosingRequestBase enc = (HttpEntityEnclosingRequestBase) capt.getValue(); + UrlEncodedFormEntity ent = (UrlEncodedFormEntity) enc.getEntity(); + String string = IOUtils.toString(ent.getContent()); + ourLog.info(string); + assertEquals("name=" + longValue, string); + } + + @Test + public void testSearchByCompartment() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); + Bundle response = client + .search() + .forResource(Patient.class) + .withIdAndCompartment("123", "fooCompartment") + .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://foo/Patient/123/fooCompartment?birthdate=ge2011-01-02", capt.getValue().getURI().toString()); + + ourLog.info(ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(response)); + + assertEquals("PRP1660", BundleUtil.toListOfResourcesOfType(ourCtx, response, Patient.class).get(0).getIdentifier().get(0).getValue()); + + try { + client + .search() + .forResource(Patient.class) + .withIdAndCompartment("", "fooCompartment") + .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) + .returnBundle(Bundle.class) + .execute(); + fail(); + } catch (InvalidRequestException e) { + assertThat(e.toString(), containsString("null or empty for compartment")); + } + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByComposite() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); + + Bundle response = client.search() + .forResource("Observation") + .where(Observation.CODE_VALUE_DATE + .withLeft(Observation.CODE.exactly().code("FOO$BAR")) + .withRight(Observation.VALUE_DATE.exactly().day("2001-01-01"))) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://foo/Observation?" + Observation.SP_CODE_VALUE_DATE + "=" + UrlUtil.escapeUrlParam("FOO\\$BAR$2001-01-01"), capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByDate() throws Exception { + + final String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { + @Override + public InputStream answer(InvocationOnMock theInvocation) throws Throwable { + return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); + } + }); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + int idx = 0; + + @SuppressWarnings("deprecation") + Bundle response = client.search() + .forResource(Patient.class) + .encodedJson() + .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22")) + .and(Patient.BIRTHDATE.after().day("2011-01-01")) + .include(Patient.INCLUDE_ORGANIZATION) + .sort().ascending(Patient.BIRTHDATE) + .sort().descending(Patient.NAME) + .sort().defaultOrder(Patient.ADDRESS) + .count(123) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort=birthdate%2C-name%2Caddress&_count=123&_format=json", + capt.getAllValues().get(idx++).getURI().toString()); + + response = client.search() + .forResource(Patient.class) + .encodedJson() + .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22")) + .and(Patient.BIRTHDATE.after().day("2011-01-01")) + .include(Patient.INCLUDE_ORGANIZATION) + .sort().ascending(Patient.BIRTHDATE) + .sort().descending(Patient.NAME) + .sort().defaultOrder(Patient.ADDRESS) + .count(123) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort=birthdate%2C-name%2Caddress&_count=123&_format=json", + capt.getAllValues().get(idx++).getURI().toString()); + + response = client.search() + .forResource(Patient.class) + .encodedJson() + .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22").orAfter().day("2020-01-01")) + .and(Patient.BIRTHDATE.after().day("2011-01-01")) + .returnBundle(Bundle.class) + .execute(); + + String comma = "%2C"; + assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22" + comma + "gt2020-01-01&birthdate=gt2011-01-01&_format=json", capt.getAllValues().get(idx++).getURI().toString()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchByNumberExact() throws Exception { + + String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Observation.class) + .where(Observation.VALUE_QUANTITY.greaterThan().number(123).andUnits("foo", "bar")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Observation?value-quantity=gt123%7Cfoo%7Cbar", capt.getValue().getURI().toString()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchByProfile() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .withProfile("http://1") + .withProfile("http://2") + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?_profile=http%3A%2F%2F1&_profile=http%3A%2F%2F2", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByQuantity() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .where(Encounter.LENGTH.exactly().number(123).andNoUnits()) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?length=123%7C%7C", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByReferenceProperty() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .where(Patient.GENERAL_PRACTITIONER.hasChainedProperty(Organization.NAME.matches().value("ORG0"))) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?general-practitioner.name=ORG0", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByReferenceSimple() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.GENERAL_PRACTITIONER.hasId("123")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?general-practitioner=123", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchBySecurity() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .withSecurity("urn:foo", "123") + .withSecurity("urn:bar", "456") + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?_security=urn%3Afoo%7C123&_security=urn%3Abar%7C456", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByString() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().value("james")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?name=james", capt.getValue().getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().values("AAA", "BBB", "C,C")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?name=" + UrlUtil.escapeUrlParam("AAA,BBB,C\\,C"), capt.getAllValues().get(1).getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByStringContains() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(t -> new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.contains().value("FOO")) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString()); + + response = client.search() + .forResource("Patient") + .where(Patient.NAME.contains().values("FOO", "BAR")) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString()); + + response = client.search() + .forResource("Patient") + .where(Patient.NAME.contains().values(Arrays.asList("FOO", "BAR"))) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString()); + + response = client.search() + .forResource("Patient") + .where(Patient.NAME.contains().value(new StringType("FOO"))) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchByStringExact() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matchesExactly().value("james")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?name%3Aexact=james", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByTag() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .withTag("urn:foo", "123") + .withTag("urn:bar", "456") + .withAdditionalHeader("myHeaderName", "myHeaderValue") + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?_tag=urn%3Afoo%7C123&_tag=urn%3Abar%7C456", capt.getValue().getURI().toString()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchByToken() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("http://example.com/fhir", "ZZZ")) + .withAdditionalHeader("myHeaderName", "myHeaderValue") + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?identifier=http%3A%2F%2Fexample.com%2Ffhir%7CZZZ", capt.getValue().getURI().toString()); + assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().code("ZZZ")) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?identifier=ZZZ", capt.getAllValues().get(1).getURI().toString()); + + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().codings(new Coding("A", "B", "ZZZ"), new Coding("C", "D", "ZZZ"))) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?identifier=" + UrlUtil.escapeUrlParam("A|B,C|D"), capt.getAllValues().get(2).getURI().toString()); + + } + + /** + * Test for #192 + */ + @SuppressWarnings("unused") + @Test + public void testSearchByTokenWithEscaping() throws Exception { + final String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { + @Override + public InputStream answer(InvocationOnMock theInvocation) throws Throwable { + return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); + } + }); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); + int index = 0; + String wantPrefix = "http://foo/Patient?identifier="; + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("1", "2")) + .returnBundle(Bundle.class) + .execute(); + String wantValue = "1|2"; + String url = capt.getAllValues().get(index).getURI().toString(); + assertThat(url, Matchers.startsWith(wantPrefix)); + assertEquals(wantValue, UrlUtil.unescape(url.substring(wantPrefix.length()))); + assertEquals(UrlUtil.escapeUrlParam(wantValue), url.substring(wantPrefix.length())); + index++; + + response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("1,2", "3,4")) + .returnBundle(Bundle.class) + .execute(); + wantValue = "1\\,2|3\\,4"; + url = capt.getAllValues().get(index).getURI().toString(); + assertThat(url, Matchers.startsWith(wantPrefix)); + assertEquals(wantValue, UrlUtil.unescape(url.substring(wantPrefix.length()))); + assertEquals(UrlUtil.escapeUrlParam(wantValue), url.substring(wantPrefix.length())); + index++; + } + + @SuppressWarnings("unused") + @Test + public void testSearchByTokenWithSystemAndNoCode() throws Exception { + + final String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { + @Override + public InputStream answer(InvocationOnMock theInvocation) throws Throwable { + return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); + } + }); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int idx = 0; + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.hasSystemWithAnyCode("urn:foo")) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); + + response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:foo", null)) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); + + response = client.search() + .forResource("Patient") + .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:foo", "")) + .returnBundle(Bundle.class) + .execute(); + assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchIncludeRecursive() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .include(Patient.INCLUDE_ORGANIZATION) + .include(Patient.INCLUDE_LINK.asRecursive()) + .include(IBaseResource.INCLUDE_ALL.asNonRecursive()) + .returnBundle(Bundle.class) + .execute(); + + assertThat(capt.getValue().getURI().toString(), containsString("http://example.com/fhir/Patient?")); + assertThat(capt.getValue().getURI().toString(), containsString("_include=" + UrlUtil.escapeUrlParam(Patient.INCLUDE_ORGANIZATION.getValue()))); + assertThat(capt.getValue().getURI().toString(), containsString("_include%3Aiterate=" + UrlUtil.escapeUrlParam(Patient.INCLUDE_LINK.getValue()))); + assertThat(capt.getValue().getURI().toString(), containsString("_include=*")); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchUsingGetSearch() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().value("james")) + .usingStyle(SearchStyleEnum.GET_WITH_SEARCH) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient/_search?name=james", capt.getValue().getURI().toString()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchUsingPost() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().value("james")) + .usingStyle(SearchStyleEnum.POST) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient/_search", capt.getValue().getURI().toString()); + + HttpEntityEnclosingRequestBase enc = (HttpEntityEnclosingRequestBase) capt.getValue(); + UrlEncodedFormEntity ent = (UrlEncodedFormEntity) enc.getEntity(); + String string = IOUtils.toString(ent.getContent()); + ourLog.info(string); + assertEquals("name=james", string); + } + + @Test + public void testSearchWithAbsoluteUrl() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client + .search() + .byUrl("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort%3Aasc=birthdate&_sort%3Adesc=name&_count=123&_format=json") + .returnBundle(Bundle.class) + .execute(); + + assertEquals(1, response.getEntry().size()); + } + + @SuppressWarnings("unused") + @Test + public void testSearchWithClientEncodingAndPrettyPrintConfig() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + client.setPrettyPrint(true); + client.setEncoding(EncodingEnum.JSON); + + Bundle response = client.search() + .forResource(Patient.class) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?_format=json&_pretty=true", capt.getValue().getURI().toString()); + + } + + @SuppressWarnings("unused") + @Test + public void testSearchWithEscapedParameters() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource("Patient") + .where(Patient.NAME.matches().values("NE,NE", "NE,NE")) + .where(Patient.NAME.matchesExactly().values("E$E")) + .where(Patient.NAME.matches().values("NE\\NE")) + .where(Patient.NAME.matchesExactly().values("E|E")) + .returnBundle(Bundle.class) + .execute(); + + assertThat(capt.getValue().getURI().toString(), containsString("%3A")); + assertEquals("http://example.com/fhir/Patient?name=NE\\,NE,NE\\,NE&name=NE\\\\NE&name:exact=E\\$E&name:exact=E\\|E", UrlUtil.unescape(capt.getValue().getURI().toString())); + } + + @SuppressWarnings("unused") + @Test + public void testSearchWithInternalServerError() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 500, "INTERNAL ERRORS")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_TEXT + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("Server Issues!"), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + try { + client + .search() + .forResource(Patient.class) + .returnBundle(Bundle.class) + .execute(); + fail(); + } catch (InternalErrorException e) { + assertEquals(e.getMessage(), "HTTP 500 INTERNAL ERRORS: Server Issues!"); + assertEquals(e.getResponseBody(), "Server Issues!"); + } + + } + + @SuppressWarnings("unused") + @Test + public void testSearchWithNonFhirResponse() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_TEXT + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("Server Issues!"), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + try { + client.search().forResource(Patient.class).returnBundle(Bundle.class).execute(); + fail(); + } catch (NonFhirResponseException e) { + assertThat(e.getMessage(), StringContains.containsString("Server Issues!")); + } + + } + + @SuppressWarnings("unused") + @Test + public void testSearchWithReverseInclude() throws Exception { + + String msg = getPatientFeedWithOneResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.search() + .forResource(Patient.class) + .encodedJson() + .revInclude(Provenance.INCLUDE_TARGET) + .returnBundle(Bundle.class) + .execute(); + + assertEquals("http://example.com/fhir/Patient?_revinclude=Provenance%3Atarget&_format=json", capt.getValue().getURI().toString()); + + } + + @Test + public void testSetDefaultEncoding() throws Exception { + + String msg = ourCtx.newJsonParser().encodeResourceToString(new Patient()); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + // Header[] headers = new Header[] { new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 + // GMT"), + // new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + // new BasicHeader(Constants.HEADER_CATEGORY, "http://foo/tagdefinition.html; scheme=\"http://hl7.org/fhir/tag\"; + // label=\"Some tag\"") }; + // when(myHttpResponse.getAllHeaders()).thenReturn(headers); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + (client).setEncoding(EncodingEnum.JSON); + int count = 0; + + client + .read() + .resource(Patient.class) + .withId(new IdType("Patient/1234")) + .execute(); + assertEquals("http://example.com/fhir/Patient/1234?_format=json", capt.getAllValues().get(count).getURI().toString()); + count++; + + } + + @Test + public void testTransactionJson() throws Exception { + Bundle input = createTransactionBundleInput(); + Bundle output = createTransactionBundleOutput(); + + String msg = ourCtx.newJsonParser().encodeResourceToString(output); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.transaction() + .withBundle(input) + .execute(); + + assertEquals("http://example.com/fhir", capt.getValue().getURI().toString()); + assertEquals(input.getEntry().get(0).getResource().getId(), response.getEntry().get(0).getResource().getId()); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(0).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + + } + + @Test + public void testTransactionXml() throws Exception { + Bundle input = createTransactionBundleInput(); + Bundle output = createTransactionBundleOutput(); + + String msg = ourCtx.newXmlParser().encodeResourceToString(output); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Bundle response = client.transaction() + .withBundle(input) + .encodedXml() + .execute(); + + assertEquals("http://example.com/fhir", capt.getValue().getURI().toString()); + assertEquals(input.getEntry().get(0).getResource().getId(), response.getEntry().get(0).getResource().getId()); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(0).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + + } + + @Test + public void testUpdate() throws Exception { + + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("foo:bar").setValue("12345"); + p1.addName().setFamily("Smith").addGiven("John"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + try { + client.update().resource(p1).execute(); + fail(); + } catch (InvalidRequestException e) { + // should happen because no ID set + } + + assertEquals(0, capt.getAllValues().size()); + + p1.setId("44"); + client.update().resource(p1).execute(); + + int count = 0; + + assertEquals(1, capt.getAllValues().size()); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + count++; + + MethodOutcome outcome = client.update().resource(p1).execute(); + assertEquals("44", outcome.getId().getIdPart()); + assertEquals("22", outcome.getId().getVersionIdPart()); + + assertEquals(2, capt.getAllValues().size()); + + assertEquals("http://example.com/fhir/Patient/44", capt.getValue().getURI().toString()); + assertEquals("PUT", capt.getValue().getMethod()); + + /* + * Try fluent options + */ + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + client.update().resource(p1).withId("123").execute(); + assertEquals(3, capt.getAllValues().size()); + assertEquals("http://example.com/fhir/Patient/123", capt.getAllValues().get(2).getURI().toString()); + + String resourceText = " "; + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + client.update().resource(resourceText).withId("123").execute(); + assertEquals("http://example.com/fhir/Patient/123", capt.getAllValues().get(3).getURI().toString()); + assertEquals(resourceText, IOUtils.toString(((HttpPut) capt.getAllValues().get(3)).getEntity().getContent())); + assertEquals(4, capt.getAllValues().size()); + + } + + @Test + public void testUpdateWithStringAutoDetectsEncoding() throws Exception { + + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("foo:bar").setValue("12345"); + p1.addName().setFamily("Smith").addGiven("John"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + int count = 0; + client.update().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).withId("1").execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("value=\"John\"")); + count++; + + client.update().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).withId("1").execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("[\"John\"]")); + count++; + + /* + * e.g. Now try with reversed encoding (provide a string that's in JSON and ask the client to use XML) + */ + + client.update().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).withId("1").encodedJson().execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("[\"John\"]")); + count++; + + client.update().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).withId("1").encodedXml().execute(); + assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); + assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); + assertThat(extractBody(capt, count), containsString("value=\"John\"")); + count++; + } + + @Test + public void testVReadWithAbsoluteUrl() throws Exception { + + String msg = getResourceResult(); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); + Header[] headers = new Header[]{ + new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), + new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), + }; + when(myHttpResponse.getAllHeaders()).thenReturn(headers); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Patient response = client + .read() + .resource(Patient.class) + .withUrl("http://somebase.com/path/to/base/Patient/1234/_history/2222") + .execute(); + + assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); + assertEquals("http://somebase.com/path/to/base/Patient/1234/_history/2222", capt.getAllValues().get(0).getURI().toString()); + + } + + @Test + public void testValidateNonFluent() throws Exception { + + OperationOutcome oo = new OperationOutcome(); + oo.addIssue().setDiagnostics("OOOK"); + + ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); + when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); + when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{}); + when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); + when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ourCtx.newXmlParser().encodeResourceToString(oo)), StandardCharsets.UTF_8)); + when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); + + IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); + + Patient p1 = new Patient(); + p1.addIdentifier().setSystem("foo:bar").setValue("12345"); + p1.addName().setFamily("Smith").addGiven("John"); + + MethodOutcome resp = client.validate(p1); + assertEquals("http://example.com/fhir/Patient/$validate", capt.getValue().getURI().toString()); + oo = (OperationOutcome) resp.getOperationOutcome(); + assertEquals("OOOK", oo.getIssueFirstRep().getDiagnostics()); + + } + + private String getPatientFeedWithOneResult() { + + Bundle retVal = new Bundle(); + + Patient p = new Patient(); + p.addName().setFamily("Cardinal").addGiven("John"); + p.addIdentifier().setValue("PRP1660"); + retVal.addEntry().setResource(p); + + return ourCtx.newXmlParser().encodeResourceToString(retVal); + } + + + + + } diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/SearchBundleProviderWithNoSizeR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/SearchBundleProviderWithNoSizeR4Test.java index ffebab8c3a6..ce16156d178 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/SearchBundleProviderWithNoSizeR4Test.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/SearchBundleProviderWithNoSizeR4Test.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionPropertiesTest.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionPropertiesTest.java index dc99ae2796e..d9883538bf2 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionPropertiesTest.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/exceptions/ExceptionPropertiesTest.java @@ -71,7 +71,7 @@ public class ExceptionPropertiesTest { continue; } if (next == ResourceVersionNotSpecifiedException.class) { - // This one is deprocated + // This one is deprecated continue; } @@ -82,7 +82,7 @@ public class ExceptionPropertiesTest { } try { - next.getConstructor(String.class, IBaseOperationOutcome.class); + assertNotNull(next.getConstructor(String.class, IBaseOperationOutcome.class)); } catch (NoSuchMethodException e) { fail(classInfo.getBeanClassName() + " has no constructor with params: (String, IBaseOperationOutcome)"); } diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml index b1e41476a9c..25c993e98eb 100644 --- a/hapi-fhir-structures-r5/pom.xml +++ b/hapi-fhir-structures-r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java index 7c95f3f01e1..5684e3148b1 100644 --- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java +++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java @@ -32,6 +32,7 @@ import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.model.ValueSet.ConceptSetComponent; import org.hl7.fhir.r5.terminologies.ValueSetExpander; import org.hl7.fhir.r5.utils.validation.IResourceValidator; +import org.hl7.fhir.r5.utils.validation.ValidationContextCarrier; import org.hl7.fhir.utilities.TimeTracker; import org.hl7.fhir.utilities.TranslationServices; import org.hl7.fhir.utilities.i18n.I18nBase; @@ -182,6 +183,11 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext return validateCode(theOptions, system, null, code, display, theVs); } + @Override + public ValidationResult validateCode(ValidationOptions options, Coding code, ValueSet vs, ValidationContextCarrier ctxt) { + return validateCode(options, code, vs); + } + @Override public void validateCodeBatch(ValidationOptions options, List codes, ValueSet vs) { throw new UnsupportedOperationException(); @@ -391,6 +397,11 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext return retVal; } + @Override + public T fetchResource(Class theClass, String theUri, String theVersion) { + return fetchResource(theClass, theUri + "|" + theVersion); + } + @Override public T fetchResource(Class class_, String uri, CanonicalResource canonicalForSource) { throw new UnsupportedOperationException(); diff --git a/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties b/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties index 60504148fb5..4a3dcd85424 100644 --- a/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties +++ b/hapi-fhir-structures-r5/src/main/resources/org/hl7/fhir/r5/model/fhirversion.properties @@ -1,5 +1,5 @@ # This file contains version definitions -# Generated: 2021-05-18T15:08:03.074-04:00 +# Generated: 2021-12-24T12:43:01.954-05:00 resource.Account=org.hl7.fhir.r5.model.Account resource.ActivityDefinition=org.hl7.fhir.r5.model.ActivityDefinition @@ -8,6 +8,7 @@ resource.AdverseEvent=org.hl7.fhir.r5.model.AdverseEvent resource.AllergyIntolerance=org.hl7.fhir.r5.model.AllergyIntolerance resource.Appointment=org.hl7.fhir.r5.model.Appointment resource.AppointmentResponse=org.hl7.fhir.r5.model.AppointmentResponse +resource.ArtifactAssessment=org.hl7.fhir.r5.model.ArtifactAssessment resource.AuditEvent=org.hl7.fhir.r5.model.AuditEvent resource.Basic=org.hl7.fhir.r5.model.Basic resource.Binary=org.hl7.fhir.r5.model.Binary @@ -18,13 +19,13 @@ resource.CapabilityStatement=org.hl7.fhir.r5.model.CapabilityStatement resource.CapabilityStatement2=org.hl7.fhir.r5.model.CapabilityStatement2 resource.CarePlan=org.hl7.fhir.r5.model.CarePlan resource.CareTeam=org.hl7.fhir.r5.model.CareTeam -resource.CatalogEntry=org.hl7.fhir.r5.model.CatalogEntry resource.ChargeItem=org.hl7.fhir.r5.model.ChargeItem resource.ChargeItemDefinition=org.hl7.fhir.r5.model.ChargeItemDefinition resource.Citation=org.hl7.fhir.r5.model.Citation resource.Claim=org.hl7.fhir.r5.model.Claim resource.ClaimResponse=org.hl7.fhir.r5.model.ClaimResponse resource.ClinicalImpression=org.hl7.fhir.r5.model.ClinicalImpression +resource.ClinicalUseDefinition=org.hl7.fhir.r5.model.ClinicalUseDefinition resource.ClinicalUseIssue=org.hl7.fhir.r5.model.ClinicalUseIssue resource.CodeSystem=org.hl7.fhir.r5.model.CodeSystem resource.Communication=org.hl7.fhir.r5.model.Communication @@ -32,6 +33,7 @@ resource.CommunicationRequest=org.hl7.fhir.r5.model.CommunicationRequest resource.CompartmentDefinition=org.hl7.fhir.r5.model.CompartmentDefinition resource.Composition=org.hl7.fhir.r5.model.Composition resource.ConceptMap=org.hl7.fhir.r5.model.ConceptMap +resource.ConceptMap2=org.hl7.fhir.r5.model.ConceptMap2 resource.Condition=org.hl7.fhir.r5.model.Condition resource.ConditionDefinition=org.hl7.fhir.r5.model.ConditionDefinition resource.Consent=org.hl7.fhir.r5.model.Consent @@ -42,6 +44,7 @@ resource.CoverageEligibilityResponse=org.hl7.fhir.r5.model.CoverageEligibilityRe resource.DetectedIssue=org.hl7.fhir.r5.model.DetectedIssue resource.Device=org.hl7.fhir.r5.model.Device resource.DeviceDefinition=org.hl7.fhir.r5.model.DeviceDefinition +resource.DeviceDispense=org.hl7.fhir.r5.model.DeviceDispense resource.DeviceMetric=org.hl7.fhir.r5.model.DeviceMetric resource.DeviceRequest=org.hl7.fhir.r5.model.DeviceRequest resource.DeviceUsage=org.hl7.fhir.r5.model.DeviceUsage @@ -66,6 +69,7 @@ resource.GraphDefinition=org.hl7.fhir.r5.model.GraphDefinition resource.Group=org.hl7.fhir.r5.model.Group resource.GuidanceResponse=org.hl7.fhir.r5.model.GuidanceResponse resource.HealthcareService=org.hl7.fhir.r5.model.HealthcareService +resource.ImagingSelection=org.hl7.fhir.r5.model.ImagingSelection resource.ImagingStudy=org.hl7.fhir.r5.model.ImagingStudy resource.Immunization=org.hl7.fhir.r5.model.Immunization resource.ImmunizationEvaluation=org.hl7.fhir.r5.model.ImmunizationEvaluation diff --git a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java b/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java deleted file mode 100644 index 1ca272afb96..00000000000 --- a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/client/GenericClientTest.java +++ /dev/null @@ -1,1849 +0,0 @@ -package ca.uhn.fhir.rest.client; - -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.rest.api.CacheControlDirective; -import ca.uhn.fhir.rest.api.Constants; -import ca.uhn.fhir.rest.api.EncodingEnum; -import ca.uhn.fhir.rest.api.MethodOutcome; -import ca.uhn.fhir.rest.api.SearchStyleEnum; -import ca.uhn.fhir.rest.client.api.IGenericClient; -import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum; -import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException; -import ca.uhn.fhir.rest.client.exceptions.NonFhirResponseException; -import ca.uhn.fhir.rest.client.impl.BaseClient; -import ca.uhn.fhir.rest.client.impl.GenericClient; -import ca.uhn.fhir.rest.server.exceptions.InternalErrorException; -import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; -import ca.uhn.fhir.util.BundleUtil; -import ca.uhn.fhir.util.TestUtil; -import ca.uhn.fhir.util.UrlUtil; -import com.google.common.base.Charsets; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.input.ReaderInputStream; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.Header; -import org.apache.http.HttpResponse; -import org.apache.http.ProtocolVersion; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.message.BasicHeader; -import org.apache.http.message.BasicStatusLine; -import org.hamcrest.Matchers; -import org.hamcrest.core.StringContains; -import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.r5.model.Bundle; -import org.hl7.fhir.r5.model.Bundle.BundleType; -import org.hl7.fhir.r5.model.Bundle.HTTPVerb; -import org.hl7.fhir.r5.model.Coding; -import org.hl7.fhir.r5.model.Encounter; -import org.hl7.fhir.r5.model.IdType; -import org.hl7.fhir.r5.model.InstantType; -import org.hl7.fhir.r5.model.MessageHeader; -import org.hl7.fhir.r5.model.Observation; -import org.hl7.fhir.r5.model.OperationOutcome; -import org.hl7.fhir.r5.model.Organization; -import org.hl7.fhir.r5.model.Parameters; -import org.hl7.fhir.r5.model.Patient; -import org.hl7.fhir.r5.model.Provenance; -import org.hl7.fhir.r5.model.StringType; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - -import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class GenericClientTest { - - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(GenericClientTest.class); - private static FhirContext ourCtx; - private HttpClient myHttpClient; - - private HttpResponse myHttpResponse; - - @BeforeEach - public void before() { - - myHttpClient = mock(HttpClient.class, new ReturnsDeepStubs()); - ourCtx.getRestfulClientFactory().setHttpClient(myHttpClient); - ourCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER); - - myHttpResponse = mock(HttpResponse.class, new ReturnsDeepStubs()); - - System.setProperty(BaseClient.HAPI_CLIENT_KEEPRESPONSES, "true"); - } - - private Patient createPatientP1() { - Patient p1 = new Patient(); - p1.addIdentifier().setSystem("foo:bar").setValue("12345"); - p1.addName().setFamily("Smith").addGiven("John"); - return p1; - } - - private Bundle createTransactionBundleInput() { - Bundle input = new Bundle(); - input.setType(BundleType.TRANSACTION); - input - .addEntry() - .setResource(createPatientP1()) - .getRequest() - .setMethod(HTTPVerb.POST); - return input; - } - - private Bundle createTransactionBundleOutput() { - Bundle output = new Bundle(); - output.setType(BundleType.TRANSACTIONRESPONSE); - output - .addEntry() - .setResource(createPatientP1()) - .getResponse() - .setLocation(createPatientP1().getId()); - return output; - } - - private String extractBody(ArgumentCaptor capt, int count) throws IOException { - String body = IOUtils.toString(((HttpEntityEnclosingRequestBase) capt.getAllValues().get(count)).getEntity().getContent(), StandardCharsets.UTF_8); - return body; - } - - private String getResourceResult() { - String msg = - "" - + "
John Cardinal: 444333333
" - + "" - + "" - + "" - + "" - + "" - + "
" - + ""; - return msg; - } - - @SuppressWarnings("unused") - @Test - public void testCacheControlNoStore() throws Exception { - - String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Observation.class) - .returnBundle(Bundle.class) - .cacheControl(new CacheControlDirective().setNoStore(true)) - .execute(); - - assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); - assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); - assertEquals("no-store", capt.getValue().getHeaders("Cache-Control")[0].getValue()); - } - - @SuppressWarnings("unused") - @Test - public void testCacheControlNoStoreMaxResults() throws Exception { - - String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Observation.class) - .returnBundle(Bundle.class) - .cacheControl(new CacheControlDirective().setNoStore(true).setMaxResults(100)) - .execute(); - - assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); - assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); - assertEquals("no-store, max-results=100", capt.getValue().getHeaders("Cache-Control")[0].getValue()); - } - - @SuppressWarnings("unused") - @Test - public void testCacheControlNoStoreNoCache() throws Exception { - - String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Observation.class) - .returnBundle(Bundle.class) - .cacheControl(new CacheControlDirective().setNoStore(true).setNoCache(true)) - .execute(); - - assertEquals("http://example.com/fhir/Observation", capt.getValue().getURI().toString()); - assertEquals(1, capt.getValue().getHeaders("Cache-Control").length); - assertEquals("no-cache, no-store", capt.getValue().getHeaders("Cache-Control")[0].getValue()); - } - - @Test - public void testCreatePopulatesIsCreated() throws Exception { - - Patient p1 = createPatientP1(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - MethodOutcome resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); - assertTrue(resp.getCreated()); - - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - resp = client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); - assertNull(resp.getCreated()); - - ourLog.info("lastRequest: {}", ((GenericClient) client).getLastRequest()); - ourLog.info("lastResponse: {}", ((GenericClient) client).getLastResponse()); - ourLog.info("lastResponseBody: {}", ((GenericClient) client).getLastResponseBody()); - } - - @Test - public void testCreateWithStringAutoDetectsEncoding() throws Exception { - - Patient p1 = createPatientP1(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int count = 0; - client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("value=\"John\"")); - count++; - - String resourceAsString = ourCtx.newJsonParser().encodeResourceToString(p1); - client - .create() - .resource(resourceAsString) - .execute(); - - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("[\"John\"]")); - count++; - - /* - * e.g. Now try with reversed encoding (provide a string that's in JSON and ask the client to use XML) - */ - - client.create().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).encodedJson().execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("[\"John\"]")); - count++; - - client.create().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).encodedXml().execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("value=\"John\"")); - - } - - @Test - public void testCreateWithTag() throws Exception { - - Patient p1 = createPatientP1(); - p1.getMeta().addTag("http://hl7.org/fhir/tag", "urn:happytag", "This is a happy resource"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - MethodOutcome outcome = client.create().resource(p1).withAdditionalHeader("myHeaderName", "myHeaderValue").execute(); - assertEquals("44", outcome.getId().getIdPart()); - assertEquals("22", outcome.getId().getVersionIdPart()); - - int count = 0; - - assertEquals("http://example.com/fhir/Patient", capt.getValue().getURI().toString()); - assertEquals("POST", capt.getValue().getMethod()); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - count++; - - /* - * Try fluent options - */ - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - client.create().resource(p1).execute(); - assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(1).getURI().toString()); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - count++; - - String resourceText = " "; - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - client.create().resource(resourceText).execute(); - assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(2).getURI().toString()); - assertEquals(resourceText, IOUtils.toString(((HttpPost) capt.getAllValues().get(2)).getEntity().getContent())); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - count++; - } - - @Test - public void testCreateWithTagNonFluent() throws Exception { - - Patient p1 = createPatientP1(); - p1.getMeta().addTag("http://hl7.org/fhir/tag", "urn:happytag", "This is a happy resource"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - MethodOutcome outcome = client.create().resource(p1).execute(); - assertEquals("44", outcome.getId().getIdPart()); - assertEquals("22", outcome.getId().getVersionIdPart()); - - assertEquals("http://example.com/fhir/Patient", capt.getValue().getURI().toString()); - assertEquals("POST", capt.getValue().getMethod()); - Header catH = capt.getValue().getFirstHeader("Category"); - assertNull(catH); - } - - /** - * Test for issue #60 - */ - @Test - public void testCreateWithUtf8Characters() throws Exception { - String name = "測試醫院"; - Organization org = new Organization(); - org.setName(name); - org.addIdentifier().setSystem("urn:system").setValue("testCreateWithUtf8Characters_01"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int count = 0; - client.create().resource(org).prettyPrint().encodedXml().execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("")); - count++; - - } - - @Test - public void testDelete() throws Exception { - OperationOutcome oo = new OperationOutcome(); - oo.addIssue().addLocation("testDelete01"); - String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ooStr), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - MethodOutcome outcome = client - .delete() - .resourceById("Patient", "123") - .withAdditionalHeader("myHeaderName", "myHeaderValue") - .execute(); - - oo = (OperationOutcome) outcome.getOperationOutcome(); - assertEquals("http://example.com/fhir/Patient/123", capt.getValue().getURI().toString()); - assertEquals("DELETE", capt.getValue().getMethod()); - assertEquals("testDelete01", oo.getIssueFirstRep().getLocation().get(0).getValue()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - - } - - - @Test - public void testDeleteInvalidResponse() throws Exception { - OperationOutcome oo = new OperationOutcome(); - oo.addIssue().addLocation("testDelete01"); - String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("LKJHLKJGLKJKLL"), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - // Try with invalid response - try { - client - .delete() - .resourceById(new IdType("Location", "123", "456")) - .prettyPrint() - .encodedJson() - .execute(); - } catch (FhirClientConnectionException e) { - assertEquals(500, e.getStatusCode()); - assertThat(e.getMessage(), containsString("Failed to parse response from server when performing DELETE to URL")); - } - - } - - - @Test - public void testDeleteNoResponse() throws Exception { - OperationOutcome oo = new OperationOutcome(); - oo.addIssue().addLocation("testDelete01"); - String ooStr = ourCtx.newXmlParser().encodeResourceToString(oo); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ooStr), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - MethodOutcome outcome = client - .delete() - .resourceById("Patient", "123") - .withAdditionalHeader("myHeaderName", "myHeaderValue") - .execute(); - - oo = (OperationOutcome) outcome.getOperationOutcome(); - assertEquals("http://example.com/fhir/Patient/123", capt.getValue().getURI().toString()); - assertEquals("DELETE", capt.getValue().getMethod()); - assertEquals("testDelete01", oo.getIssueFirstRep().getLocation().get(0).getValue()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - - } - - - @Test - public void testHistory() throws Exception { - - final String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(t -> - new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int idx = 0; - Bundle response; - - response = client - .history() - .onServer() - .returnBundle(Bundle.class) - .withAdditionalHeader("myHeaderName", "myHeaderValue") - .execute(); - assertEquals("http://example.com/fhir/_history", capt.getAllValues().get(idx).getURI().toString()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - assertEquals(1, response.getEntry().size()); - idx++; - - response = client - .history() - .onType(Patient.class) - .returnBundle(Bundle.class) - .withAdditionalHeader("myHeaderName", "myHeaderValue1") - .withAdditionalHeader("myHeaderName", "myHeaderValue2") - .execute(); - assertEquals("http://example.com/fhir/Patient/_history", capt.getAllValues().get(idx).getURI().toString()); - assertEquals(1, response.getEntry().size()); - assertEquals("myHeaderValue1", capt.getValue().getHeaders("myHeaderName")[0].getValue()); - assertEquals("myHeaderValue2", capt.getValue().getHeaders("myHeaderName")[1].getValue()); - idx++; - - response = client - .history() - .onInstance(new IdType("Patient", "123")) - .andReturnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient/123/_history", capt.getAllValues().get(idx).getURI().toString()); - assertEquals(1, response.getEntry().size()); - idx++; - } - - @Test - @Disabled - public void testInvalidCalls() { - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - try { - client.meta(); - fail(); - } catch (IllegalStateException e) { - assertEquals("Can not call $meta operations on a DSTU1 client", e.getMessage()); - } - try { - client.operation(); - fail(); - } catch (IllegalStateException e) { - assertEquals("Operations are only supported in FHIR DSTU2 and later. This client was created using a context configured for DSTU1", e.getMessage()); - } - } - - @Test - public void testLoadPageAndReturnDstu1Bundle() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); - client - .loadPage() - .byUrl("http://example.com/page1") - .andReturnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/page1", capt.getValue().getURI().toString()); - } - - @Test - public void testMissing() throws Exception { - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { - @Override - public InputStream answer(InvocationOnMock theInvocation) throws Throwable { - return (new ReaderInputStream(new StringReader(getPatientFeedWithOneResult()), StandardCharsets.UTF_8)); - } - }); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - - client.search().forResource("Patient").where(Patient.NAME.isMissing(true)).returnBundle(Bundle.class).execute(); - assertEquals("http://example.com/fhir/Patient?name%3Amissing=true", capt.getValue().getRequestLine().getUri()); - - client.search().forResource("Patient").where(Patient.NAME.isMissing(false)).returnBundle(Bundle.class).execute(); - assertEquals("http://example.com/fhir/Patient?name%3Amissing=false", capt.getValue().getRequestLine().getUri()); - } - - @Test - public void testProcessMessage() throws IOException { - Bundle respBundle = new Bundle(); - respBundle.setType(BundleType.MESSAGE); - String respString = ourCtx.newJsonParser().encodeResourceToString(respBundle); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(respString), StandardCharsets.UTF_8)); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[0]); - - Bundle bundle = new Bundle(); - bundle.setType(BundleType.MESSAGE); - - Parameters parameters = new Parameters(); - parameters.addParameter() - .setName("content") - .setResource(bundle); - - int count = 0; - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - client.operation().onType(MessageHeader.class).named("$process-message").withParameters(parameters).execute(); - - assertEquals("http://example.com/fhir/MessageHeader/$process-message", capt.getAllValues().get(count).getURI().toString()); - String requestContent = IOUtils.toString(((HttpPost) capt.getAllValues().get(count)).getEntity().getContent(), Charsets.UTF_8); - assertThat(requestContent, containsString("{\"resourceType\":\"Parameters\"")); - count++; - } - - @Test - public void testRead() throws Exception { - - String msg = getResourceResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - Header[] headers = new Header[]{ - new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), - new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - }; - when(myHttpResponse.getAllHeaders()).thenReturn(headers); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Patient response = client - .read() - .resource(Patient.class) - .withId(new IdType("Patient/1234")) - .execute(); - - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - - assertEquals("http://foo.com/Patient/123/_history/2333", response.getIdElement().getValue()); - - InstantType lm = response.getMeta().getLastUpdatedElement(); - lm.setTimeZoneZulu(true); - assertEquals("1995-11-15T04:58:08.000Z", lm.getValueAsString()); - - } - - @Test - public void testReadFluent() throws Exception { - - String msg = getResourceResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - Header[] headers = new Header[]{ - new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), - new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - }; - when(myHttpResponse.getAllHeaders()).thenReturn(headers); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int count = 0; - - Patient response = client.read().resource(Patient.class).withId(new IdType("Patient/1234")).execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://example.com/fhir/Patient/1234", capt.getAllValues().get(count++).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = (Patient) client.read().resource("Patient").withId("1234").execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://example.com/fhir/Patient/1234", capt.getAllValues().get(count++).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = (Patient) client.read().resource("Patient").withId(567L).execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://example.com/fhir/Patient/567", capt.getAllValues().get(count++).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client.read().resource(Patient.class).withIdAndVersion("1234", "22").execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://example.com/fhir/Patient/1234/_history/22", capt.getAllValues().get(count++).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client.read().resource(Patient.class).withUrl("http://foo/Patient/22").execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://foo/Patient/22", capt.getAllValues().get(count++).getURI().toString()); - - } - - @Test - public void testReadWithAbsoluteUrl() throws Exception { - - String msg = getResourceResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - Header[] headers = new Header[]{new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), - new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - }; - when(myHttpResponse.getAllHeaders()).thenReturn(headers); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Patient response = client - .read() - .resource(Patient.class) - .withUrl(new IdType("http://somebase.com/path/to/base/Patient/1234")) - .execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://somebase.com/path/to/base/Patient/1234", capt.getAllValues().get(0).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client - .read() - .resource(Patient.class) - .withUrl(new IdType("http://somebase.com/path/to/base/Patient/1234/_history/222")) - .execute(); - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://somebase.com/path/to/base/Patient/1234/_history/222", capt.getAllValues().get(1).getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchAllResources() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forAllResources() - .where(Patient.NAME.matches().value("james")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/?name=james", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchAutomaticallyUsesPost() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - String longValue = StringUtils.leftPad("", 20000, 'B'); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value(longValue)) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient/_search", capt.getValue().getURI().toString()); - - HttpEntityEnclosingRequestBase enc = (HttpEntityEnclosingRequestBase) capt.getValue(); - UrlEncodedFormEntity ent = (UrlEncodedFormEntity) enc.getEntity(); - String string = IOUtils.toString(ent.getContent()); - ourLog.info(string); - assertEquals("name=" + longValue, string); - } - - @Test - public void testSearchByCompartment() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); - Bundle response = client - .search() - .forResource(Patient.class) - .withIdAndCompartment("123", "fooCompartment") - .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://foo/Patient/123/fooCompartment?birthdate=ge2011-01-02", capt.getValue().getURI().toString()); - - ourLog.info(ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(response)); - - assertEquals("PRP1660", BundleUtil.toListOfResourcesOfType(ourCtx, response, Patient.class).get(0).getIdentifier().get(0).getValue()); - - try { - client - .search() - .forResource(Patient.class) - .withIdAndCompartment("", "fooCompartment") - .where(Patient.BIRTHDATE.afterOrEquals().day("2011-01-02")) - .returnBundle(Bundle.class) - .execute(); - fail(); - } catch (InvalidRequestException e) { - assertThat(e.toString(), containsString("null or empty for compartment")); - } - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByComposite() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); - - Bundle response = client.search() - .forResource("Observation") - .where(Observation.CODE_VALUE_DATE - .withLeft(Observation.CODE.exactly().code("FOO$BAR")) - .withRight(Observation.VALUE_DATE.exactly().day("2001-01-01"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://foo/Observation?" + Observation.SP_CODE_VALUE_DATE + "=" + UrlUtil.escapeUrlParam("FOO\\$BAR$2001-01-01"), capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByDate() throws Exception { - - final String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { - @Override - public InputStream answer(InvocationOnMock theInvocation) throws Throwable { - return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); - } - }); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - int idx = 0; - - @SuppressWarnings("deprecation") - Bundle response = client.search() - .forResource(Patient.class) - .encodedJson() - .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22")) - .and(Patient.BIRTHDATE.after().day("2011-01-01")) - .include(Patient.INCLUDE_ORGANIZATION) - .sort().ascending(Patient.BIRTHDATE) - .sort().descending(Patient.NAME) - .sort().defaultOrder(Patient.ADDRESS) - .count(123) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort=birthdate%2C-name%2Caddress&_count=123&_format=json", - capt.getAllValues().get(idx++).getURI().toString()); - - response = client.search() - .forResource(Patient.class) - .encodedJson() - .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22")) - .and(Patient.BIRTHDATE.after().day("2011-01-01")) - .include(Patient.INCLUDE_ORGANIZATION) - .sort().ascending(Patient.BIRTHDATE) - .sort().descending(Patient.NAME) - .sort().defaultOrder(Patient.ADDRESS) - .count(123) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort=birthdate%2C-name%2Caddress&_count=123&_format=json", - capt.getAllValues().get(idx++).getURI().toString()); - - response = client.search() - .forResource(Patient.class) - .encodedJson() - .where(Patient.BIRTHDATE.beforeOrEquals().day("2012-01-22").orAfter().day("2020-01-01")) - .and(Patient.BIRTHDATE.after().day("2011-01-01")) - .returnBundle(Bundle.class) - .execute(); - - String comma = "%2C"; - assertEquals("http://example.com/fhir/Patient?birthdate=le2012-01-22" + comma + "gt2020-01-01&birthdate=gt2011-01-01&_format=json", capt.getAllValues().get(idx++).getURI().toString()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchByNumberExact() throws Exception { - - String msg = ourCtx.newXmlParser().encodeResourceToString(new Bundle()); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Observation.class) - .where(Observation.VALUE_QUANTITY.greaterThan().number(123).andUnits("foo", "bar")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Observation?value-quantity=gt123%7Cfoo%7Cbar", capt.getValue().getURI().toString()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchByProfile() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .withProfile("http://1") - .withProfile("http://2") - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?_profile=http%3A%2F%2F1&_profile=http%3A%2F%2F2", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByQuantity() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .where(Encounter.LENGTH.exactly().number(123).andNoUnits()) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?length=123%7C%7C", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByReferenceProperty() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .where(Patient.GENERAL_PRACTITIONER.hasChainedProperty(Organization.NAME.matches().value("ORG0"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?general-practitioner.name=ORG0", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByReferenceSimple() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.GENERAL_PRACTITIONER.hasId("123")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?general-practitioner=123", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchBySecurity() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .withSecurity("urn:foo", "123") - .withSecurity("urn:bar", "456") - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?_security=urn%3Afoo%7C123&_security=urn%3Abar%7C456", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByString() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value("james")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=james", capt.getValue().getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().values("AAA", "BBB", "C,C")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name=" + UrlUtil.escapeUrlParam("AAA,BBB,C\\,C"), capt.getAllValues().get(1).getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByStringContains() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(t -> new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.contains().value("FOO")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString()); - - response = client.search() - .forResource("Patient") - .where(Patient.NAME.contains().values("FOO", "BAR")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString()); - - response = client.search() - .forResource("Patient") - .where(Patient.NAME.contains().values(Arrays.asList("FOO", "BAR"))) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO%2CBAR", capt.getValue().getURI().toString()); - - response = client.search() - .forResource("Patient") - .where(Patient.NAME.contains().value(new StringType("FOO"))) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?name%3Acontains=FOO", capt.getValue().getURI().toString()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchByStringExact() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matchesExactly().value("james")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?name%3Aexact=james", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByTag() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .withTag("urn:foo", "123") - .withTag("urn:bar", "456") - .withAdditionalHeader("myHeaderName", "myHeaderValue") - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?_tag=urn%3Afoo%7C123&_tag=urn%3Abar%7C456", capt.getValue().getURI().toString()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchByToken() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndCode("http://example.com/fhir", "ZZZ")) - .withAdditionalHeader("myHeaderName", "myHeaderValue") - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?identifier=http%3A%2F%2Fexample.com%2Ffhir%7CZZZ", capt.getValue().getURI().toString()); - assertEquals("myHeaderValue", capt.getValue().getFirstHeader("myHeaderName").getValue()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().code("ZZZ")) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?identifier=ZZZ", capt.getAllValues().get(1).getURI().toString()); - - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().codings(new Coding("A", "B", "ZZZ"), new Coding("C", "D", "ZZZ"))) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?identifier=" + UrlUtil.escapeUrlParam("A|B,C|D"), capt.getAllValues().get(2).getURI().toString()); - - } - - /** - * Test for #192 - */ - @SuppressWarnings("unused") - @Test - public void testSearchByTokenWithEscaping() throws Exception { - final String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { - @Override - public InputStream answer(InvocationOnMock theInvocation) throws Throwable { - return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); - } - }); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://foo"); - int index = 0; - String wantPrefix = "http://foo/Patient?identifier="; - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndCode("1", "2")) - .returnBundle(Bundle.class) - .execute(); - String wantValue = "1|2"; - String url = capt.getAllValues().get(index).getURI().toString(); - assertThat(url, Matchers.startsWith(wantPrefix)); - assertEquals(wantValue, UrlUtil.unescape(url.substring(wantPrefix.length()))); - assertEquals(UrlUtil.escapeUrlParam(wantValue), url.substring(wantPrefix.length())); - index++; - - response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndCode("1,2", "3,4")) - .returnBundle(Bundle.class) - .execute(); - wantValue = "1\\,2|3\\,4"; - url = capt.getAllValues().get(index).getURI().toString(); - assertThat(url, Matchers.startsWith(wantPrefix)); - assertEquals(wantValue, UrlUtil.unescape(url.substring(wantPrefix.length()))); - assertEquals(UrlUtil.escapeUrlParam(wantValue), url.substring(wantPrefix.length())); - index++; - } - - @SuppressWarnings("unused") - @Test - public void testSearchByTokenWithSystemAndNoCode() throws Exception { - - final String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer() { - @Override - public InputStream answer(InvocationOnMock theInvocation) throws Throwable { - return new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8); - } - }); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int idx = 0; - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.hasSystemWithAnyCode("urn:foo")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); - - response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:foo", null)) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); - - response = client.search() - .forResource("Patient") - .where(Patient.IDENTIFIER.exactly().systemAndCode("urn:foo", "")) - .returnBundle(Bundle.class) - .execute(); - assertEquals("http://example.com/fhir/Patient?identifier=urn%3Afoo%7C", capt.getAllValues().get(idx++).getURI().toString()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchIncludeRecursive() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .include(Patient.INCLUDE_ORGANIZATION) - .include(Patient.INCLUDE_LINK.asRecursive()) - .include(IBaseResource.INCLUDE_ALL.asNonRecursive()) - .returnBundle(Bundle.class) - .execute(); - - assertThat(capt.getValue().getURI().toString(), containsString("http://example.com/fhir/Patient?")); - assertThat(capt.getValue().getURI().toString(), containsString("_include=" + UrlUtil.escapeUrlParam(Patient.INCLUDE_ORGANIZATION.getValue()))); - assertThat(capt.getValue().getURI().toString(), containsString("_include%3Aiterate=" + UrlUtil.escapeUrlParam(Patient.INCLUDE_LINK.getValue()))); - assertThat(capt.getValue().getURI().toString(), containsString("_include=*")); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchUsingGetSearch() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value("james")) - .usingStyle(SearchStyleEnum.GET_WITH_SEARCH) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient/_search?name=james", capt.getValue().getURI().toString()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchUsingPost() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().value("james")) - .usingStyle(SearchStyleEnum.POST) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient/_search", capt.getValue().getURI().toString()); - - HttpEntityEnclosingRequestBase enc = (HttpEntityEnclosingRequestBase) capt.getValue(); - UrlEncodedFormEntity ent = (UrlEncodedFormEntity) enc.getEntity(); - String string = IOUtils.toString(ent.getContent()); - ourLog.info(string); - assertEquals("name=james", string); - } - - @Test - public void testSearchWithAbsoluteUrl() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client - .search() - .byUrl("http://example.com/fhir/Patient?birthdate=le2012-01-22&birthdate=gt2011-01-01&_include=Patient%3Aorganization&_sort%3Aasc=birthdate&_sort%3Adesc=name&_count=123&_format=json") - .returnBundle(Bundle.class) - .execute(); - - assertEquals(1, response.getEntry().size()); - } - - @SuppressWarnings("unused") - @Test - public void testSearchWithClientEncodingAndPrettyPrintConfig() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - client.setPrettyPrint(true); - client.setEncoding(EncodingEnum.JSON); - - Bundle response = client.search() - .forResource(Patient.class) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?_format=json&_pretty=true", capt.getValue().getURI().toString()); - - } - - @SuppressWarnings("unused") - @Test - public void testSearchWithEscapedParameters() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource("Patient") - .where(Patient.NAME.matches().values("NE,NE", "NE,NE")) - .where(Patient.NAME.matchesExactly().values("E$E")) - .where(Patient.NAME.matches().values("NE\\NE")) - .where(Patient.NAME.matchesExactly().values("E|E")) - .returnBundle(Bundle.class) - .execute(); - - assertThat(capt.getValue().getURI().toString(), containsString("%3A")); - assertEquals("http://example.com/fhir/Patient?name=NE\\,NE,NE\\,NE&name=NE\\\\NE&name:exact=E\\$E&name:exact=E\\|E", UrlUtil.unescape(capt.getValue().getURI().toString())); - } - - @SuppressWarnings("unused") - @Test - public void testSearchWithInternalServerError() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 500, "INTERNAL ERRORS")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_TEXT + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("Server Issues!"), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - try { - client - .search() - .forResource(Patient.class) - .returnBundle(Bundle.class) - .execute(); - fail(); - } catch (InternalErrorException e) { - assertEquals(e.getMessage(), "HTTP 500 INTERNAL ERRORS: Server Issues!"); - assertEquals(e.getResponseBody(), "Server Issues!"); - } - - } - - @SuppressWarnings("unused") - @Test - public void testSearchWithNonFhirResponse() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_TEXT + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader("Server Issues!"), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - try { - client.search().forResource(Patient.class).returnBundle(Bundle.class).execute(); - fail(); - } catch (NonFhirResponseException e) { - assertThat(e.getMessage(), StringContains.containsString("Server Issues!")); - } - - } - - @SuppressWarnings("unused") - @Test - public void testSearchWithReverseInclude() throws Exception { - - String msg = getPatientFeedWithOneResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.search() - .forResource(Patient.class) - .encodedJson() - .revInclude(Provenance.INCLUDE_TARGET) - .returnBundle(Bundle.class) - .execute(); - - assertEquals("http://example.com/fhir/Patient?_revinclude=Provenance%3Atarget&_format=json", capt.getValue().getURI().toString()); - - } - - @Test - public void testSetDefaultEncoding() throws Exception { - - String msg = ourCtx.newJsonParser().encodeResourceToString(new Patient()); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - // Header[] headers = new Header[] { new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 - // GMT"), - // new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - // new BasicHeader(Constants.HEADER_CATEGORY, "http://foo/tagdefinition.html; scheme=\"http://hl7.org/fhir/tag\"; - // label=\"Some tag\"") }; - // when(myHttpResponse.getAllHeaders()).thenReturn(headers); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - (client).setEncoding(EncodingEnum.JSON); - int count = 0; - - client - .read() - .resource(Patient.class) - .withId(new IdType("Patient/1234")) - .execute(); - assertEquals("http://example.com/fhir/Patient/1234?_format=json", capt.getAllValues().get(count).getURI().toString()); - count++; - - } - - @Test - public void testTransactionJson() throws Exception { - Bundle input = createTransactionBundleInput(); - Bundle output = createTransactionBundleOutput(); - - String msg = ourCtx.newJsonParser().encodeResourceToString(output); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_JSON + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.transaction() - .withBundle(input) - .execute(); - - assertEquals("http://example.com/fhir", capt.getValue().getURI().toString()); - assertEquals(input.getEntry().get(0).getResource().getId(), response.getEntry().get(0).getResource().getId()); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(0).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - - } - - @Test - public void testTransactionXml() throws Exception { - Bundle input = createTransactionBundleInput(); - Bundle output = createTransactionBundleOutput(); - - String msg = ourCtx.newXmlParser().encodeResourceToString(output); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Bundle response = client.transaction() - .withBundle(input) - .encodedXml() - .execute(); - - assertEquals("http://example.com/fhir", capt.getValue().getURI().toString()); - assertEquals(input.getEntry().get(0).getResource().getId(), response.getEntry().get(0).getResource().getId()); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(0).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - - } - - @Test - public void testUpdate() throws Exception { - - Patient p1 = new Patient(); - p1.addIdentifier().setSystem("foo:bar").setValue("12345"); - p1.addName().setFamily("Smith").addGiven("John"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - try { - client.update().resource(p1).execute(); - fail(); - } catch (InvalidRequestException e) { - // should happen because no ID set - } - - assertEquals(0, capt.getAllValues().size()); - - p1.setId("44"); - client.update().resource(p1).execute(); - - int count = 0; - - assertEquals(1, capt.getAllValues().size()); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - count++; - - MethodOutcome outcome = client.update().resource(p1).execute(); - assertEquals("44", outcome.getId().getIdPart()); - assertEquals("22", outcome.getId().getVersionIdPart()); - - assertEquals(2, capt.getAllValues().size()); - - assertEquals("http://example.com/fhir/Patient/44", capt.getValue().getURI().toString()); - assertEquals("PUT", capt.getValue().getMethod()); - - /* - * Try fluent options - */ - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - client.update().resource(p1).withId("123").execute(); - assertEquals(3, capt.getAllValues().size()); - assertEquals("http://example.com/fhir/Patient/123", capt.getAllValues().get(2).getURI().toString()); - - String resourceText = " "; - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - client.update().resource(resourceText).withId("123").execute(); - assertEquals("http://example.com/fhir/Patient/123", capt.getAllValues().get(3).getURI().toString()); - assertEquals(resourceText, IOUtils.toString(((HttpPut) capt.getAllValues().get(3)).getEntity().getContent())); - assertEquals(4, capt.getAllValues().size()); - - } - - @Test - public void testUpdateWithStringAutoDetectsEncoding() throws Exception { - - Patient p1 = new Patient(); - p1.addIdentifier().setSystem("foo:bar").setValue("12345"); - p1.addName().setFamily("Smith").addGiven("John"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 201, "OK")); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{new BasicHeader(Constants.HEADER_LOCATION, "/Patient/44/_history/22")}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(""), StandardCharsets.UTF_8)); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - int count = 0; - client.update().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).withId("1").execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("value=\"John\"")); - count++; - - client.update().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).withId("1").execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("[\"John\"]")); - count++; - - /* - * e.g. Now try with reversed encoding (provide a string that's in JSON and ask the client to use XML) - */ - - client.update().resource(ourCtx.newXmlParser().encodeResourceToString(p1)).withId("1").encodedJson().execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.JSON.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("[\"John\"]")); - count++; - - client.update().resource(ourCtx.newJsonParser().encodeResourceToString(p1)).withId("1").encodedXml().execute(); - assertEquals(1, capt.getAllValues().get(count).getHeaders(Constants.HEADER_CONTENT_TYPE).length); - assertEquals(EncodingEnum.XML.getResourceContentTypeNonLegacy() + Constants.HEADER_SUFFIX_CT_UTF_8, capt.getAllValues().get(count).getFirstHeader(Constants.HEADER_CONTENT_TYPE).getValue()); - assertThat(extractBody(capt, count), containsString("value=\"John\"")); - count++; - } - - @Test - public void testVReadWithAbsoluteUrl() throws Exception { - - String msg = getResourceResult(); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), StandardCharsets.UTF_8)); - Header[] headers = new Header[]{ - new BasicHeader(Constants.HEADER_LAST_MODIFIED, "Wed, 15 Nov 1995 04:58:08 GMT"), - new BasicHeader(Constants.HEADER_CONTENT_LOCATION, "http://foo.com/Patient/123/_history/2333"), - }; - when(myHttpResponse.getAllHeaders()).thenReturn(headers); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Patient response = client - .read() - .resource(Patient.class) - .withUrl("http://somebase.com/path/to/base/Patient/1234/_history/2222") - .execute(); - - assertThat(response.getNameFirstRep().getFamily(), StringContains.containsString("Cardinal")); - assertEquals("http://somebase.com/path/to/base/Patient/1234/_history/2222", capt.getAllValues().get(0).getURI().toString()); - - } - - @Test - public void testValidateNonFluent() throws Exception { - - OperationOutcome oo = new OperationOutcome(); - oo.addIssue().setDiagnostics("OOOK"); - - ArgumentCaptor capt = ArgumentCaptor.forClass(HttpUriRequest.class); - when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse); - when(myHttpResponse.getAllHeaders()).thenReturn(new Header[]{}); - when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8")); - when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(ourCtx.newXmlParser().encodeResourceToString(oo)), StandardCharsets.UTF_8)); - when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK")); - - IGenericClient client = ourCtx.newRestfulGenericClient("http://example.com/fhir"); - - Patient p1 = new Patient(); - p1.addIdentifier().setSystem("foo:bar").setValue("12345"); - p1.addName().setFamily("Smith").addGiven("John"); - - MethodOutcome resp = client.validate(p1); - assertEquals("http://example.com/fhir/Patient/$validate", capt.getValue().getURI().toString()); - oo = (OperationOutcome) resp.getOperationOutcome(); - assertEquals("OOOK", oo.getIssueFirstRep().getDiagnostics()); - - } - - private String getPatientFeedWithOneResult() { - - Bundle retVal = new Bundle(); - - Patient p = new Patient(); - p.addName().setFamily("Cardinal").addGiven("John"); - p.addIdentifier().setValue("PRP1660"); - retVal.addEntry().setResource(p); - - return ourCtx.newXmlParser().encodeResourceToString(retVal); - } - - @AfterAll - public static void afterClassClearContext() { - TestUtil.randomizeLocaleAndTimezone(); - } - - @BeforeAll - public static void beforeClass() { - ourCtx = FhirContext.forR5(); - } - -} diff --git a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/SearchR5Test.java b/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/SearchR5Test.java index c2dcfa910e1..b038694578f 100644 --- a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/SearchR5Test.java +++ b/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/SearchR5Test.java @@ -91,7 +91,7 @@ public class SearchR5Test { @SuppressWarnings("rawtypes") @Search() public List search( - @RequiredParam(name = Patient.SP_IDENTIFIER) TokenAndListParam theIdentifiers) { + @RequiredParam(name = "identifier") TokenAndListParam theIdentifiers) { ourLastMethod = "search"; ourIdentifiers = theIdentifiers; ArrayList retVal = new ArrayList<>(); diff --git a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR5Test.java b/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR5Test.java index 223434cdb10..720075d0ce4 100644 --- a/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR5Test.java +++ b/hapi-fhir-structures-r5/src/test/java/ca/uhn/fhir/rest/server/ServerCapabilityStatementProviderR5Test.java @@ -396,9 +396,9 @@ public class ServerCapabilityStatementProviderR5Test { assertEquals("subject.identifier", res.getSearchParam().get(0).getName()); - assertEquals(DiagnosticReport.SP_CODE, res.getSearchParam().get(1).getName()); + assertEquals("code", res.getSearchParam().get(1).getName()); - assertEquals(DiagnosticReport.SP_DATE, res.getSearchParam().get(2).getName()); + assertEquals("date", res.getSearchParam().get(2).getName()); assertEquals(1, res.getSearchInclude().size()); assertEquals("DiagnosticReport.result", res.getSearchInclude().get(0).getValue()); @@ -865,8 +865,8 @@ public class ServerCapabilityStatementProviderR5Test { public static class MultiOptionalProvider { @Search(type = Patient.class) - public Patient findPatient(@Description(shortDefinition = "The patient's identifier") @OptionalParam(name = Patient.SP_IDENTIFIER) TokenParam theIdentifier, - @Description(shortDefinition = "The patient's name") @OptionalParam(name = Patient.SP_NAME) StringParam theName) { + public Patient findPatient(@Description(shortDefinition = "The patient's identifier") @OptionalParam(name = "identifier") TokenParam theIdentifier, + @Description(shortDefinition = "The patient's name") @OptionalParam(name = "name") StringParam theName) { return null; } @@ -971,8 +971,8 @@ public class ServerCapabilityStatementProviderR5Test { @Description(shortDefinition = "This is a search for stuff!") @Search - public List findDiagnosticReportsByPatient(@RequiredParam(name = DiagnosticReport.SP_SUBJECT + '.' + Patient.SP_IDENTIFIER) TokenParam thePatientId, - @OptionalParam(name = DiagnosticReport.SP_CODE) TokenOrListParam theNames, @OptionalParam(name = DiagnosticReport.SP_DATE) DateRangeParam theDateRange, + public List findDiagnosticReportsByPatient(@RequiredParam(name = "subject" + '.' + "identifier") TokenParam thePatientId, + @OptionalParam(name = "code") TokenOrListParam theNames, @OptionalParam(name = "date") DateRangeParam theDateRange, @IncludeParam(allow = { "DiagnosticReport.result" }) Set theIncludes) throws Exception { return null; } @@ -983,7 +983,7 @@ public class ServerCapabilityStatementProviderR5Test { public static class ReadProvider { @Search(type = Patient.class) - public Patient findPatient(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = Patient.SP_IDENTIFIER) TokenParam theIdentifier) { + public Patient findPatient(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = "identifier") TokenParam theIdentifier) { return null; } @@ -998,7 +998,7 @@ public class ServerCapabilityStatementProviderR5Test { public static class SearchProvider { @Search(type = Patient.class) - public Patient findPatient1(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = Patient.SP_IDENTIFIER) TokenParam theIdentifier) { + public Patient findPatient1(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = "identifier") TokenParam theIdentifier) { return null; } @@ -1014,7 +1014,7 @@ public class ServerCapabilityStatementProviderR5Test { public static class SearchProviderWithWhitelist { @Search(type = Patient.class) - public Patient findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = Patient.SP_ORGANIZATION, chainWhitelist = { "foo", + public Patient findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = "organization", chainWhitelist = { "foo", "bar" }) ReferenceAndListParam theIdentifier) { return null; } @@ -1032,7 +1032,7 @@ public class ServerCapabilityStatementProviderR5Test { @Search() - public List findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = Patient.SP_ORGANIZATION) ReferenceAndListParam theIdentifier) { + public List findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = "organization") ReferenceAndListParam theIdentifier) { return null; } @@ -1049,7 +1049,7 @@ public class ServerCapabilityStatementProviderR5Test { @Search(type=Patient.class) - public List findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = Patient.SP_ORGANIZATION) ReferenceAndListParam theIdentifier) { + public List findPatient1(@Description(shortDefinition = "The organization at which this person is a patient") @RequiredParam(name = "organization") ReferenceAndListParam theIdentifier) { return null; } @@ -1083,7 +1083,7 @@ public class ServerCapabilityStatementProviderR5Test { public static class VreadProvider { @Search(type = Patient.class) - public Patient findPatient(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = Patient.SP_IDENTIFIER) TokenParam theIdentifier) { + public Patient findPatient(@Description(shortDefinition = "The patient's identifier (MRN or other card number)") @RequiredParam(name = "identifier") TokenParam theIdentifier) { return null; } diff --git a/hapi-fhir-structures-r5/src/test/java/org/hl7/fhir/r5/model/ModelR5Test.java b/hapi-fhir-structures-r5/src/test/java/org/hl7/fhir/r5/model/ModelR5Test.java index 5514ae733be..02cfcd0f273 100644 --- a/hapi-fhir-structures-r5/src/test/java/org/hl7/fhir/r5/model/ModelR5Test.java +++ b/hapi-fhir-structures-r5/src/test/java/org/hl7/fhir/r5/model/ModelR5Test.java @@ -3,6 +3,11 @@ package org.hl7.fhir.r5.model; import ca.uhn.fhir.context.FhirContext; import org.junit.jupiter.api.Test; +import java.util.Set; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -30,4 +35,18 @@ public class ModelR5Test { } + @Test + public void testCompartmentsPopulated() { + Set compartments = ourCtx + .getResourceDefinition("Observation") + .getSearchParam("performer") + .getProvidesMembershipInCompartments(); + assertThat(compartments.toString(), compartments, containsInAnyOrder( + "Practitioner", + "Patient", + "RelatedPerson" + )); + } + + } diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index 1d87c618380..46b098b4678 100644 --- a/hapi-fhir-test-utilities/pom.xml +++ b/hapi-fhir-test-utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 4c746b542cd..9358fba6c0b 100644 --- a/hapi-fhir-testpage-overlay/pom.xml +++ b/hapi-fhir-testpage-overlay/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu2.1/pom.xml index c18cd2c7464..920c7c0ce9f 100644 --- a/hapi-fhir-validation-resources-dstu2.1/pom.xml +++ b/hapi-fhir-validation-resources-dstu2.1/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation-resources-dstu2/pom.xml b/hapi-fhir-validation-resources-dstu2/pom.xml index 6d9257f054a..5583da998a0 100644 --- a/hapi-fhir-validation-resources-dstu2/pom.xml +++ b/hapi-fhir-validation-resources-dstu2/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation-resources-dstu3/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml index 9404368caf9..8233c6a1a99 100644 --- a/hapi-fhir-validation-resources-dstu3/pom.xml +++ b/hapi-fhir-validation-resources-dstu3/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation-resources-r4/pom.xml b/hapi-fhir-validation-resources-r4/pom.xml index 9bdb3f741e7..ad868111c34 100644 --- a/hapi-fhir-validation-resources-r4/pom.xml +++ b/hapi-fhir-validation-resources-r4/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation-resources-r5/pom.xml b/hapi-fhir-validation-resources-r5/pom.xml index 220f10830ba..d5929b734f6 100644 --- a/hapi-fhir-validation-resources-r5/pom.xml +++ b/hapi-fhir-validation-resources-r5/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension/extension-definitions.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension/extension-definitions.xml index 496a8cd2e33..65dd7d82f00 100644 --- a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension/extension-definitions.xml +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension/extension-definitions.xml @@ -1,7 +1,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -635,7 +635,7 @@ - + @@ -702,7 +702,7 @@ - + @@ -851,7 +851,7 @@ - + @@ -918,7 +918,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1141,7 +1141,7 @@ - + @@ -1294,7 +1294,7 @@ - + @@ -1361,7 +1361,7 @@ - + @@ -1516,7 +1516,7 @@ - + @@ -1583,7 +1583,7 @@ - + @@ -1751,7 +1751,7 @@ - + @@ -1818,7 +1818,7 @@ - + @@ -1974,7 +1974,7 @@ - + @@ -2041,7 +2041,7 @@ - + @@ -2216,7 +2216,7 @@ - + @@ -2283,7 +2283,7 @@ - + @@ -2436,7 +2436,7 @@ - + @@ -2503,7 +2503,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2722,7 +2722,7 @@ - + @@ -2874,7 +2874,7 @@ - + @@ -2941,7 +2941,7 @@ - + @@ -3095,7 +3095,7 @@ - + @@ -3162,7 +3162,7 @@ - + @@ -3314,7 +3314,7 @@ - + @@ -3381,7 +3381,7 @@ - + @@ -3537,7 +3537,7 @@ - + @@ -3604,7 +3604,7 @@ - + @@ -3758,7 +3758,7 @@ - + @@ -3825,7 +3825,7 @@ - + @@ -3978,7 +3978,7 @@ - + @@ -4045,7 +4045,7 @@ - + @@ -4211,7 +4211,7 @@ - + @@ -4327,7 +4327,7 @@ - + @@ -4489,7 +4489,7 @@ - + @@ -4617,7 +4617,7 @@ - + @@ -4715,6 +4715,9 @@ + + + @@ -4751,6 +4754,9 @@ + + + @@ -5011,7 +5017,7 @@ - + @@ -5078,7 +5084,7 @@ - + @@ -5253,7 +5259,7 @@ - + @@ -5320,7 +5326,7 @@ - + @@ -5475,7 +5481,7 @@ - + @@ -5542,7 +5548,7 @@ - + @@ -5720,7 +5726,7 @@ - + @@ -5787,7 +5793,7 @@ - + @@ -5940,7 +5946,7 @@ - + @@ -6007,7 +6013,7 @@ - + @@ -6165,7 +6171,7 @@ - + @@ -6232,7 +6238,7 @@ - + @@ -6426,7 +6432,7 @@ - + @@ -6493,7 +6499,7 @@ - + @@ -6682,7 +6688,7 @@ - + @@ -6749,7 +6755,7 @@ - + @@ -6924,7 +6930,7 @@ - + @@ -6991,7 +6997,7 @@ - + @@ -7147,7 +7153,7 @@ - + @@ -7214,7 +7220,7 @@ - + @@ -7371,7 +7377,7 @@ - + @@ -7438,7 +7444,7 @@ - + @@ -7592,7 +7598,7 @@ - + @@ -7659,7 +7665,7 @@ - + @@ -7744,6 +7750,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7828,7 +8056,7 @@ - + @@ -7895,7 +8123,7 @@ - + @@ -8049,7 +8277,7 @@ - + @@ -8116,7 +8344,7 @@ - + @@ -8315,7 +8543,7 @@ - + @@ -8382,7 +8610,7 @@ - + @@ -8594,7 +8822,7 @@ - + @@ -8661,7 +8889,7 @@ - + @@ -8825,7 +9053,7 @@ - + @@ -8892,7 +9120,7 @@ - + @@ -9061,7 +9289,7 @@ - + @@ -9176,7 +9404,7 @@ - + @@ -9338,7 +9566,7 @@ - + @@ -9458,7 +9686,7 @@ - + @@ -9556,6 +9784,9 @@ + + + @@ -9592,6 +9823,9 @@ + + + @@ -9843,7 +10077,7 @@ - + @@ -9910,7 +10144,7 @@ - + @@ -10095,7 +10329,7 @@ - + @@ -10162,7 +10396,7 @@ - + @@ -10370,7 +10604,7 @@ - + @@ -10437,7 +10671,7 @@ - + @@ -10601,7 +10835,7 @@ - + @@ -10668,7 +10902,7 @@ - + @@ -10837,7 +11071,7 @@ - + @@ -10952,7 +11186,7 @@ - + @@ -11114,7 +11348,7 @@ - + @@ -11234,7 +11468,7 @@ - + @@ -11332,6 +11566,9 @@ + + + @@ -11368,6 +11605,9 @@ + + + @@ -11619,7 +11859,7 @@ - + @@ -11686,7 +11926,7 @@ - + @@ -11841,7 +12081,7 @@ - + @@ -11908,7 +12148,7 @@ - + @@ -11993,6 +12233,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -12078,7 +12542,7 @@ - + @@ -12185,7 +12649,7 @@ - + @@ -12355,7 +12819,7 @@ - + @@ -12475,7 +12939,7 @@ - + @@ -12573,6 +13037,9 @@ + + + @@ -12609,6 +13076,9 @@ + + + @@ -12848,7 +13318,7 @@ - + @@ -12915,7 +13385,7 @@ - + @@ -13071,7 +13541,7 @@ - + @@ -13138,7 +13608,7 @@ - + @@ -13294,7 +13764,7 @@ - + @@ -13361,7 +13831,7 @@ - + @@ -13517,7 +13987,7 @@ - + @@ -13584,7 +14054,7 @@ - + @@ -13740,7 +14210,7 @@ - + @@ -13807,7 +14277,7 @@ - + @@ -13967,7 +14437,7 @@ - + @@ -14034,7 +14504,7 @@ - + @@ -14185,7 +14655,7 @@ - + @@ -14252,7 +14722,7 @@ - + @@ -14407,7 +14877,7 @@ - + @@ -14474,7 +14944,7 @@ - + @@ -14628,7 +15098,7 @@ - + @@ -14695,7 +15165,7 @@ - + @@ -14848,7 +15318,7 @@ - + @@ -14915,7 +15385,7 @@ - + @@ -15068,7 +15538,7 @@ - + @@ -15135,7 +15605,7 @@ - + @@ -15288,7 +15758,7 @@ - + @@ -15355,7 +15825,7 @@ - + @@ -15510,7 +15980,7 @@ - + @@ -15577,7 +16047,7 @@ - + @@ -15746,7 +16216,7 @@ - + @@ -15813,7 +16283,7 @@ - + @@ -15978,7 +16448,7 @@ - + @@ -16045,7 +16515,7 @@ - + @@ -16214,7 +16684,7 @@ - + @@ -16281,7 +16751,7 @@ - + @@ -16437,7 +16907,7 @@ - + @@ -16504,7 +16974,7 @@ - + @@ -16662,7 +17132,7 @@ - + @@ -16773,7 +17243,7 @@ - + @@ -16938,7 +17408,7 @@ - + @@ -17059,7 +17529,7 @@ - + @@ -17157,6 +17627,9 @@ + + + @@ -17193,6 +17666,9 @@ + + + @@ -17439,7 +17915,7 @@ - + @@ -17546,7 +18022,7 @@ - + @@ -17707,7 +18183,7 @@ - + @@ -17828,7 +18304,7 @@ - + @@ -17926,6 +18402,9 @@ + + + @@ -17962,6 +18441,9 @@ + + + @@ -18200,7 +18682,7 @@ - + @@ -18267,7 +18749,7 @@ - + @@ -18437,7 +18919,7 @@ - + @@ -18504,7 +18986,7 @@ - + @@ -18661,7 +19143,7 @@ - + @@ -18768,7 +19250,7 @@ - + @@ -18929,7 +19411,7 @@ - + @@ -19050,7 +19532,7 @@ - + @@ -19148,6 +19630,9 @@ + + + @@ -19184,6 +19669,9 @@ + + + @@ -19414,7 +19902,7 @@ - + @@ -19521,7 +20009,7 @@ - + @@ -19677,7 +20165,7 @@ - + @@ -19838,7 +20326,7 @@ - + @@ -19966,7 +20454,7 @@ - + @@ -20064,6 +20552,9 @@ + + + @@ -20100,6 +20591,9 @@ + + + @@ -20364,7 +20858,7 @@ - + @@ -20431,7 +20925,7 @@ - + @@ -20582,7 +21076,7 @@ - + @@ -20649,7 +21143,7 @@ - + @@ -20803,7 +21297,7 @@ - + @@ -20870,7 +21364,7 @@ - + @@ -21023,7 +21517,7 @@ - + @@ -21090,7 +21584,7 @@ - + @@ -21271,7 +21765,7 @@ - + @@ -21378,7 +21872,7 @@ - + @@ -21531,7 +22025,7 @@ - + @@ -21684,7 +22178,7 @@ - + @@ -21838,7 +22332,7 @@ - + @@ -21991,7 +22485,7 @@ - + @@ -22144,7 +22638,7 @@ - + @@ -22297,7 +22791,7 @@ - + @@ -22450,7 +22944,7 @@ - + @@ -22550,7 +23044,7 @@ - + @@ -22703,7 +23197,7 @@ - + @@ -22856,7 +23350,7 @@ - + @@ -23009,7 +23503,7 @@ - + @@ -23162,7 +23656,7 @@ - + @@ -23377,6 +23871,9 @@ + + + @@ -23413,6 +23910,9 @@ + + + @@ -23485,7 +23985,7 @@ - + @@ -23583,6 +24083,9 @@ + + + @@ -23619,6 +24122,9 @@ + + + @@ -24157,7 +24663,7 @@ - + @@ -24224,7 +24730,7 @@ - + @@ -24409,7 +24915,7 @@ - + @@ -24476,7 +24982,7 @@ - + @@ -24649,7 +25155,7 @@ - + @@ -24716,7 +25222,7 @@ - + @@ -24869,7 +25375,7 @@ - + @@ -24936,7 +25442,7 @@ - + @@ -25090,7 +25596,7 @@ - + @@ -25157,7 +25663,7 @@ - + @@ -25333,7 +25839,7 @@ - + @@ -25400,7 +25906,7 @@ - + @@ -25553,7 +26059,7 @@ - + @@ -25620,7 +26126,7 @@ - + @@ -25776,7 +26282,7 @@ - + @@ -25843,7 +26349,7 @@ - + @@ -25999,7 +26505,7 @@ - + @@ -26066,7 +26572,7 @@ - + @@ -26221,7 +26727,7 @@ - + @@ -26288,7 +26794,7 @@ - + @@ -26455,7 +26961,7 @@ - + @@ -26522,7 +27028,7 @@ - + @@ -26689,7 +27195,7 @@ - + @@ -26756,7 +27262,7 @@ - + @@ -26912,7 +27418,7 @@ - + @@ -26979,7 +27485,7 @@ - + @@ -27075,10 +27581,7 @@ - + @@ -27097,14 +27600,8 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - - + + @@ -27144,7 +27641,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27211,7 +27708,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27264,14 +27761,8 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - - + + @@ -27386,7 +27877,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27453,7 +27944,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27606,7 +28097,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27673,7 +28164,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27827,7 +28318,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -27894,7 +28385,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -28050,7 +28541,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -28117,7 +28608,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -28209,9 +28700,7 @@ https://ghr.nlm.nih.gov/primer/testing/secondaryfindings."> - + @@ -28231,9 +28720,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28273,7 +28760,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28340,7 +28827,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28385,9 +28872,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28501,7 +28986,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28568,7 +29053,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28723,7 +29208,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28790,7 +29275,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -28937,7 +29422,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29004,7 +29489,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29151,7 +29636,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29258,7 +29743,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29411,7 +29896,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29531,7 +30016,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29629,6 +30114,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -29665,6 +30153,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -29880,7 +30371,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -29987,7 +30478,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30140,7 +30631,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30260,7 +30751,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30358,6 +30849,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -30394,6 +30888,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -30609,7 +31106,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30676,7 +31173,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30823,7 +31320,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -30890,7 +31387,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31037,7 +31534,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31104,7 +31601,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31251,7 +31748,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31318,7 +31815,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31465,7 +31962,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31532,7 +32029,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31680,7 +32177,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31747,7 +32244,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31895,7 +32392,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -31962,7 +32459,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32123,7 +32620,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32190,7 +32687,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32339,7 +32836,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32406,7 +32903,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32567,7 +33064,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32634,7 +33131,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32805,7 +33302,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -32921,7 +33418,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -33091,7 +33588,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -33260,7 +33757,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -33388,7 +33885,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -33486,6 +33983,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -33522,6 +34022,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -33821,7 +34324,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -33928,7 +34431,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34089,7 +34592,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34217,7 +34720,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34315,6 +34818,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -34351,6 +34857,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -34592,7 +35101,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34659,7 +35168,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34826,7 +35335,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -34893,7 +35402,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35049,7 +35558,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35116,7 +35625,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35270,7 +35779,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35337,7 +35846,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35512,7 +36021,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35579,7 +36088,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35736,7 +36245,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35803,7 +36312,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -35987,7 +36496,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36054,7 +36563,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36222,7 +36731,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36289,7 +36798,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36442,7 +36951,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36509,7 +37018,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36662,7 +37171,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36729,7 +37238,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36892,7 +37401,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -36959,7 +37468,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37114,7 +37623,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37181,7 +37690,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37337,7 +37846,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37445,7 +37954,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37613,7 +38122,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -37828,6 +38337,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -37864,6 +38376,9 @@ There can be multiple contacts on an Organizations record with this value set to + + + @@ -38104,7 +38619,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38171,7 +38686,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38334,7 +38849,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38401,7 +38916,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38559,7 +39074,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38626,7 +39141,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38780,7 +39295,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -38847,7 +39362,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39020,7 +39535,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39087,7 +39602,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39262,7 +39777,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39329,7 +39844,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39510,7 +40025,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39577,7 +40092,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39741,7 +40256,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39808,7 +40323,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -39971,7 +40486,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40038,7 +40553,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40225,7 +40740,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40292,7 +40807,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40458,7 +40973,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40525,7 +41040,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40688,7 +41203,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40755,7 +41270,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40918,7 +41433,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -40985,7 +41500,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41149,7 +41664,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41216,7 +41731,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41375,7 +41890,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41442,7 +41957,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41600,7 +42115,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41667,7 +42182,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41844,7 +42359,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -41911,7 +42426,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -42069,7 +42584,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -42136,7 +42651,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -42276,9 +42791,7 @@ There can be multiple contacts on an Organizations record with this value set to - + @@ -42318,7 +42831,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42385,7 +42898,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42440,9 +42953,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42561,7 +43072,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42668,7 +43179,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42821,7 +43332,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -42974,7 +43485,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -43135,7 +43646,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -43288,7 +43799,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -43441,7 +43952,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -43561,7 +44072,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -43659,6 +44170,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -43695,6 +44209,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -44042,7 +44559,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44109,7 +44626,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44264,7 +44781,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44364,7 +44881,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44431,7 +44948,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44524,7 +45041,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44591,7 +45108,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44680,7 +45197,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44747,7 +45264,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44809,7 +45326,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -44907,6 +45424,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -44943,6 +45463,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -45196,7 +45719,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45263,7 +45786,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45288,10 +45811,12 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - - + + + + @@ -45335,10 +45860,12 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - - + + + + @@ -45433,7 +45960,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45500,7 +46027,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45659,7 +46186,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45726,7 +46253,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45901,7 +46428,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -45968,7 +46495,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46120,7 +46647,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46187,7 +46714,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46364,7 +46891,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46431,7 +46958,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46598,7 +47125,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46665,7 +47192,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46830,7 +47357,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -46897,7 +47424,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47062,7 +47589,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47129,7 +47656,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47295,7 +47822,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47362,7 +47889,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47529,7 +48056,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47596,7 +48123,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47762,7 +48289,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47829,7 +48356,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -47994,7 +48521,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48061,7 +48588,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48134,6 +48661,492 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48218,7 +49231,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48285,7 +49298,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48438,7 +49451,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48505,7 +49518,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48680,7 +49693,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48747,7 +49760,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48900,7 +49913,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -48967,7 +49980,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49120,7 +50133,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49187,7 +50200,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49345,7 +50358,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49412,7 +50425,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49562,7 +50575,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49629,7 +50642,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49777,7 +50790,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -49885,7 +50898,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50039,7 +51052,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50159,7 +51172,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50257,6 +51270,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -50293,6 +51309,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -50513,7 +51532,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50580,7 +51599,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50728,7 +51747,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50795,7 +51814,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -50943,7 +51962,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51050,7 +52069,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51203,7 +52222,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51323,7 +52342,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51421,6 +52440,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -51457,6 +52479,9 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ + + + @@ -51676,7 +52701,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51743,7 +52768,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51852,11 +52877,7 @@ The signature can be captured using the http://hl7.org/fhir/StructureDefinition/ - + @@ -51896,7 +52917,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -51963,7 +52984,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52010,11 +53031,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52114,7 +53131,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52181,7 +53198,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52329,7 +53346,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52396,7 +53413,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52545,7 +53562,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52612,7 +53629,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52761,7 +53778,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52828,7 +53845,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52936,9 +53953,7 @@ Changes to this element should never result in a new Value Set Definition Versio - + @@ -52978,7 +53993,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53045,7 +54060,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53092,9 +54107,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53199,7 +54212,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53266,7 +54279,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53417,7 +54430,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53484,7 +54497,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53631,7 +54644,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53698,7 +54711,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53846,7 +54859,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -53913,7 +54926,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54075,7 +55088,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54142,7 +55155,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54298,7 +55311,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54365,7 +55378,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54513,7 +55526,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54580,7 +55593,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54730,7 +55743,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54797,7 +55810,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -54946,7 +55959,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55013,7 +56026,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55163,7 +56176,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55230,7 +56243,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55377,7 +56390,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55444,7 +56457,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55593,7 +56606,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55660,7 +56673,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55809,7 +56822,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -55876,7 +56889,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56039,7 +57052,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56106,7 +57119,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56269,7 +57282,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56377,7 +57390,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56530,7 +57543,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56684,7 +57697,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56804,7 +57817,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -56902,6 +57915,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -56938,6 +57954,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -57186,7 +58205,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57253,7 +58272,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57405,7 +58424,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57472,7 +58491,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57620,7 +58639,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57687,7 +58706,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57835,7 +58854,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -57902,7 +58921,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58051,7 +59070,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58118,7 +59137,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58265,7 +59284,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58332,7 +59351,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58478,7 +59497,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58586,7 +59605,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58740,7 +59759,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58860,7 +59879,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -58958,6 +59977,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -58994,6 +60016,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -59213,7 +60238,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59280,7 +60305,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59427,7 +60452,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59494,7 +60519,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59642,7 +60667,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59716,7 +60741,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59859,7 +60884,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -59933,7 +60958,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60075,7 +61100,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60142,7 +61167,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60288,7 +61313,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60355,7 +61380,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60500,7 +61525,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60567,7 +61592,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60666,7 +61691,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60715,7 +61740,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60782,7 +61807,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -60936,7 +61961,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61003,7 +62028,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61155,7 +62180,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61222,7 +62247,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61388,7 +62413,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61455,7 +62480,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61617,7 +62642,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61684,7 +62709,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61854,7 +62879,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61921,7 +62946,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -61991,6 +63016,229 @@ This extension should only be used if the "authoritative source" (valu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62075,7 +63323,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62142,7 +63390,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62296,7 +63544,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62363,7 +63611,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62533,7 +63781,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62600,7 +63848,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62754,7 +64002,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62821,7 +64069,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -62891,6 +64139,227 @@ This extension should only be used if the "authoritative source" (valu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62975,7 +64444,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63042,7 +64511,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63211,7 +64680,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63278,7 +64747,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63431,7 +64900,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63498,7 +64967,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63674,7 +65143,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63741,7 +65210,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63895,7 +65364,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -63962,7 +65431,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64116,7 +65585,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64183,7 +65652,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64337,7 +65806,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64404,7 +65873,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64557,7 +66026,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64624,7 +66093,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64793,7 +66262,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -64860,7 +66329,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65014,7 +66483,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65081,7 +66550,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65235,7 +66704,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65302,7 +66771,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65457,7 +66926,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65524,7 +66993,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65681,7 +67150,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65748,7 +67217,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65928,7 +67397,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -65995,7 +67464,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66171,7 +67640,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66238,7 +67707,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66408,7 +67877,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66475,7 +67944,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66628,7 +68097,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66695,7 +68164,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66848,7 +68317,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -66915,7 +68384,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67076,7 +68545,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67143,7 +68612,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67298,7 +68767,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67365,7 +68834,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67526,7 +68995,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67593,7 +69062,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67743,7 +69212,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67810,7 +69279,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -67958,7 +69427,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68066,7 +69535,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68220,7 +69689,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68340,7 +69809,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68438,6 +69907,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -68474,6 +69946,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -68694,7 +70169,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68761,7 +70236,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68909,7 +70384,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -68976,7 +70451,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69124,7 +70599,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69231,7 +70706,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69384,7 +70859,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69504,7 +70979,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69602,6 +71077,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -69638,6 +71116,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -69857,7 +71338,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -69924,7 +71405,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70072,7 +71553,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70139,7 +71620,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70287,7 +71768,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70354,7 +71835,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70502,7 +71983,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70569,7 +72050,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70716,7 +72197,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70783,7 +72264,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -70930,7 +72411,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71038,7 +72519,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71191,7 +72672,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71291,7 +72772,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71444,7 +72925,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71597,7 +73078,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71750,7 +73231,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -71965,6 +73446,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -72001,6 +73485,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -72073,7 +73560,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -72171,6 +73658,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -72207,6 +73697,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -72543,7 +74036,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -72610,7 +74103,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -72757,7 +74250,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -72824,7 +74317,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -72972,7 +74465,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73039,7 +74532,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73190,7 +74683,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73257,7 +74750,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73405,7 +74898,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73472,7 +74965,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73620,7 +75113,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73727,7 +75220,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -73881,7 +75374,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74009,7 +75502,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74107,6 +75600,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -74143,6 +75639,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -74368,7 +75867,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74435,7 +75934,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74582,7 +76081,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74649,7 +76148,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74833,7 +76332,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -74900,7 +76399,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75086,7 +76585,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75153,7 +76652,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75312,7 +76811,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75419,7 +76918,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75580,7 +77079,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75741,7 +77240,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -75905,7 +77404,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -76033,7 +77532,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -76131,6 +77630,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -76167,6 +77669,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -76477,7 +77982,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -76584,7 +78089,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -76737,7 +78242,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -76890,7 +78395,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77010,7 +78515,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77108,6 +78613,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -77144,6 +78652,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -77389,7 +78900,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77456,7 +78967,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77614,7 +79125,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77681,7 +79192,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77718,7 +79229,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77763,7 +79274,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77864,7 +79375,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -77931,7 +79442,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78123,7 +79634,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78190,7 +79701,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78345,7 +79856,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78452,7 +79963,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78605,7 +80116,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78725,7 +80236,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -78823,6 +80334,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -78859,6 +80373,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -79093,7 +80610,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79200,7 +80717,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79301,7 +80818,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79371,7 +80888,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79494,7 +81011,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79592,6 +81109,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -79628,6 +81148,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -79727,7 +81250,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79883,7 +81406,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79950,7 +81473,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -79987,7 +81510,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80027,7 +81550,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80127,7 +81650,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80194,7 +81717,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80353,7 +81876,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80461,7 +81984,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80618,7 +82141,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80719,7 +82242,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80781,7 +82304,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80901,7 +82424,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -80999,6 +82522,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -81035,6 +82561,9 @@ This extension should only be used if the "authoritative source" (valu + + + @@ -81165,7 +82694,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81318,7 +82847,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81385,7 +82914,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81422,7 +82951,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81468,7 +82997,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81534,9 +83063,7 @@ This extension should only be used if the "authoritative source" (valu - + @@ -81576,7 +83103,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -81643,7 +83170,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -81690,9 +83217,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -81799,7 +83324,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -81866,7 +83391,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -81972,6 +83497,10 @@ It's also possible to link to the resource narrative using the [narrativeLink ex + + + + @@ -82000,6 +83529,10 @@ It's also possible to link to the resource narrative using the [narrativeLink ex + + + + @@ -82076,6 +83609,10 @@ It's also possible to link to the resource narrative using the [narrativeLink ex + + + + @@ -82136,7 +83673,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82203,7 +83740,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82358,7 +83895,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82425,7 +83962,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82586,7 +84123,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82653,7 +84190,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82753,8 +84290,7 @@ It's also possible to link to the resource narrative using the [narrativeLink ex - + @@ -82786,10 +84322,8 @@ manipulation of a concept (e.g. Adding up components of a score). Scores are usu - - + + @@ -82829,7 +84363,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -82896,7 +84430,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -82942,10 +84476,8 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - - + + @@ -83064,7 +84596,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83131,7 +84663,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83284,7 +84816,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83351,7 +84883,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83517,7 +85049,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83584,7 +85116,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83621,7 +85153,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83668,7 +85200,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83782,7 +85314,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83849,7 +85381,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83886,7 +85418,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -83930,7 +85462,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84032,7 +85564,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84099,7 +85631,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84136,7 +85668,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84179,7 +85711,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84281,7 +85813,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84348,7 +85880,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84385,7 +85917,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84428,7 +85960,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84530,7 +86062,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84597,7 +86129,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84759,7 +86291,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84826,7 +86358,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84863,7 +86395,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -84906,7 +86438,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85007,7 +86539,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85074,7 +86606,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85111,7 +86643,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85153,7 +86685,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85254,7 +86786,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85321,7 +86853,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85481,7 +87013,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85548,7 +87080,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85708,7 +87240,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85775,7 +87307,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -85935,7 +87467,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86002,7 +87534,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86162,7 +87694,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86229,7 +87761,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86389,7 +87921,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86456,7 +87988,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86616,7 +88148,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86683,7 +88215,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86843,7 +88375,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -86910,7 +88442,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87070,7 +88602,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87137,7 +88669,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87297,7 +88829,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87364,7 +88896,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87524,7 +89056,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87591,7 +89123,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87751,7 +89283,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87818,7 +89350,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -87978,7 +89510,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88045,7 +89577,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88205,7 +89737,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88272,7 +89804,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88432,7 +89964,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88499,7 +90031,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88659,7 +90191,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88726,7 +90258,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88886,7 +90418,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -88953,7 +90485,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89113,7 +90645,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89180,7 +90712,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89340,7 +90872,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89407,7 +90939,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89567,7 +91099,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89634,7 +91166,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89795,7 +91327,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -89862,7 +91394,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90023,7 +91555,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90090,7 +91622,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90250,7 +91782,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90317,7 +91849,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90354,7 +91886,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90395,7 +91927,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90495,7 +92027,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90562,7 +92094,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90719,7 +92251,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90786,7 +92318,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90904,8 +92436,7 @@ so this extension is allowed to appear ouside those preferred contexts. Scores - + @@ -90949,7 +92480,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91016,7 +92547,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91063,8 +92594,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91174,7 +92704,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91241,7 +92771,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91278,7 +92808,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91316,7 +92846,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91413,7 +92943,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91520,7 +93050,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91673,7 +93203,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91826,7 +93356,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -91979,7 +93509,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -92099,7 +93629,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -92197,6 +93727,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -92233,6 +93766,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -92529,7 +94065,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -92596,7 +94132,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -92775,7 +94311,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -92842,7 +94378,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93021,7 +94557,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93088,7 +94624,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93263,7 +94799,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93330,7 +94866,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93368,6 +94904,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -93427,6 +94966,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -93529,7 +95071,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93596,7 +95138,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93628,15 +95170,15 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - - - + + + @@ -93690,15 +95232,15 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - - - + + + @@ -93805,7 +95347,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -93872,7 +95414,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94051,7 +95593,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94118,7 +95660,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94155,7 +95697,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94206,7 +95748,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94325,7 +95867,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94392,7 +95934,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94558,7 +96100,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94625,7 +96167,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94786,7 +96328,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -94853,7 +96395,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95013,7 +96555,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95080,7 +96622,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95237,7 +96779,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95304,7 +96846,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95481,7 +97023,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95548,7 +97090,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95585,7 +97127,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95636,7 +97178,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95757,7 +97299,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95824,7 +97366,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95861,7 +97403,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -95912,7 +97454,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96041,7 +97583,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96108,7 +97650,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96307,7 +97849,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96374,7 +97916,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96554,7 +98096,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96621,7 +98163,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96786,7 +98328,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -96853,7 +98395,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97024,7 +98566,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97091,7 +98633,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97132,7 +98674,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97183,7 +98725,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97285,7 +98827,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97352,7 +98894,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97522,7 +99064,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97589,7 +99131,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97759,7 +99301,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97826,7 +99368,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -97992,7 +99534,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98059,7 +99601,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98213,7 +99755,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98280,7 +99822,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98437,7 +99979,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98504,7 +100046,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98541,7 +100083,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98586,7 +100128,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98695,7 +100237,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98762,7 +100304,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98924,7 +100466,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -98991,7 +100533,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99031,7 +100573,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99080,7 +100622,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99180,7 +100722,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99247,7 +100789,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99404,7 +100946,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99471,7 +101013,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99629,7 +101171,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99696,7 +101238,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99850,7 +101392,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -99917,7 +101459,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100070,7 +101612,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100137,7 +101679,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100300,7 +101842,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100367,7 +101909,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100533,7 +102075,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100600,7 +102142,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100766,7 +102308,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100873,7 +102415,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -100993,7 +102535,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101091,6 +102633,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -101127,6 +102672,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -101321,7 +102869,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101388,7 +102936,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101474,7 +103022,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101536,7 +103084,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101603,7 +103151,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101769,7 +103317,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -101836,7 +103384,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102011,7 +103559,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102078,7 +103626,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102253,7 +103801,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102320,7 +103868,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102495,7 +104043,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102562,7 +104110,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102736,7 +104284,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102803,7 +104351,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -102976,7 +104524,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103043,7 +104591,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103203,7 +104751,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103270,7 +104818,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103307,7 +104855,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103345,7 +104893,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103455,7 +105003,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103522,7 +105070,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103696,7 +105244,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103763,7 +105311,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -103939,7 +105487,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104006,7 +105554,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104084,6 +105632,469 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -104182,7 +106193,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104249,7 +106260,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104412,7 +106423,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104479,7 +106490,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104634,7 +106645,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104701,7 +106712,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104856,7 +106867,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -104923,7 +106934,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105077,7 +107088,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105144,7 +107155,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105296,7 +107307,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105403,7 +107414,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105503,7 +107514,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105656,7 +107667,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -105875,6 +107886,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -105911,6 +107925,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -106016,7 +108033,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -106116,7 +108133,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -106269,7 +108286,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -106490,6 +108507,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -106526,6 +108546,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -106631,7 +108654,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -106731,7 +108754,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -106884,7 +108907,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -107101,6 +109124,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -107137,6 +109163,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -107209,7 +109238,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -107307,6 +109336,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -107343,6 +109375,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -107777,7 +109812,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -107844,7 +109879,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -107981,7 +110016,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108033,7 +110068,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108100,7 +110135,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108148,7 +110183,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108255,7 +110290,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108307,7 +110342,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108374,7 +110409,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108411,7 +110446,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108430,7 +110465,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108461,7 +110496,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108575,7 +110610,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108642,7 +110677,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108819,7 +110854,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -108886,7 +110921,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109079,7 +111114,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109146,7 +111181,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109348,7 +111383,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109415,7 +111450,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109609,7 +111644,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109676,7 +111711,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109713,7 +111748,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109759,7 +111794,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109817,7 +111852,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109858,7 +111893,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109925,7 +111960,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -109972,7 +112007,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110094,7 +112129,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110161,7 +112196,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110348,7 +112383,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110415,7 +112450,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110537,6 +112572,10 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + + @@ -110593,7 +112632,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110660,7 +112699,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110824,7 +112863,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -110891,7 +112930,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111090,7 +113129,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111157,7 +113196,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111379,7 +113418,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111446,7 +113485,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111647,7 +113686,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111714,7 +113753,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111928,7 +113967,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -111995,7 +114034,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112176,7 +114215,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112243,7 +114282,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112403,7 +114442,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112470,7 +114509,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112702,7 +114741,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112769,7 +114808,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112873,7 +114912,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112882,38 +114921,18 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -112930,10 +114949,122 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112942,6 +115073,34 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -112949,7 +115108,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -112993,7 +115152,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113060,7 +115219,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113107,7 +115266,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113219,7 +115378,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113286,7 +115445,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113323,7 +115482,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113361,7 +115520,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113459,7 +115618,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113526,7 +115685,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113563,7 +115722,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113601,7 +115760,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113700,7 +115859,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113767,7 +115926,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113921,7 +116080,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -113988,7 +116147,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114143,7 +116302,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114210,7 +116369,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114363,7 +116522,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114430,7 +116589,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114583,7 +116742,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114650,7 +116809,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114802,7 +116961,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -114909,7 +117068,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115063,7 +117222,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115216,7 +117375,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115336,7 +117495,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115434,6 +117593,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -115470,6 +117632,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -115721,7 +117886,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115788,7 +117953,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -115942,7 +118107,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116009,7 +118174,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116169,7 +118334,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116236,7 +118401,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116389,7 +118554,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116456,7 +118621,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116493,7 +118658,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116537,7 +118702,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116642,7 +118807,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116709,7 +118874,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116862,7 +119027,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -116929,7 +119094,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117083,7 +119248,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117150,7 +119315,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117310,7 +119475,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117377,7 +119542,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117529,7 +119694,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117596,7 +119761,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117633,7 +119798,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117677,7 +119842,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117782,7 +119947,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -117849,7 +120014,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118001,7 +120166,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118068,7 +120233,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118219,7 +120384,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118326,7 +120491,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118481,7 +120646,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118634,7 +120799,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118735,7 +120900,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118797,7 +120962,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -118920,7 +121085,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119018,6 +121183,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -119054,6 +121222,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -119209,7 +121380,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119347,7 +121518,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119414,7 +121585,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119566,7 +121737,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119633,7 +121804,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119793,7 +121964,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -119860,7 +122031,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120012,7 +122183,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120079,7 +122250,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120231,7 +122402,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120338,7 +122509,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120491,7 +122662,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120644,7 +122815,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120745,7 +122916,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120807,7 +122978,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120908,7 +123079,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -120970,7 +123141,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121090,7 +123261,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121188,6 +123359,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -121224,6 +123398,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -121377,7 +123554,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121416,7 +123593,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121552,7 +123729,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121619,7 +123796,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121656,7 +123833,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121694,7 +123871,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121792,7 +123969,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121859,7 +124036,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121896,7 +124073,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -121934,7 +124111,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122032,7 +124209,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122139,7 +124316,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122240,7 +124417,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122302,7 +124479,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122456,7 +124633,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122610,7 +124787,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122763,7 +124940,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122883,7 +125060,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -122981,6 +125158,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -123017,6 +125197,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -123112,7 +125295,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123337,7 +125520,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123404,7 +125587,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123557,7 +125740,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123664,7 +125847,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123817,7 +126000,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -123970,7 +126153,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -124123,7 +126306,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -124276,7 +126459,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -124396,7 +126579,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -124494,6 +126677,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -124530,6 +126716,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -124838,7 +127027,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -124905,7 +127094,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125061,7 +127250,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125169,7 +127358,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125322,7 +127511,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125475,7 +127664,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125576,7 +127765,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125639,7 +127828,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125759,7 +127948,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -125857,6 +128046,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -125893,6 +128085,9 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu + + + @@ -126048,7 +128243,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -126186,7 +128381,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + @@ -126253,7 +128448,7 @@ NOTE Translations are allowed to contain other representations in UCUM units, bu - + diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-others.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-others.xml index a39dca46df6..1efbb962f8b 100644 --- a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-others.xml +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-others.xml @@ -1,7 +1,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -199,9 +199,6 @@ - - - @@ -321,11 +318,9 @@ - + - + @@ -367,11 +362,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1911,7 +1902,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -1965,11 +1956,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -2316,7 +2305,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2370,11 +2359,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -2624,7 +2611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2678,11 +2665,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -2863,7 +2848,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2917,11 +2902,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -3102,7 +3085,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3156,11 +3139,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -3571,7 +3552,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3660,9 +3641,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -3782,11 +3760,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -4170,7 +4146,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4224,11 +4200,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -4459,7 +4433,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4513,11 +4487,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -4813,7 +4785,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4902,9 +4874,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -5024,11 +4993,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -5412,7 +5379,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5466,11 +5433,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -5701,7 +5666,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5755,11 +5720,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -6077,7 +6040,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6166,9 +6129,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -6405,11 +6365,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -6451,7 +6409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7113,7 +7071,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7167,11 +7125,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -7421,7 +7377,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7475,11 +7431,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -7850,7 +7804,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7939,9 +7893,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -8061,11 +8012,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -8107,11 +8056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9503,7 +9448,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -9557,11 +9502,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -10072,7 +10015,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -10126,11 +10069,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -10171,8 +10112,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -10454,7 +10395,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -10543,9 +10484,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -10665,11 +10603,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -11269,6 +11205,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11347,7 +11318,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11401,11 +11372,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -11443,10 +11412,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -11652,6 +11651,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11693,7 +11727,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11747,11 +11781,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -11891,7 +11923,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11945,11 +11977,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -12206,7 +12236,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12260,11 +12290,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -12993,7 +13021,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13082,9 +13110,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -13204,11 +13229,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -13338,11 +13361,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -13458,20 +13481,22 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + + + - + - + @@ -13484,14 +13509,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -13559,12 +13576,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -13583,6 +13607,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -13613,6 +13638,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -13725,7 +13753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13779,11 +13807,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -13824,7 +13850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13923,7 +13949,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13935,10 +13961,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - + @@ -13979,10 +14006,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -14063,7 +14090,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14117,11 +14144,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -14162,7 +14187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14199,7 +14224,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14282,10 +14307,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - + @@ -14326,10 +14352,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -14348,6 +14374,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -14399,7 +14428,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14453,11 +14482,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -14497,7 +14524,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14534,7 +14561,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14584,7 +14611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14609,8 +14636,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -14665,9 +14699,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -14804,7 +14838,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14850,7 +14884,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14939,9 +14973,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -15061,11 +15092,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -15107,11 +15136,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -15286,7 +15311,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -15735,7 +15760,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -15789,11 +15814,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -15866,9 +15889,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -15963,7 +15984,7 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - + @@ -16017,11 +16038,9 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - + - + @@ -16172,7 +16191,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16226,11 +16245,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -16337,7 +16354,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16374,7 +16391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16428,11 +16445,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -16497,9 +16512,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -16621,7 +16633,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16675,11 +16687,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -16827,7 +16837,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16947,9 +16957,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -16986,7 +16994,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -17040,11 +17048,9 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + - + @@ -17232,7 +17238,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -17286,11 +17292,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -17439,7 +17443,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -17493,11 +17497,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -17654,7 +17656,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -17708,11 +17710,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -17983,7 +17983,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -18037,11 +18037,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -18220,7 +18218,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -18274,11 +18272,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -18532,7 +18528,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -18578,7 +18574,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -18667,9 +18663,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -19155,11 +19148,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -19201,11 +19192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -19395,7 +19382,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -19457,7 +19444,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -19554,7 +19541,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -19963,7 +19950,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -20086,11 +20073,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -20258,7 +20243,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -20452,11 +20437,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -20607,7 +20590,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -20661,11 +20644,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -20772,7 +20753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -20809,7 +20790,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -20863,11 +20844,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -20932,9 +20911,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -21056,7 +21032,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -21110,11 +21086,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -21262,7 +21236,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -21383,9 +21357,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -21422,7 +21394,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -21476,11 +21448,9 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + - + @@ -21668,7 +21638,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -21722,11 +21692,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -21875,7 +21843,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -21929,11 +21897,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -22090,7 +22056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22144,11 +22110,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -22419,7 +22383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22473,11 +22437,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -22656,7 +22618,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22710,11 +22672,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -23293,7 +23253,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -23382,9 +23342,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -23504,11 +23461,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -23549,12 +23504,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -23629,7 +23580,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -24226,9 +24177,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -24381,7 +24330,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -24435,11 +24384,9 @@ Most code systems occasionally refine the displays defined for concepts between - + - + @@ -24483,7 +24430,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24635,7 +24582,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24689,11 +24636,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -24890,7 +24835,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24944,11 +24889,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -25071,7 +25014,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25109,7 +25052,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25163,11 +25106,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -25232,9 +25173,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -25353,7 +25291,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25407,11 +25345,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -25797,7 +25733,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25886,9 +25822,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -26044,11 +25977,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -26837,7 +26768,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26926,9 +26857,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -27048,11 +26976,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -27223,7 +27149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27272,7 +27198,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -27487,7 +27412,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27585,7 +27510,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27631,7 +27556,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27676,7 +27601,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27764,14 +27689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27840,9 +27758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27979,9 +27895,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -28004,9 +27918,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -28221,7 +28132,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -28275,11 +28186,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -28426,7 +28335,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28474,7 +28383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28554,7 +28463,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28590,7 +28499,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28626,7 +28535,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28672,7 +28581,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28726,11 +28635,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -28809,7 +28716,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28824,12 +28731,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28906,9 +28808,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -29242,52 +29142,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -29299,52 +29154,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -29526,7 +29336,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -29615,9 +29425,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -29737,11 +29544,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -29912,7 +29717,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -29961,7 +29766,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -30128,7 +29932,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30213,7 +30017,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30241,7 +30045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30327,7 +30131,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30365,7 +30169,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30408,7 +30212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30452,7 +30256,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30491,7 +30295,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30536,7 +30340,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30670,7 +30474,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30760,7 +30564,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30817,7 +30621,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30905,14 +30709,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -30991,9 +30788,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31131,9 +30926,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -31156,9 +30949,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -31374,7 +31164,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -31428,11 +31218,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -31579,7 +31367,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31627,7 +31415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31707,7 +31495,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31745,7 +31533,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31785,7 +31573,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31839,7 +31627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31893,11 +31681,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -31979,7 +31765,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31994,12 +31780,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -32088,9 +31869,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -32492,7 +32271,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -32504,7 +32283,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -32686,7 +32465,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -32775,9 +32554,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -32897,11 +32673,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -33072,7 +32846,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33121,7 +32895,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -33288,7 +33061,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33373,7 +33146,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33401,7 +33174,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33487,7 +33260,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33525,7 +33298,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33568,7 +33341,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33612,7 +33385,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33651,7 +33424,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33696,7 +33469,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33790,7 +33563,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33886,7 +33659,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33926,7 +33699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33954,7 +33727,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34039,7 +33812,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34077,7 +33850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34119,7 +33892,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34163,7 +33936,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34202,7 +33975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34247,7 +34020,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34317,7 +34090,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34407,7 +34180,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34464,7 +34237,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34552,14 +34325,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34638,9 +34404,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34778,9 +34542,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -34803,9 +34565,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -35021,7 +34780,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -35075,11 +34834,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -35226,7 +34983,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35274,7 +35031,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35354,7 +35111,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35392,7 +35149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35432,7 +35189,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35486,7 +35243,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35540,11 +35297,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -35626,7 +35381,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35641,12 +35396,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35735,9 +35485,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35940,7 +35688,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -35952,7 +35700,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -36134,7 +35882,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -36223,9 +35971,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -36345,11 +36090,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -36520,7 +36263,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36569,7 +36312,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -36736,7 +36478,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36821,7 +36563,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36849,7 +36591,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36935,7 +36677,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36973,7 +36715,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37016,7 +36758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37060,7 +36802,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37099,7 +36841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37144,7 +36886,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37237,7 +36979,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37333,7 +37075,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37373,7 +37115,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37401,7 +37143,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37486,7 +37228,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37524,7 +37266,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37566,7 +37308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37610,7 +37352,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37649,7 +37391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37694,7 +37436,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37764,7 +37506,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37854,7 +37596,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37911,7 +37653,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38007,14 +37749,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38061,14 +37796,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38124,7 +37852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38209,7 +37937,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38245,9 +37973,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -38296,7 +38024,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38333,7 +38061,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38373,7 +38101,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38387,9 +38115,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38527,9 +38253,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -38552,9 +38276,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -38770,7 +38491,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -38824,11 +38545,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -38975,7 +38694,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39023,7 +38742,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39103,7 +38822,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39141,7 +38860,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39181,7 +38900,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39235,7 +38954,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39289,11 +39008,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -39375,7 +39092,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39390,12 +39107,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39484,9 +39196,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39727,19 +39437,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -39751,19 +39449,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -39945,7 +39631,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -40034,9 +39720,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -40156,11 +39839,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -40331,7 +40012,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40380,7 +40061,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -40547,7 +40227,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40632,7 +40312,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40660,7 +40340,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40746,7 +40426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40784,7 +40464,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40827,7 +40507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40871,7 +40551,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40910,7 +40590,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40955,7 +40635,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41048,7 +40728,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41144,7 +40824,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41184,7 +40864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41212,7 +40892,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41297,7 +40977,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41335,7 +41015,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41377,7 +41057,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41421,7 +41101,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41460,7 +41140,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41505,7 +41185,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41575,7 +41255,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41665,7 +41345,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41722,7 +41402,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41818,14 +41498,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41872,14 +41545,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41935,7 +41601,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42020,7 +41686,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42056,9 +41722,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -42107,7 +41773,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42144,7 +41810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42184,7 +41850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42198,9 +41864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42338,9 +42002,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -42363,9 +42025,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -42581,7 +42240,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -42635,11 +42294,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -42786,7 +42443,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42834,7 +42491,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42914,7 +42571,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42952,7 +42609,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -42992,7 +42649,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43046,7 +42703,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43100,11 +42757,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -43186,7 +42841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43201,12 +42856,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43295,9 +42945,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43538,7 +43186,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -43550,7 +43198,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -43732,7 +43380,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -43821,9 +43469,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -43943,11 +43588,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -44118,7 +43761,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44167,7 +43810,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -44334,7 +43976,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44419,7 +44061,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44447,7 +44089,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44533,7 +44175,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44571,7 +44213,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44614,7 +44256,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44658,7 +44300,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44697,7 +44339,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44742,7 +44384,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44835,7 +44477,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44931,7 +44573,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44971,7 +44613,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44999,7 +44641,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45084,7 +44726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45122,7 +44764,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45164,7 +44806,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45208,7 +44850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45247,7 +44889,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45292,7 +44934,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45362,7 +45004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45452,7 +45094,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45509,7 +45151,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45605,14 +45247,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45659,14 +45294,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45722,7 +45350,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45807,7 +45435,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45843,9 +45471,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -45894,7 +45522,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45931,7 +45559,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45971,7 +45599,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45985,9 +45613,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46125,9 +45751,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -46150,9 +45774,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -46368,7 +45989,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -46422,11 +46043,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -46573,7 +46192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46621,7 +46240,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46701,7 +46320,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46739,7 +46358,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46779,7 +46398,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46833,7 +46452,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46887,11 +46506,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -46973,7 +46590,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46988,12 +46605,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47082,9 +46694,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47325,7 +46935,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -47337,7 +46947,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -47519,7 +47129,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -47608,9 +47218,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -47730,11 +47337,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -47905,7 +47510,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47954,7 +47559,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -48121,7 +47725,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48206,7 +47810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48234,7 +47838,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48320,7 +47924,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48358,7 +47962,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48401,7 +48005,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48445,7 +48049,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48484,7 +48088,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48529,7 +48133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48622,7 +48226,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48718,7 +48322,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48758,7 +48362,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48786,7 +48390,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48871,7 +48475,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48909,7 +48513,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48951,7 +48555,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48995,7 +48599,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49034,7 +48638,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49079,7 +48683,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49149,7 +48753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49239,7 +48843,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49296,7 +48900,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49392,14 +48996,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49446,14 +49043,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49509,7 +49099,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49594,7 +49184,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49630,9 +49220,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -49681,7 +49271,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49718,7 +49308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49757,7 +49347,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49782,9 +49372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -49922,9 +49510,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -49947,9 +49533,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -50165,7 +49748,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -50219,11 +49802,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -50370,7 +49951,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50418,7 +49999,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50498,7 +50079,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50536,7 +50117,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50576,7 +50157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50630,7 +50211,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50684,11 +50265,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -50770,7 +50349,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50785,12 +50364,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50879,9 +50453,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -51132,7 +50704,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -51144,7 +50716,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -51326,7 +50898,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -51415,9 +50987,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -51537,11 +51106,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -51712,7 +51279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -51761,7 +51328,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -51928,7 +51494,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52013,7 +51579,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52041,7 +51607,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52127,7 +51693,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52165,7 +51731,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52208,7 +51774,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52252,7 +51818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52291,7 +51857,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52336,7 +51902,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52429,7 +51995,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52525,7 +52091,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52565,7 +52131,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52593,7 +52159,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52678,7 +52244,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52716,7 +52282,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52758,7 +52324,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52802,7 +52368,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52841,7 +52407,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52886,7 +52452,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52956,7 +52522,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53046,7 +52612,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53103,7 +52669,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53199,14 +52765,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53253,14 +52812,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53306,9 +52858,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53446,9 +52996,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -53471,9 +53019,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -53689,7 +53234,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -53743,11 +53288,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -53894,7 +53437,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53942,7 +53485,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54022,7 +53565,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54060,7 +53603,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54112,7 +53655,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54166,7 +53709,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54220,11 +53763,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -54306,7 +53847,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54321,12 +53862,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54415,9 +53951,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54554,7 +54088,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -54608,7 +54142,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -54662,11 +54196,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -54750,7 +54282,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54775,7 +54307,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54871,7 +54403,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54911,7 +54443,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54939,7 +54471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55024,7 +54556,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55062,7 +54594,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55104,7 +54636,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55148,7 +54680,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55187,7 +54719,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55232,7 +54764,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55250,12 +54782,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55321,7 +54848,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55406,7 +54933,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55442,9 +54969,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -55493,7 +55020,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55530,7 +55057,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55570,7 +55097,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55584,9 +55111,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55723,7 +55248,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -55777,7 +55302,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -55831,11 +55356,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -55917,7 +55440,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55942,7 +55465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56038,7 +55561,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56078,7 +55601,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56106,7 +55629,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56191,7 +55714,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56229,7 +55752,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56271,7 +55794,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56315,7 +55838,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56354,7 +55877,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56399,7 +55922,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56417,12 +55940,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56488,7 +56006,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56573,7 +56091,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56609,9 +56127,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -56660,7 +56178,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56697,7 +56215,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56737,7 +56255,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56751,9 +56269,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57173,7 +56689,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -57185,7 +56701,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -57367,7 +56883,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -57456,9 +56972,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -57578,11 +57091,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -57753,7 +57264,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57802,7 +57313,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -57969,7 +57479,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58054,7 +57564,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58082,7 +57592,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58168,7 +57678,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58206,7 +57716,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58249,7 +57759,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58293,7 +57803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58332,7 +57842,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58377,7 +57887,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58470,7 +57980,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58566,7 +58076,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58606,7 +58116,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58634,7 +58144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58719,7 +58229,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58757,7 +58267,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58799,7 +58309,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58843,7 +58353,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58882,7 +58392,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58927,7 +58437,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58997,7 +58507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59087,7 +58597,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59144,7 +58654,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59240,14 +58750,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59294,14 +58797,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59357,7 +58853,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59442,7 +58938,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59478,9 +58974,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -59529,7 +59025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59566,7 +59062,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59605,7 +59101,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59630,9 +59126,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59770,9 +59264,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -59795,9 +59287,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -60013,7 +59502,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -60067,11 +59556,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -60218,7 +59705,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60266,7 +59753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60346,7 +59833,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60384,7 +59871,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60424,7 +59911,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60478,7 +59965,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60532,11 +60019,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -60618,7 +60103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60633,12 +60118,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60727,9 +60207,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60980,7 +60458,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -60992,7 +60470,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -61174,7 +60652,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -61263,9 +60741,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -61385,11 +60860,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -61560,7 +61033,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -61609,7 +61082,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -61776,7 +61248,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -61861,7 +61333,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -61889,7 +61361,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -61975,7 +61447,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62013,7 +61485,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62056,7 +61528,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62100,7 +61572,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62139,7 +61611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62184,7 +61656,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62277,7 +61749,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62373,7 +61845,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62413,7 +61885,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62441,7 +61913,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62526,7 +61998,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62564,7 +62036,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62606,7 +62078,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62650,7 +62122,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62689,7 +62161,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62734,7 +62206,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62804,7 +62276,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62894,7 +62366,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62951,7 +62423,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63047,14 +62519,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63101,14 +62566,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63164,7 +62622,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63249,7 +62707,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63285,9 +62743,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -63336,7 +62794,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63373,7 +62831,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63412,7 +62870,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63437,9 +62895,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63577,9 +63033,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -63602,9 +63056,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -63820,7 +63271,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -63874,11 +63325,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -64025,7 +63474,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64073,7 +63522,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64153,7 +63602,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64191,7 +63640,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64231,7 +63680,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64285,7 +63734,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64339,11 +63788,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -64425,7 +63872,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64440,12 +63887,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64534,9 +63976,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64787,7 +64227,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -64799,7 +64239,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -64981,7 +64421,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -65070,9 +64510,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -65192,11 +64629,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -65367,7 +64802,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65416,7 +64851,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -65583,7 +65017,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65668,7 +65102,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65696,7 +65130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65782,7 +65216,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65820,7 +65254,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65863,7 +65297,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65907,7 +65341,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65946,7 +65380,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65991,7 +65425,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66084,7 +65518,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66180,7 +65614,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66220,7 +65654,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66248,7 +65682,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66333,7 +65767,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66371,7 +65805,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66413,7 +65847,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66457,7 +65891,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66496,7 +65930,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66541,7 +65975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66611,7 +66045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66701,7 +66135,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66758,7 +66192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66854,14 +66288,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66908,14 +66335,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -66971,7 +66391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67056,7 +66476,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67092,9 +66512,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -67143,7 +66563,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67180,7 +66600,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67219,7 +66639,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67244,9 +66664,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67384,9 +66802,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -67409,9 +66825,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -67627,7 +67040,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -67681,11 +67094,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -67832,7 +67243,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67880,7 +67291,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67960,7 +67371,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67998,7 +67409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68038,7 +67449,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68092,7 +67503,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68146,11 +67557,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -68232,7 +67641,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68247,12 +67656,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68341,9 +67745,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68594,7 +67996,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -68606,7 +68008,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -68788,7 +68190,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -68877,9 +68279,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -68999,11 +68398,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -69174,7 +68571,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69223,7 +68620,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -69390,7 +68786,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69475,7 +68871,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69503,7 +68899,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69589,7 +68985,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69627,7 +69023,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69670,7 +69066,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69714,7 +69110,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69753,7 +69149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69798,7 +69194,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69891,7 +69287,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69987,7 +69383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70027,7 +69423,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70055,7 +69451,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70140,7 +69536,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70178,7 +69574,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70220,7 +69616,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70264,7 +69660,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70303,7 +69699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70348,7 +69744,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70418,7 +69814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70508,7 +69904,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70565,7 +69961,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70661,14 +70057,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70715,14 +70104,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70778,7 +70160,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70863,7 +70245,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70899,9 +70281,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -70950,7 +70332,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70987,7 +70369,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71027,7 +70409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71041,9 +70423,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71181,9 +70561,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -71206,9 +70584,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -71424,7 +70799,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -71478,11 +70853,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -71629,7 +71002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71677,7 +71050,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71757,7 +71130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71795,7 +71168,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71835,7 +71208,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71889,7 +71262,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71943,11 +71316,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -72029,7 +71400,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -72044,12 +71415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -72138,9 +71504,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -72476,7 +71840,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -72565,9 +71929,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -72793,11 +72154,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -72839,11 +72198,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -74226,7 +73581,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -74315,9 +73670,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -74579,11 +73931,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -74625,11 +73975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -75744,7 +75090,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -75805,8 +75151,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -75828,9 +75175,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -75840,6 +75187,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -75863,7 +75245,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -75888,7 +75270,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -75914,33 +75296,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -75965,12 +75321,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + + @@ -75995,7 +75351,34 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -76101,7 +75484,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76191,7 +75574,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76243,7 +75626,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76374,7 +75757,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76826,7 +76209,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76915,9 +76298,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -77179,11 +76559,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -77225,11 +76603,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -78295,7 +77669,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -78356,8 +77730,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -78377,9 +77752,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -78389,6 +77764,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78412,7 +77822,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -78438,7 +77848,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -78464,34 +77874,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -78515,13 +77898,14 @@ In some cases, the resource can no longer be found at the stated url, but the ur + - + - - + + @@ -78544,7 +77928,35 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78729,14 +78141,18 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + + + + + @@ -78840,7 +78256,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -78929,9 +78345,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -79193,11 +78606,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -79239,11 +78650,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80358,7 +79765,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80419,8 +79826,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -80442,9 +79850,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -80454,6 +79862,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80477,7 +79920,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80502,7 +79945,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80528,33 +79971,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -80579,12 +79996,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + + @@ -80609,7 +80026,34 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -80722,7 +80166,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80812,7 +80256,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80864,7 +80308,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -80995,7 +80439,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -81296,7 +80740,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -81387,7 +80831,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -81439,7 +80883,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -81570,7 +81014,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -81972,7 +81416,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -82061,9 +81505,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -82325,11 +81766,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -82371,11 +81810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83490,7 +82925,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -83551,8 +82986,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -83574,9 +83010,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -83586,6 +83022,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -83609,7 +83080,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -83634,7 +83105,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -83660,33 +83131,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -83711,12 +83156,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + + @@ -83741,7 +83186,34 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -83854,7 +83326,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -83944,7 +83416,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -83996,7 +83468,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -84127,7 +83599,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -84428,7 +83900,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -84519,7 +83991,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -84571,7 +84043,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -84702,7 +84174,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85003,7 +84475,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85094,7 +84566,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85146,7 +84618,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85277,7 +84749,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85700,7 +85172,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -85789,9 +85261,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -86053,11 +85522,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -86099,11 +85566,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -87218,7 +86681,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87279,8 +86742,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -87302,9 +86766,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -87314,6 +86778,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87337,7 +86836,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87362,7 +86861,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87388,33 +86887,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -87439,12 +86912,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + + @@ -87469,7 +86942,34 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -87582,7 +87082,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87672,7 +87172,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87724,7 +87224,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -87855,7 +87355,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88156,7 +87656,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88248,7 +87748,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88300,7 +87800,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88431,7 +87931,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88841,7 +88341,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -88930,9 +88430,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -89158,11 +88655,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -89204,11 +88699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -90411,7 +89902,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -90502,7 +89993,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -90554,7 +90045,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -90685,7 +90176,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -90986,7 +90477,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -91077,7 +90568,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -91129,7 +90620,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -91260,7 +90751,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -91710,7 +91201,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -91799,9 +91290,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -92135,11 +91623,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -92181,11 +91667,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -93300,7 +92782,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -93361,8 +92843,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + @@ -93384,9 +92867,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -93396,6 +92879,41 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93419,7 +92937,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -93444,7 +92962,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -93470,33 +92988,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -93521,12 +93013,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + + @@ -93551,7 +93043,34 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93755,6 +93274,5482 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93926,7 +98921,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -94015,9 +99010,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -94137,11 +99129,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -94355,9 +99345,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -94413,9 +99400,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -94464,6 +99448,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -94789,7 +99774,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95020,6 +100005,38 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -95054,9 +100071,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -95104,7 +100121,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95158,11 +100175,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -95202,10 +100217,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -95234,8 +100249,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -95359,9 +100374,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -95719,7 +100731,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95808,9 +100820,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -95930,11 +100939,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -96105,7 +101112,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96154,7 +101161,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -96343,6 +101349,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -96383,7 +101391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96473,7 +101481,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96527,7 +101535,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96623,14 +101631,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96676,14 +101677,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96738,7 +101732,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96823,7 +101817,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96860,9 +101854,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -96912,7 +101906,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96949,7 +101943,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96989,7 +101983,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97003,9 +101997,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97142,9 +102134,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -97167,9 +102157,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -97385,7 +102372,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -97439,11 +102426,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -97612,7 +102597,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97660,7 +102645,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97740,7 +102725,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97778,7 +102763,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97818,7 +102803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97864,7 +102849,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97918,11 +102903,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -98001,7 +102984,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98016,12 +102999,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98098,9 +103076,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98587,7 +103563,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -98676,9 +103652,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -98798,11 +103771,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -98973,7 +103944,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99022,7 +103993,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -99211,6 +104181,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -99251,7 +104223,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99341,7 +104313,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99395,7 +104367,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99491,14 +104463,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99544,14 +104509,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99596,9 +104554,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -99735,9 +104691,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -99760,9 +104714,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -99978,7 +104929,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -100032,11 +104983,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -100185,7 +105134,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100233,7 +105182,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100313,7 +105262,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100351,7 +105300,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100391,7 +105340,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100437,7 +105386,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100491,11 +105440,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -100574,7 +105521,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100589,12 +105536,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100671,9 +105613,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101105,7 +106045,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -101194,9 +106134,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -101316,11 +106253,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -101491,7 +106426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101540,7 +106475,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -101729,6 +106663,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -101769,7 +106705,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101859,7 +106795,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101913,7 +106849,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102009,14 +106945,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102062,14 +106991,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102114,9 +107036,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102253,9 +107173,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -102278,9 +107196,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -102496,7 +107411,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -102550,11 +107465,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -102724,7 +107637,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102772,7 +107685,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102852,7 +107765,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102890,7 +107803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102930,7 +107843,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102976,7 +107889,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103030,11 +107943,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -103113,7 +108024,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103128,12 +108039,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103210,9 +108116,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103651,7 +108555,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -103740,9 +108644,6 @@ The alternate way is to use the value element for actual observations and use th - - - @@ -103862,11 +108763,9 @@ The alternate way is to use the value element for actual observations and use th - + - + @@ -104037,7 +108936,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104086,7 +108985,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -104268,6 +109166,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -104308,7 +109208,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104398,7 +109298,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104452,7 +109352,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104548,14 +109448,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104601,14 +109494,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104653,9 +109539,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104792,9 +109676,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -104817,9 +109699,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -105035,7 +109914,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -105089,11 +109968,9 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + - + @@ -105262,7 +110139,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105310,7 +110187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105390,7 +110267,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105428,7 +110305,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105468,7 +110345,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105514,7 +110391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105568,11 +110445,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -105651,7 +110526,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105666,12 +110541,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105748,9 +110618,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -106032,9 +110900,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -106167,7 +111033,7 @@ The base Composition is a general resource for compositions or documents about a - + @@ -106256,9 +111122,6 @@ The base Composition is a general resource for compositions or documents about a - - - @@ -106415,11 +111278,9 @@ The base Composition is a general resource for compositions or documents about a - + - + @@ -106506,11 +111367,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -106781,7 +111640,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -107017,7 +111876,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -107071,11 +111930,9 @@ Some reporting work flows require that the original narrative of a final documen - + - + @@ -107126,7 +111983,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107143,9 +112000,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -107289,7 +112146,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107315,205 +112172,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -107568,7 +112226,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107622,11 +112280,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -107851,7 +112507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107905,11 +112561,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -107990,9 +112644,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -108546,7 +113198,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -108635,9 +113287,6 @@ If the section has content (instead of sub-sections), the section.code does not - - - @@ -108793,11 +113442,9 @@ If the section has content (instead of sub-sections), the section.code does not - + - + @@ -108884,11 +113531,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -109159,7 +113804,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -109396,7 +114041,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -109450,11 +114095,9 @@ Some reporting work flows require that the original narrative of a final documen - + - + @@ -109505,7 +114148,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -109522,9 +114165,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -109668,7 +114311,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -109694,205 +114337,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -109947,7 +114391,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -110001,11 +114445,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -110230,7 +114672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -110284,11 +114726,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -110369,9 +114809,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -110618,10 +115056,10 @@ If the section has content (instead of sub-sections), the section.code does not - - + + - + @@ -110630,7 +115068,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -110812,17 +115250,6 @@ If the section has content (instead of sub-sections), the section.code does not - - - - - - - - - - - @@ -110925,7 +115352,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -111014,9 +115441,6 @@ If the section has content (instead of sub-sections), the section.code does not - - - @@ -111136,11 +115560,9 @@ If the section has content (instead of sub-sections), the section.code does not - + - + @@ -111182,11 +115604,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -112329,7 +116747,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -112383,11 +116801,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -112690,7 +117106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -112744,11 +117160,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -112828,6 +117242,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -112844,6 +117259,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + @@ -112934,7 +117361,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -112988,11 +117415,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -113134,7 +117559,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -113188,11 +117613,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -113395,7 +117818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -113449,11 +117872,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -113491,10 +117912,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -113802,9 +118253,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -113927,7 +118376,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -113981,11 +118430,9 @@ In addition, because the subject needs to be resolved during realization, use of - + - + @@ -114145,7 +118592,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -114199,11 +118646,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -114384,7 +118829,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -114438,11 +118883,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -114616,7 +119059,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -114670,11 +119113,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -114932,7 +119373,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -114986,11 +119427,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -115443,7 +119882,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115455,6 +119894,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -115558,7 +119998,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115612,11 +120052,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -115657,8 +120095,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -115939,7 +120377,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -116028,9 +120466,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -116186,11 +120621,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -116232,11 +120665,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -117373,7 +121802,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -117427,11 +121856,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -117734,7 +122161,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -117788,11 +122215,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -117872,6 +122297,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -117888,6 +122314,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + @@ -117978,7 +122416,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118032,11 +122470,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -118178,7 +122614,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118232,11 +122668,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -118439,7 +122873,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118493,11 +122927,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -118535,10 +122967,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -118846,9 +123308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118971,7 +123431,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -119025,11 +123485,9 @@ In addition, because the subject needs to be resolved during realization, use of - + - + @@ -119189,7 +123647,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119243,11 +123701,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -119428,7 +123884,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119482,11 +123938,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -119660,7 +124114,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119714,11 +124168,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -119976,7 +124428,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -120030,11 +124482,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -120487,7 +124937,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -120499,6 +124949,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -120602,7 +125053,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -120656,11 +125107,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -120701,8 +125150,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -120956,7 +125405,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -121045,9 +125494,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -121167,11 +125613,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -121213,11 +125657,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -122354,7 +126794,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -122408,11 +126848,9 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -122715,7 +127153,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -122769,11 +127207,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -122853,6 +127289,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -122869,6 +127306,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + @@ -122959,7 +127408,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -123013,11 +127462,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -123159,7 +127606,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -123213,11 +127660,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -123420,7 +127865,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -123474,11 +127919,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -123516,10 +127959,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -123827,9 +128300,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -123952,7 +128423,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -124006,11 +128477,9 @@ In addition, because the subject needs to be resolved during realization, use of - + - + @@ -124170,7 +128639,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124224,11 +128693,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -124409,7 +128876,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124463,11 +128930,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -124641,7 +129106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124695,11 +129160,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -124957,7 +129420,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -125011,11 +129474,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -125468,7 +129929,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -125480,6 +129941,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -125583,7 +130045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -125637,11 +130099,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -125682,8 +130142,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -126017,7 +130477,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126163,11 +130623,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -126268,7 +130726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126438,7 +130896,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126520,7 +130978,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126627,7 +131085,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126711,7 +131169,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126728,7 +131186,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126857,7 +131315,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127232,7 +131690,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127294,7 +131752,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127503,7 +131961,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127588,7 +132046,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127621,7 +132079,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127692,7 +132150,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127715,7 +132173,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127737,7 +132195,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127759,7 +132217,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127777,10 +132235,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127863,6 +132318,9 @@ This element should only be used on child elements of complex data elements."> + + + @@ -127899,6 +132357,9 @@ This element should only be used on child elements of complex data elements."> + + + @@ -127967,8 +132428,7 @@ This element should only be used on child elements of complex data elements."> - + @@ -128112,6 +132572,9 @@ This element should only be used on child elements of complex data elements."> + + + @@ -128148,6 +132611,9 @@ This element should only be used on child elements of complex data elements."> + + + @@ -128215,17 +132681,7 @@ This element should only be used on child elements of complex data elements."> - + @@ -128309,6 +132765,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -128345,6 +132804,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -128449,7 +132911,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -128629,6 +133091,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -128665,6 +133130,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -128734,7 +133202,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -128791,7 +133259,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -128967,7 +133435,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129112,7 +133580,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129165,7 +133633,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129463,7 +133931,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129526,7 +133994,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129550,7 +134018,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129711,7 +134179,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -129825,7 +134293,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -130156,7 +134624,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -130245,9 +134713,6 @@ When pattern[x] is used to constrain a complex object, it means that each proper - - - @@ -130367,11 +134832,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + - + @@ -130409,20 +134872,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - - - + + + + + - - - + + + - + @@ -130439,7 +134903,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130464,20 +134928,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - + + + - - - + + + - + @@ -130494,8 +134959,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -130510,6 +134975,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + @@ -130538,9 +135007,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -130588,9 +135054,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -130607,21 +135070,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + + - + + + + @@ -130716,7 +135182,151 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130730,13 +135340,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + @@ -130753,16 +135360,60 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130784,8 +135435,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -130798,8 +135449,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130811,7 +135461,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130833,6 +135483,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -130909,9 +135560,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130974,7 +135623,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -131028,11 +135677,9 @@ For example, an activity may be initiated by one user for other users or involve - + - + @@ -131073,8 +135720,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + @@ -131103,7 +135751,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131135,9 +135783,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -131195,23 +135843,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + - + - + + @@ -131239,7 +135888,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131250,108 +135899,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + @@ -131378,8 +135942,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -131412,10 +135976,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131428,8 +135989,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -131470,20 +136031,28 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + + - + - + + + + + + + + @@ -131496,278 +136065,34 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + @@ -131789,7 +136114,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131799,9 +136124,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131811,8 +136134,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -131862,7 +136185,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131916,11 +136239,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -131971,7 +136292,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -132012,11 +136334,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + + @@ -132056,7 +136379,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132073,8 +136396,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -132115,14 +136438,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -132161,7 +136476,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132215,11 +136530,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -132261,6 +136574,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -132293,72 +136607,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -132372,7 +136627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132386,9 +136641,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -132413,65 +136665,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -132486,7 +136679,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132523,56 +136716,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -132584,7 +136732,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -132662,7 +136809,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132716,11 +136863,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -132770,7 +136915,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132783,6 +136928,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -132800,7 +136953,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -132809,9 +136961,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132839,6 +137018,43 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132846,12 +137062,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + + @@ -132862,8 +137078,17 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + + + + + + + + + @@ -132890,20 +137115,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - + + @@ -132930,18 +137143,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -133106,7 +137311,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133195,9 +137400,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -133317,11 +137519,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -133454,11 +137654,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -133574,19 +137774,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + - + - + @@ -133599,14 +137801,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -133676,12 +137870,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -133700,6 +137901,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -133730,6 +137932,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -133834,7 +138039,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133888,11 +138093,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -133933,7 +138136,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133964,7 +138167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134035,7 +138238,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134047,10 +138250,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - + @@ -134091,10 +138295,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -134113,6 +138317,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -134164,7 +138371,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134218,11 +138425,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -134262,7 +138467,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134299,7 +138504,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134349,7 +138554,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134374,6 +138579,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + @@ -134432,8 +138641,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-resources.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-resources.xml index c15b5fdb64a..4563cef85eb 100644 --- a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-resources.xml +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-resources.xml @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -91,6 +91,7 @@ + @@ -130,6 +131,12 @@ + + + + + + @@ -189,7 +196,8 @@ - + + @@ -225,6 +233,12 @@ + + + + + + @@ -375,9 +389,9 @@ - - + + @@ -393,8 +407,8 @@ - - + + @@ -402,12 +416,6 @@ - - - - - - @@ -420,6 +428,12 @@ + + + + + + @@ -742,6 +756,7 @@ + @@ -749,9 +764,11 @@ + + @@ -795,6 +812,12 @@ + + + + + + @@ -843,12 +866,24 @@ + + + + + + + + + + + + @@ -901,6 +936,8 @@ + + @@ -944,6 +981,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -997,35 +1087,29 @@ - - - - - - - - - - - - + + + + + + - + @@ -1039,48 +1123,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1099,6 +1147,12 @@ + + + + + + @@ -1279,9 +1333,21 @@ + + + + + + + + + + + + @@ -1838,6 +1904,7 @@ + @@ -2014,6 +2081,14 @@ + + + + + + + + @@ -2032,7 +2107,9 @@ + + @@ -2085,92 +2162,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2949,7 +2940,7 @@ - + @@ -2982,6 +2973,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3719,9 +3822,8 @@ - + - @@ -3741,12 +3843,6 @@ - - - - - - @@ -3802,8 +3898,8 @@ - - + + @@ -4035,6 +4131,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4482,12 +4781,6 @@ - - - - - - @@ -5048,6 +5341,7 @@ + @@ -5059,10 +5353,12 @@ + + @@ -5073,6 +5369,8 @@ + + @@ -5099,12 +5397,16 @@ + + + + @@ -5128,6 +5430,7 @@ + @@ -5191,6 +5494,18 @@ + + + + + + + + + + + + @@ -5300,10 +5615,10 @@ - + + - @@ -5658,7 +5973,6 @@ - @@ -5669,13 +5983,7 @@ - - - - - - - + @@ -6271,7 +6579,7 @@ - + @@ -6361,7 +6669,7 @@ - + @@ -8009,6 +8317,17 @@ + + + + + + + + + + + @@ -8036,7 +8355,9 @@ + + @@ -8045,6 +8366,8 @@ + + @@ -8263,12 +8586,13 @@ + + - @@ -8277,6 +8601,8 @@ + + @@ -8360,6 +8686,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8409,6 +8834,7 @@ + @@ -9040,18 +9466,10 @@ - - + - - - - - - - @@ -9064,12 +9482,6 @@ - - - - - - @@ -9089,14 +9501,14 @@ - - - - + + + + - - + + @@ -9824,11 +10236,12 @@ + - + @@ -9846,6 +10259,8 @@ + + @@ -9855,6 +10270,7 @@ + @@ -9948,12 +10364,7 @@ - + @@ -10008,14 +10419,8 @@ Requires the near-distance parameter to be provided also"> - - - - - - - + @@ -10025,8 +10430,8 @@ Requires the near-distance parameter to be provided also"> - - + + @@ -10358,9 +10763,11 @@ Requires the near-distance parameter to be provided also"> - + + + @@ -10368,6 +10775,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -10384,12 +10793,6 @@ Requires the near-distance parameter to be provided also"> - - - - - - @@ -10420,6 +10823,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -10613,6 +11022,7 @@ Requires the near-distance parameter to be provided also"> + @@ -10675,6 +11085,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -10699,6 +11115,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -10746,10 +11168,8 @@ Requires the near-distance parameter to be provided also"> - - @@ -10762,12 +11182,6 @@ Requires the near-distance parameter to be provided also"> - - - - - - @@ -11159,20 +11573,16 @@ Requires the near-distance parameter to be provided also"> - - + + + - + + - - - - - - @@ -11182,8 +11592,8 @@ Requires the near-distance parameter to be provided also"> - - + + @@ -11227,6 +11637,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -12086,6 +12502,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -12093,6 +12511,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -12428,7 +12852,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -12746,13 +13170,14 @@ Requires the near-distance parameter to be provided also"> + + - @@ -12808,10 +13233,11 @@ Requires the near-distance parameter to be provided also"> + + - @@ -12820,10 +13246,9 @@ Requires the near-distance parameter to be provided also"> - + - @@ -12852,6 +13277,7 @@ Requires the near-distance parameter to be provided also"> + @@ -12859,7 +13285,6 @@ Requires the near-distance parameter to be provided also"> - @@ -13119,8 +13544,8 @@ Requires the near-distance parameter to be provided also"> - + @@ -13149,12 +13574,6 @@ Requires the near-distance parameter to be provided also"> - - - - - - @@ -13167,6 +13586,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -13237,6 +13662,7 @@ Requires the near-distance parameter to be provided also"> + @@ -13244,13 +13670,16 @@ Requires the near-distance parameter to be provided also"> + + + @@ -13300,13 +13729,13 @@ Requires the near-distance parameter to be provided also"> + - @@ -13317,7 +13746,9 @@ Requires the near-distance parameter to be provided also"> + + @@ -13333,6 +13764,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -13387,6 +13820,7 @@ Requires the near-distance parameter to be provided also"> + @@ -13396,6 +13830,7 @@ Requires the near-distance parameter to be provided also"> + @@ -13430,7 +13865,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -13514,7 +13949,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -13811,6 +14246,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -13821,6 +14258,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -13833,6 +14276,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -13875,6 +14324,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -13923,6 +14378,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -13977,7 +14438,8 @@ Requires the near-distance parameter to be provided also"> - + + @@ -14188,17 +14650,18 @@ Requires the near-distance parameter to be provided also"> + + - @@ -14226,6 +14689,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -14252,6 +14717,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -14302,7 +14769,6 @@ Requires the near-distance parameter to be provided also"> - @@ -14327,6 +14793,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -14357,6 +14829,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -14466,17 +14944,18 @@ Requires the near-distance parameter to be provided also"> + + - @@ -14563,7 +15042,6 @@ Requires the near-distance parameter to be provided also"> - @@ -14706,6 +15184,8 @@ Requires the near-distance parameter to be provided also"> + + @@ -15365,6 +15845,7 @@ Requires the near-distance parameter to be provided also"> + @@ -15374,10 +15855,12 @@ Requires the near-distance parameter to be provided also"> + + @@ -15433,9 +15916,11 @@ Requires the near-distance parameter to be provided also"> + + @@ -15445,6 +15930,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -15529,6 +16020,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -16313,6 +16810,7 @@ Requires the near-distance parameter to be provided also"> + @@ -16579,12 +17077,15 @@ Requires the near-distance parameter to be provided also"> + + + @@ -16617,8 +17118,8 @@ Requires the near-distance parameter to be provided also"> - - + + @@ -16703,7 +17204,6 @@ Requires the near-distance parameter to be provided also"> - @@ -17255,7 +17755,6 @@ Requires the near-distance parameter to be provided also"> - @@ -17269,10 +17768,10 @@ Requires the near-distance parameter to be provided also"> - - - - + + + + @@ -17280,12 +17779,6 @@ Requires the near-distance parameter to be provided also"> - - - - - - @@ -17360,12 +17853,15 @@ Requires the near-distance parameter to be provided also"> - + + + + @@ -17488,10 +17984,10 @@ Requires the near-distance parameter to be provided also"> - - + + - + @@ -17908,9 +18404,12 @@ Requires the near-distance parameter to be provided also"> + + + @@ -18437,6 +18936,10 @@ Requires the near-distance parameter to be provided also"> + + + + @@ -18956,6 +19459,12 @@ Requires the near-distance parameter to be provided also"> + + + + + + @@ -18965,7 +19474,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -19342,6 +19851,14 @@ Requires the near-distance parameter to be provided also"> + + + + + + + + @@ -19442,6 +19959,10 @@ Requires the near-distance parameter to be provided also"> + + + + @@ -19468,14 +19989,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -19516,14 +20037,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -19558,6 +20079,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -19589,9 +20113,6 @@ Requires the near-distance parameter to be provided also"> - - - @@ -19616,6 +20137,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -19642,6 +20166,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -19762,6 +20289,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20034,14 +20564,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -20073,6 +20603,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20104,9 +20637,6 @@ Requires the near-distance parameter to be provided also"> - - - @@ -20128,6 +20658,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20152,6 +20685,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20264,6 +20800,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20531,14 +21070,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -20577,6 +21116,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20615,9 +21157,6 @@ Requires the near-distance parameter to be provided also"> - - - @@ -20641,6 +21180,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20672,6 +21214,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -20708,7 +21253,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -20726,7 +21271,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -20806,6 +21351,10 @@ Requires the near-distance parameter to be provided also"> + + + + @@ -21104,14 +21653,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -21149,6 +21698,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21183,9 +21735,6 @@ Requires the near-distance parameter to be provided also"> - - - @@ -21212,6 +21761,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21241,6 +21793,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21369,6 +21924,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21662,14 +22220,14 @@ Requires the near-distance parameter to be provided also"> - + - + @@ -21705,6 +22263,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21738,9 +22299,6 @@ Requires the near-distance parameter to be provided also"> - - - @@ -21762,6 +22320,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21789,6 +22350,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -21903,6 +22467,9 @@ Requires the near-distance parameter to be provided also"> + + + @@ -22174,7 +22741,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22188,7 +22755,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22309,7 +22876,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22323,7 +22890,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22360,7 +22927,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22374,7 +22941,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22389,11 +22956,7 @@ Requires the near-distance parameter to be provided also"> - + @@ -22455,7 +23018,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22469,7 +23032,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22484,15 +23047,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22538,7 +23093,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22552,7 +23107,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22604,7 +23159,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22618,7 +23173,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22662,7 +23217,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22676,7 +23231,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22691,11 +23246,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22757,7 +23308,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22771,7 +23322,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22786,15 +23337,7 @@ If the capability statements can be successfully compared, then the return value - + @@ -22840,7 +23383,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22854,7 +23397,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22906,7 +23449,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22920,7 +23463,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22964,7 +23507,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22978,7 +23521,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -22993,7 +23536,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23033,7 +23576,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23047,7 +23590,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23091,7 +23634,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23105,7 +23648,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23117,22 +23660,7 @@ If the capability statements match by these rules, then the return value is a 20 - + @@ -23367,7 +23895,7 @@ The find-matches operation is still preliminary. The interface can be expected t - + @@ -23381,7 +23909,7 @@ The find-matches operation is still preliminary. The interface can be expected t - + @@ -23393,9 +23921,7 @@ The find-matches operation is still preliminary. The interface can be expected t - + @@ -23627,7 +24153,7 @@ When invoking this operation, a client SHALL provide both a system and a code, e - + @@ -23641,7 +24167,7 @@ When invoking this operation, a client SHALL provide both a system and a code, e - + @@ -23653,9 +24179,7 @@ When invoking this operation, a client SHALL provide both a system and a code, e - + @@ -23734,7 +24258,7 @@ When invoking this operation, a client SHALL provide both A and B codes, either - + @@ -23748,7 +24272,7 @@ When invoking this operation, a client SHALL provide both A and B codes, either - + @@ -23760,9 +24284,7 @@ When invoking this operation, a client SHALL provide both A and B codes, either - + @@ -23838,9 +24360,7 @@ When invoking this operation, a client SHALL provide one (and only one) of the p - + @@ -23884,7 +24404,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -23898,7 +24418,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -23923,13 +24443,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -23957,7 +24471,7 @@ Notes: - + @@ -23971,7 +24485,7 @@ Notes: - + @@ -24031,7 +24545,7 @@ Notes: - + @@ -24045,7 +24559,7 @@ Notes: - + @@ -24057,11 +24571,7 @@ Notes: - + @@ -24184,11 +24694,7 @@ The operation returns a set of parameters including a 'result' for whether there - + @@ -24287,13 +24793,422 @@ Any provided dependency parameters are matched against ConceptMap.group.element. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -24307,7 +25222,7 @@ Any provided dependency parameters are matched against ConceptMap.group.element. - + @@ -24351,7 +25266,7 @@ Any provided dependency parameters are matched against ConceptMap.group.element. - + @@ -24365,7 +25280,7 @@ Any provided dependency parameters are matched against ConceptMap.group.element. - + @@ -24377,16 +25292,10 @@ Any provided dependency parameters are matched against ConceptMap.group.element. - + - + @@ -24423,7 +25332,7 @@ server whether to retrieve it or return an error."> - + @@ -24437,7 +25346,7 @@ server whether to retrieve it or return an error."> - + @@ -24449,21 +25358,10 @@ server whether to retrieve it or return an error."> - + - + @@ -24509,7 +25407,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24523,7 +25421,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24535,21 +25433,10 @@ The _since parameter is provided to support periodic queries to get additional i - + - + @@ -24611,7 +25498,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24625,7 +25512,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24670,7 +25557,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24684,7 +25571,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24729,7 +25616,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24743,7 +25630,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24813,7 +25700,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24827,7 +25714,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24923,7 +25810,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24937,7 +25824,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -24990,7 +25877,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25004,7 +25891,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25100,7 +25987,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25114,7 +26001,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25159,7 +26046,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25173,7 +26060,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25188,16 +26075,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25235,7 +26113,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25249,7 +26127,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25261,49 +26139,10 @@ The _since parameter is provided to support periodic queries to get additional i - + - + @@ -25349,7 +26188,7 @@ The following rules apply when using the $process-message operation asynchronous - + @@ -25363,7 +26202,7 @@ The following rules apply when using the $process-message operation asynchronous - + @@ -25375,19 +26214,10 @@ The following rules apply when using the $process-message operation asynchronous - + - + @@ -25431,7 +26261,7 @@ If the server wishes, it can also look through all code systems and value sets i - + @@ -25445,7 +26275,7 @@ If the server wishes, it can also look through all code systems and value sets i - + @@ -25457,23 +26287,10 @@ If the server wishes, it can also look through all code systems and value sets i - + - + @@ -25571,7 +26388,7 @@ If the server wishes, it can also look through all code systems and value sets i - + @@ -25585,7 +26402,7 @@ If the server wishes, it can also look through all code systems and value sets i - + @@ -25597,45 +26414,10 @@ If the server wishes, it can also look through all code systems and value sets i - + - + @@ -25665,7 +26447,7 @@ The set of returned observations should represent distinct real world observatio - + @@ -25679,7 +26461,7 @@ The set of returned observations should represent distinct real world observatio - + @@ -25691,31 +26473,10 @@ The set of returned observations should represent distinct real world observatio - + - + @@ -25733,7 +26494,7 @@ The set of returned observations should represent distinct real world observatio - + @@ -25824,7 +26585,7 @@ The set of returned observations should represent distinct real world observatio - + @@ -25838,7 +26599,7 @@ The set of returned observations should represent distinct real world observatio - + @@ -25850,23 +26611,10 @@ The set of returned observations should represent distinct real world observatio - + - + @@ -25928,7 +26676,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25942,7 +26690,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -25954,9 +26702,7 @@ The _since parameter is provided to support periodic queries to get additional i - + @@ -26005,7 +26751,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26019,7 +26765,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26148,7 +26894,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26162,7 +26908,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26199,7 +26945,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26213,7 +26959,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26228,21 +26974,7 @@ To ask an MPI to match a patient, clients use the "$match" operation, - + @@ -26272,7 +27004,7 @@ Implementers are encouraged to provide feedback to HL7 about their use of this o - + @@ -26286,7 +27018,7 @@ Implementers are encouraged to provide feedback to HL7 about their use of this o - + @@ -26330,7 +27062,7 @@ Implementers are encouraged to provide feedback to HL7 about their use of this o - + @@ -26344,7 +27076,7 @@ Implementers are encouraged to provide feedback to HL7 about their use of this o - + @@ -26356,9 +27088,7 @@ Implementers are encouraged to provide feedback to HL7 about their use of this o - + @@ -26389,7 +27119,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26403,7 +27133,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26415,11 +27145,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26444,7 +27170,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26458,7 +27184,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26502,7 +27228,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26516,7 +27242,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26560,7 +27286,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26574,7 +27300,7 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + @@ -26586,25 +27312,10 @@ For the purposes of graphQL compatibility, this operation can also be invoked us - + - + @@ -26657,7 +27368,7 @@ Future versions of this specifcation may add additional validation parameters. A - + @@ -26671,7 +27382,7 @@ Future versions of this specifcation may add additional validation parameters. A - + @@ -26774,7 +27485,7 @@ Future versions of this specifcation may add additional validation parameters. A - + @@ -26788,7 +27499,7 @@ Future versions of this specifcation may add additional validation parameters. A - + @@ -26800,11 +27511,7 @@ Future versions of this specifcation may add additional validation parameters. A - + @@ -26864,7 +27571,7 @@ This operation is intended to enable auto-generation of simple interfaces for ar - + @@ -26878,7 +27585,7 @@ This operation is intended to enable auto-generation of simple interfaces for ar - + @@ -26890,9 +27597,7 @@ This operation is intended to enable auto-generation of simple interfaces for ar - + @@ -26933,7 +27638,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -26947,7 +27652,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -26994,13 +27699,87 @@ If the operation is not called at the instance level, either *definition* or *ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -27014,7 +27793,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27034,20 +27813,44 @@ If the operation is not called at the instance level, either *definition* or *ur - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27058,7 +27861,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27072,7 +27875,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27084,7 +27887,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27092,19 +27895,27 @@ If the operation is not called at the instance level, either *definition* or *ur - + - + + + + + + + + + - + @@ -27116,7 +27927,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27130,7 +27941,7 @@ If the operation is not called at the instance level, either *definition* or *ur - + @@ -27142,24 +27953,10 @@ If the operation is not called at the instance level, either *definition* or *ur - + - + @@ -27201,12 +27998,7 @@ When a server cannot correctly expand a value set because it does not fully unde - + @@ -27214,14 +28006,7 @@ The purpose is to inform the server whether to use the value set associated with - + @@ -27369,7 +28154,7 @@ Text Search engines such as Lucene or Solr, long with their considerable functio - + @@ -27383,7 +28168,7 @@ Text Search engines such as Lucene or Solr, long with their considerable functio - + @@ -27395,9 +28180,7 @@ Text Search engines such as Lucene or Solr, long with their considerable functio - + @@ -27498,9 +28281,7 @@ If the operation is not called at the instance level, one of the in parameters u - + @@ -27544,7 +28325,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27562,7 +28343,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27627,7 +28408,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27716,9 +28497,6 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - - - @@ -27758,7 +28536,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27808,9 +28586,6 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - - - @@ -27835,7 +28610,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27856,7 +28631,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -27978,7 +28753,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -28067,9 +28842,6 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - - - @@ -28189,9 +28961,7 @@ Note that. 'abstract' is a property defined by many HL7 code systems that indica - + @@ -28309,6 +29079,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28475,10 +29279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28520,7 +29321,7 @@ Where the order is important, a local/jurisdictional extension may be defined to - + @@ -28574,9 +29375,7 @@ Where the order is important, a local/jurisdictional extension may be defined to - + @@ -28619,9 +29418,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -28790,7 +29587,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -28844,9 +29641,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -29079,6 +29874,27 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + @@ -29193,10 +30009,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -29213,9 +30026,7 @@ Where the order is important, a local/jurisdictional extension may be defined to - + @@ -29382,7 +30193,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -29403,7 +30214,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -29495,7 +30306,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -29584,9 +30395,6 @@ A coverage may only be responsible for specific types of charges, and the sequen - - - @@ -29706,9 +30514,7 @@ A coverage may only be responsible for specific types of charges, and the sequen - + @@ -29752,11 +30558,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31143,7 +31945,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -31197,9 +31999,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -31713,7 +32513,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31767,9 +32567,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31906,11 +32704,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33137,7 +33931,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -33158,7 +33952,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -33284,7 +34078,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -33373,9 +34167,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -33495,9 +34286,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -33567,14 +34356,57 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -33600,8 +34432,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -33630,8 +34462,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -33660,8 +34492,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -33691,8 +34523,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -33701,8 +34533,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + @@ -33717,7 +34548,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33725,11 +34556,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -33796,7 +34627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -33850,9 +34681,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34039,7 +34868,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34093,9 +34922,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34360,7 +35187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34414,9 +35241,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34531,7 +35356,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34585,9 +35410,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -34754,10 +35577,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34774,8 +35627,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -34791,8 +35644,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -34808,8 +35661,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -34826,20 +35679,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + - + @@ -34847,7 +35699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35171,7 +36023,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35192,7 +36044,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35318,7 +36170,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -35407,9 +36259,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -35529,9 +36378,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36155,7 +37002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36209,9 +37056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36376,7 +37221,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36430,9 +37275,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36550,7 +37393,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36604,9 +37447,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36785,7 +37626,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36839,9 +37680,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -36966,7 +37805,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37020,9 +37859,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37145,7 +37982,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37199,9 +38036,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37323,7 +38158,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -37377,9 +38212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38233,7 +39066,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38254,7 +39087,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38295,7 +39128,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38384,7 +39217,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38473,9 +39306,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -38595,9 +39425,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38681,9 +39509,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -38922,7 +39748,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -38963,7 +39789,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -39147,6 +39973,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme + @@ -39320,7 +40147,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -39374,9 +40201,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -39682,7 +40507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39731,9 +40556,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -39907,7 +40730,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -39935,7 +40758,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -40062,6 +40885,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme + @@ -40340,7 +41164,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -40361,7 +41185,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -40438,11 +41262,19 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - - + + + + + + + + + + @@ -40528,7 +41360,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -40617,9 +41449,6 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - - - @@ -40739,9 +41568,7 @@ The data type is CodeableConcept because clinicalStatus has some clinical judgme - + @@ -40831,9 +41658,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -40885,14 +41710,14 @@ This element is labeled as a modifier because the status contains the code enter - - + + - + @@ -40912,7 +41737,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41000,6 +41825,10 @@ This element is labeled as a modifier because the status contains the code enter + + + + @@ -41080,7 +41909,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41134,7 +41963,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41145,7 +41974,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41168,9 +41997,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -41236,6 +42062,49 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41440,6 +42309,38 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41479,20 +42380,20 @@ This element is labeled as a modifier because the status contains the code enter - - + + - - + + - + - + - + - + @@ -41525,16 +42426,19 @@ This element is labeled as a modifier because the status contains the code enter - + - + - + - + + + + @@ -41596,6 +42500,46 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41661,7 +42605,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41715,9 +42659,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -41761,7 +42703,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41804,10 +42746,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41818,8 +42791,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -41855,8 +42830,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + @@ -41865,7 +42841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -41878,14 +42854,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -41941,42 +42909,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -42020,11 +42956,19 @@ The duration (usually in minutes) could also be provided to indicate the length + + + + + + + + - - + + @@ -42100,9 +43044,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -42141,8 +43083,8 @@ This element is labeled as a modifier because the status contains the code enter - - + + @@ -42155,7 +43097,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -42217,6 +43159,10 @@ This element is labeled as a modifier because the status contains the code enter + + + + @@ -42271,7 +43217,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -42312,7 +43258,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -42323,7 +43269,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -42333,9 +43279,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -42388,6 +43331,36 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42527,6 +43500,25 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + @@ -42553,15 +43545,15 @@ This element is labeled as a modifier because the status contains the code enter - - + + - - + + - + - + @@ -42586,11 +43578,14 @@ This element is labeled as a modifier because the status contains the code enter - + - + - + + + + @@ -42631,6 +43626,33 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42672,7 +43694,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -42702,17 +43724,37 @@ This element is labeled as a modifier because the status contains the code enter + + + + + + + + + + + + + + + + + + + + @@ -42740,24 +43782,17 @@ This element is labeled as a modifier because the status contains the code enter - - + + + - + - - - - - - - - @@ -42800,29 +43835,10 @@ This element is labeled as a modifier because the status contains the code enter - - - - - - - - - - - - - - - - - - + @@ -42855,7 +43871,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -42876,7 +43892,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -43001,7 +44017,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -43027,7 +44043,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -43116,9 +44132,6 @@ The duration (usually in minutes) could also be provided to indicate the length - - - @@ -43238,9 +44251,7 @@ The duration (usually in minutes) could also be provided to indicate the length - + @@ -43438,7 +44449,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43483,7 +44494,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43495,6 +44506,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -43645,7 +44657,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43762,7 +44774,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -43794,13 +44806,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -43897,13 +44910,1497 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -43924,7 +46421,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44073,7 +46570,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44162,9 +46659,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -44284,9 +46778,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44326,20 +46818,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - - - + + + + + - - - + + + - + @@ -44356,7 +46849,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44381,20 +46874,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - + + + - - - + + + - + @@ -44411,8 +46905,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -44427,6 +46921,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + @@ -44455,9 +46953,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -44505,9 +47000,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -44524,21 +47016,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + + - + + + + @@ -44633,7 +47128,152 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44647,13 +47287,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + @@ -44670,16 +47307,60 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44701,8 +47382,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -44715,8 +47396,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44728,7 +47408,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44750,6 +47430,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -44826,9 +47507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -44892,7 +47571,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -44946,9 +47625,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -44991,8 +47668,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + @@ -45021,7 +47699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45053,9 +47731,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -45113,23 +47791,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + - + - + + @@ -45157,7 +47836,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45168,108 +47847,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + @@ -45296,8 +47890,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -45330,10 +47924,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45346,8 +47937,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -45388,214 +47979,26 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + + - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -45616,77 +48019,28 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + @@ -45708,7 +48062,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45718,9 +48072,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45730,8 +48082,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -45782,7 +48134,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45836,9 +48188,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45891,7 +48241,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -45932,11 +48283,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + + @@ -45976,7 +48328,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -45993,8 +48345,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -46035,14 +48387,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - @@ -46082,7 +48426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46136,9 +48480,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46182,6 +48524,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -46214,72 +48557,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -46293,7 +48577,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46307,9 +48591,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -46334,65 +48615,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -46407,7 +48629,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46444,56 +48666,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -46505,7 +48682,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -46584,7 +48760,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46638,9 +48814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46692,7 +48866,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46705,6 +48879,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -46722,7 +48904,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -46731,9 +48912,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46761,6 +48969,43 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46789,15 +49034,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - - - + + + + + - + @@ -46806,7 +49052,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -46831,15 +49077,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - + + + - + @@ -46848,8 +49095,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -46864,6 +49111,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + @@ -46879,9 +49130,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -46916,9 +49164,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -46935,16 +49180,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + + + + + @@ -47013,19 +49261,39 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + @@ -47042,12 +49310,43 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47060,8 +49359,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -47074,8 +49373,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47087,7 +49385,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47104,6 +49402,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -47159,9 +49458,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -47200,8 +49497,9 @@ For example, an activity may be initiated by one user for other users or involve - - + + + @@ -47217,7 +49515,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47249,9 +49547,9 @@ For example, an activity may be initiated by one user for other users or involve - - - + + + @@ -47296,18 +49594,19 @@ For example, an activity may be initiated by one user for other users or involve - + - + - + - + + @@ -47327,7 +49626,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47338,77 +49637,18 @@ For example, an activity may be initiated by one user for other users or involve - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -47427,8 +49667,8 @@ For example, an activity may be initiated by one user for other users or involve - - + + @@ -47448,10 +49688,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47464,8 +49701,8 @@ For example, an activity may be initiated by one user for other users or involve - - + + @@ -47493,72 +49730,21 @@ For example, an activity may be initiated by one user for other users or involve - - - - - + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - @@ -47571,60 +49757,24 @@ For example, an activity may be initiated by one user for other users or involve - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -47637,7 +49787,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47647,9 +49797,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47659,8 +49807,8 @@ For example, an activity may be initiated by one user for other users or involve - - + + @@ -47691,7 +49839,8 @@ For example, an activity may be initiated by one user for other users or involve - + + @@ -47719,11 +49868,12 @@ For example, an activity may be initiated by one user for other users or involve - + - + + @@ -47750,7 +49900,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -47759,8 +49909,8 @@ For example, an activity may be initiated by one user for other users or involve - - + + @@ -47788,14 +49938,6 @@ For example, an activity may be initiated by one user for other users or involve - - - - - - - - @@ -47824,6 +49966,7 @@ For example, an activity may be initiated by one user for other users or involve + @@ -47843,59 +49986,13 @@ For example, an activity may be initiated by one user for other users or involve - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -47904,15 +50001,12 @@ For example, an activity may be initiated by one user for other users or involve - + - - - @@ -47937,52 +50031,6 @@ For example, an activity may be initiated by one user for other users or involve - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -47992,7 +50040,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -48021,50 +50069,17 @@ For example, an activity may be initiated by one user for other users or involve - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -48114,11 +50129,19 @@ For example, an activity may be initiated by one user for other users or involve - + + + + + + + + + @@ -48136,13 +50159,39 @@ For example, an activity may be initiated by one user for other users or involve - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -48162,6 +50211,30 @@ For example, an activity may be initiated by one user for other users or involve + + + + + + + + + + + + + + + + + + + + + + + + @@ -48172,7 +50245,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -48193,7 +50266,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -48317,7 +50390,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -48406,9 +50479,6 @@ For example, an activity may be initiated by one user for other users or involve - - - @@ -48528,9 +50598,7 @@ For example, an activity may be initiated by one user for other users or involve - + @@ -48608,9 +50676,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -48635,9 +50701,6 @@ This element is labeled as a modifier because it defines the meaning of the reso - - - @@ -48817,9 +50880,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -48831,9 +50892,6 @@ This element is labeled as a modifier because it defines the meaning of the reso - - - @@ -48937,7 +50995,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -48961,7 +51019,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -48998,11 +51056,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49041,7 +51095,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49130,9 +51184,6 @@ This element is labeled as a modifier because it defines the meaning of the reso - - - @@ -49257,11 +51308,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49350,7 +51397,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49371,7 +51418,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49385,8 +51432,7 @@ This element is labeled as a modifier because it defines the meaning of the reso - + @@ -49411,9 +51457,8 @@ into another (possibly the same) biological entity."> - - + + @@ -49499,7 +51544,7 @@ into another (possibly the same) biological entity."> - + @@ -49588,9 +51633,6 @@ into another (possibly the same) biological entity."> - - - @@ -49710,9 +51752,7 @@ into another (possibly the same) biological entity."> - + @@ -49752,44 +51792,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -49857,6 +51859,184 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -49891,74 +52071,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -50013,7 +52138,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50067,9 +52192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50194,14 +52317,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -50220,8 +52369,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -50235,7 +52384,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -50246,8 +52395,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -50286,12 +52435,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -50331,41 +52478,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -50384,497 +52505,45 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - - + + - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -50892,9 +52561,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -50909,31 +52577,6 @@ into another (possibly the same) biological entity."> - - - - - - - - - - - - - - - - - - - - - - - - - @@ -50975,6 +52618,106 @@ into another (possibly the same) biological entity."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50996,43 +52739,14 @@ into another (possibly the same) biological entity."> - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + @@ -51097,10 +52811,23 @@ into another (possibly the same) biological entity."> - - - - + + + + + + + + + + + + + + + + + @@ -51110,24 +52837,11 @@ into another (possibly the same) biological entity."> - - - - - - - - - - - - - - - - - - + + + + + @@ -51137,153 +52851,40 @@ into another (possibly the same) biological entity."> - + - - + + - - - - - + + + + + + - - - - - - - - - - - - - - - + - + - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -51299,7 +52900,7 @@ into another (possibly the same) biological entity."> - + @@ -51320,7 +52921,7 @@ into another (possibly the same) biological entity."> - + @@ -51455,7 +53056,7 @@ into another (possibly the same) biological entity."> - + @@ -51544,9 +53145,6 @@ into another (possibly the same) biological entity."> - - - @@ -51666,9 +53264,7 @@ into another (possibly the same) biological entity."> - + @@ -51853,9 +53449,175 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51880,14 +53642,349 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52175,9 +54272,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52202,10 +54330,171 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -52338,7 +54627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52362,7 +54651,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52467,8 +54756,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -52534,7 +54823,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52623,9 +54912,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -52718,17 +55004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -52791,11 +55067,7 @@ The timestamp value should be greater than the lastUpdated and other timestamps - + @@ -52833,7 +55105,7 @@ This specification defines some specific uses of Bundle.link for [searching](sea - + @@ -52887,9 +55159,7 @@ This specification defines some specific uses of Bundle.link for [searching](sea - + @@ -53039,7 +55309,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53093,9 +55363,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53162,12 +55430,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -53250,7 +55514,7 @@ Note that the fullUrl is not the same as the canonical URL - it's an absolute ur - + @@ -53304,9 +55568,7 @@ Note that the fullUrl is not the same as the canonical URL - it's an absolute ur - + @@ -53385,9 +55647,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53452,7 +55712,7 @@ See [Patient Match](patient-operation-match.html) for the EMPI search which rela - + @@ -53506,9 +55766,7 @@ See [Patient Match](patient-operation-match.html) for the EMPI search which rela - + @@ -53755,7 +56013,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53809,9 +56067,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -53961,9 +56217,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -54093,8 +56347,8 @@ This outcome is not used for error responses in batch/transaction, only for hint - - + + @@ -54168,17 +56422,7 @@ This outcome is not used for error responses in batch/transaction, only for hint - + @@ -54215,11 +56459,7 @@ The timestamp value should be greater than the lastUpdated and other timestamps - + @@ -54299,12 +56539,8 @@ This specification defines some specific uses of Bundle.link for [searching](sea - - + + @@ -54367,9 +56603,7 @@ Note that the fullUrl is not the same as the canonical URL - it's an absolute ur - + @@ -54552,9 +56786,7 @@ See [Patient Match](patient-operation-match.html) for the EMPI search which rela - + @@ -54592,7 +56824,7 @@ This outcome is not used for error responses in batch/transaction, only for hint - + @@ -54613,7 +56845,7 @@ This outcome is not used for error responses in batch/transaction, only for hint - + @@ -54751,7 +56983,7 @@ This outcome is not used for error responses in batch/transaction, only for hint - + @@ -54840,9 +57072,6 @@ This outcome is not used for error responses in batch/transaction, only for hint - - - @@ -54962,9 +57191,7 @@ This outcome is not used for error responses in batch/transaction, only for hint - + @@ -55008,11 +57235,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -55577,11 +57800,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -55930,7 +58149,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -55954,7 +58173,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -56103,7 +58322,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -56192,9 +58411,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -56314,9 +58530,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -56360,11 +58574,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -56902,9 +59112,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -56935,9 +59143,7 @@ Many [Implementation Guides](http://fhir.org/guides/registry) define additional - + @@ -57003,7 +59209,7 @@ A capability statement that imports another CapabilityStatement automatically in - + @@ -57057,9 +59263,7 @@ A capability statement that imports another CapabilityStatement automatically in - + @@ -57221,7 +59425,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57275,9 +59479,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57464,9 +59666,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -57505,9 +59704,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -57597,7 +59793,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57651,9 +59847,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57797,7 +59991,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -57851,9 +60045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58030,7 +60222,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58084,9 +60276,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58293,7 +60483,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58347,9 +60537,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58823,7 +61011,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -58877,9 +61065,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59042,9 +61228,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59082,7 +61266,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -59136,9 +61320,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -59303,7 +61485,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59357,9 +61539,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59583,7 +61763,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59637,9 +61817,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59721,7 +61899,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59775,9 +61953,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -59972,7 +62148,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60026,9 +62202,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60174,7 +62348,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60228,9 +62402,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60446,11 +62618,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -60793,9 +62961,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -60813,9 +62979,7 @@ Many [Implementation Guides](http://fhir.org/guides/registry) define additional - + @@ -60977,9 +63141,6 @@ A capability statement that imports another CapabilityStatement automatically in - - - @@ -61005,9 +63166,6 @@ A capability statement that imports another CapabilityStatement automatically in - - - @@ -61584,9 +63742,7 @@ A capability statement that imports another CapabilityStatement automatically in - + @@ -61945,7 +64101,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -61966,7 +64122,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -62099,7 +64255,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -62188,9 +64344,6 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - - - @@ -62310,9 +64463,7 @@ If an operation that is listed in multiple CapabilityStatement.rest.resource.ope - + @@ -62356,11 +64507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -62895,9 +65042,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -62928,9 +65073,7 @@ Many [Implementation Guides](http://fhir.org/guides/registry) define additional - + @@ -62996,7 +65139,7 @@ A capability statement that imports another CapabilityStatement2 automatically i - + @@ -63050,9 +65193,7 @@ A capability statement that imports another CapabilityStatement2 automatically i - + @@ -63214,7 +65355,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63268,9 +65409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63457,9 +65596,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -63498,9 +65634,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -63590,7 +65723,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63644,9 +65777,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63787,7 +65918,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -63841,9 +65972,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64001,7 +66130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64055,9 +66184,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64288,7 +66415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64342,9 +66469,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64511,7 +66636,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64565,9 +66690,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64754,9 +66877,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -64794,7 +66915,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -64848,9 +66969,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -65039,7 +67158,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65093,9 +67212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65369,11 +67486,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -65713,9 +67826,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -65733,9 +67844,7 @@ Many [Implementation Guides](http://fhir.org/guides/registry) define additional - + @@ -65897,9 +68006,6 @@ A capability statement that imports another CapabilityStatement2 automatically i - - - @@ -65925,9 +68031,6 @@ A capability statement that imports another CapabilityStatement2 automatically i - - - @@ -66327,9 +68430,7 @@ A capability statement that imports another CapabilityStatement2 automatically i - + @@ -66502,7 +68603,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -66523,7 +68624,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -66658,7 +68759,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -66747,9 +68848,6 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - - - @@ -66869,9 +68967,7 @@ If an operation that is listed in multiple CapabilityStatement2.rest.resource.op - + @@ -67137,9 +69233,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -67192,8 +69286,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -67775,8 +69868,7 @@ This element is expected to be immutable. E.g. A "proposal" instance s - + @@ -67798,7 +69890,7 @@ NOTE: This is a list of contained Request-Event tuples!}"> - + @@ -67852,9 +69944,7 @@ NOTE: This is a list of contained Request-Event tuples!}"> - + @@ -67979,8 +70069,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -68070,7 +70159,7 @@ The goal should be visible when the resource referenced by CarePlan.activity.pla - + @@ -68124,9 +70213,7 @@ The goal should be visible when the resource referenced by CarePlan.activity.pla - + @@ -68408,8 +70495,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -69081,9 +71167,7 @@ The unknown code is not to be used to convey other statuses. The unknown code s - + @@ -69123,8 +71207,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -69511,8 +71594,7 @@ This element is expected to be immutable. E.g. A "proposal" instance s - + @@ -69578,8 +71660,7 @@ NOTE: This is a list of contained Request-Event tuples!}"> - + @@ -69792,8 +71873,7 @@ The goal should be visible when the resource referenced by CarePlan.activity.pla - + @@ -70147,7 +72227,7 @@ The unknown code is not to be used to convey other statuses. The unknown code s - + @@ -70168,7 +72248,7 @@ The unknown code is not to be used to convey other statuses. The unknown code s - + @@ -70302,7 +72382,7 @@ The unknown code is not to be used to convey other statuses. The unknown code s - + @@ -70391,9 +72471,6 @@ The unknown code is not to be used to convey other statuses. The unknown code s - - - @@ -70513,9 +72590,7 @@ The unknown code is not to be used to convey other statuses. The unknown code s - + @@ -70710,8 +72785,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -70843,7 +72917,7 @@ Allows for an organization to designate a team such as the PICC line team."> - + @@ -70897,9 +72971,7 @@ Allows for an organization to designate a team such as the PICC line team."> - + @@ -70986,9 +73058,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -71334,8 +73404,7 @@ Member is optional because some participants may be known only by their role, pa - + @@ -71447,9 +73516,7 @@ Allows for an organization to designate a team such as the PICC line team."> - + @@ -71582,1432 +73649,13 @@ Member is optional because some participants may be known only by their role, pa - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -73028,7 +73676,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -73166,7 +73814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -73255,9 +73903,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -73377,9 +74022,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -73543,9 +74186,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -73661,9 +74302,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -73887,7 +74525,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -73941,9 +74579,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -74244,9 +74880,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -74447,9 +75080,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -74524,26 +75154,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + - + - + - - - @@ -74777,9 +75404,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -74856,9 +75481,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -75185,9 +75807,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -75310,9 +75929,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -75374,21 +75990,18 @@ This element is labeled as a modifier because the status contains the code enter - - + + - + - + - - - @@ -75473,7 +76086,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -75494,7 +76107,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -75586,7 +76199,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -75675,9 +76288,6 @@ This element is labeled as a modifier because the status contains the code enter - - - @@ -75797,9 +76407,7 @@ This element is labeled as a modifier because the status contains the code enter - + @@ -75843,11 +76451,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -76582,7 +77186,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76698,7 +77302,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76752,9 +77356,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -76858,8 +77460,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -76931,7 +77532,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -76985,9 +77586,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -77101,7 +77700,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -77155,9 +77754,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -77356,11 +77953,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -77848,7 +78441,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -77948,8 +78541,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -78099,7 +78691,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -78120,7 +78712,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -78208,7 +78800,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -78297,9 +78889,6 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - - - @@ -78419,9 +79008,7 @@ FHIRPath expressions can traverse into other resources linked from the ChargeIte - + @@ -79198,7 +79785,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -79212,6 +79799,115 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79312,7 +80008,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -79366,9 +80062,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -79574,7 +80268,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -79628,9 +80322,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -79756,232 +80448,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -80036,7 +80515,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80090,9 +80569,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80255,7 +80732,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80309,9 +80786,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80478,7 +80953,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80532,9 +81007,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80701,7 +81174,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80755,9 +81228,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80802,11 +81273,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -80856,9 +81327,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -80936,7 +81404,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -80990,9 +81458,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81091,9 +81557,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -81197,7 +81660,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81251,9 +81714,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81391,220 +81852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -81660,7 +81908,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81714,9 +81962,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81797,7 +82043,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -81851,9 +82097,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82074,7 +82318,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82128,9 +82372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82198,10 +82440,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -82297,7 +82539,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82351,9 +82593,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82628,9 +82868,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -82838,7 +83075,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82892,9 +83129,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -82934,16 +83169,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + - + @@ -82961,10 +83196,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -83035,7 +83270,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83089,9 +83324,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83238,7 +83471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83292,9 +83525,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83510,7 +83741,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83564,9 +83795,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83675,7 +83904,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83729,9 +83958,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83775,7 +84002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83854,7 +84081,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83920,7 +84147,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -83974,9 +84201,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -84254,7 +84479,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -84308,9 +84533,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -84435,14 +84658,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + @@ -84502,7 +84725,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -84556,9 +84779,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -85218,7 +85439,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -85403,77 +85624,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -85673,7 +85831,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -85701,9 +85859,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -85773,9 +85928,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -85879,70 +86031,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -86078,10 +86167,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -86241,9 +86330,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -86345,12 +86431,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -86359,10 +86445,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -86560,7 +86646,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -86600,7 +86686,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -86790,10 +86876,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -86912,7 +86998,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -86933,7 +87019,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -87063,7 +87149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -87152,9 +87238,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -87274,9 +87357,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -87852,7 +87933,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -87906,9 +87987,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88151,7 +88230,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88205,9 +88284,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88428,7 +88505,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88482,9 +88559,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88693,10 +88768,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -88738,7 +88810,7 @@ Value codes"> - + @@ -88792,9 +88864,7 @@ Value codes"> - + @@ -89087,7 +89157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -89141,9 +89211,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -89402,7 +89470,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -89456,9 +89524,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -89705,7 +89771,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -89759,9 +89825,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -90049,7 +90113,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -90103,9 +90167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -90284,7 +90346,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -90338,9 +90400,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -91065,7 +91125,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -91119,9 +91179,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -91554,7 +91612,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -91608,9 +91666,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -92699,10 +92755,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -94149,7 +94202,7 @@ Value codes"> - + @@ -94170,7 +94223,7 @@ Value codes"> - + @@ -94296,7 +94349,7 @@ Value codes"> - + @@ -94385,9 +94438,6 @@ Value codes"> - - - @@ -94507,9 +94557,7 @@ Value codes"> - + @@ -95125,7 +95173,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95179,9 +95227,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95320,7 +95366,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95374,9 +95420,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95589,7 +95633,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95643,9 +95687,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95808,7 +95850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -95862,9 +95904,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96027,7 +96067,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96081,9 +96121,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96727,7 +96765,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -96781,9 +96819,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97113,7 +97149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97167,9 +97203,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97526,7 +97560,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97580,9 +97614,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97730,7 +97762,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -97784,9 +97816,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98157,7 +98187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98211,9 +98241,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98373,9 +98401,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -98469,7 +98494,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98523,9 +98548,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98750,7 +98773,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -98804,9 +98827,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100581,9 +100602,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -100805,7 +100823,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100826,7 +100844,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -100960,7 +100978,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101049,9 +101067,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -101171,9 +101186,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101727,7 +101740,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -101781,9 +101794,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102470,12 +102481,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + @@ -102492,11 +102503,3008 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -102544,6 +105552,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -102621,7 +105637,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102710,9 +105726,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -102832,9 +105845,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -102947,11 +105958,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -103114,7 +106125,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103168,9 +106179,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103379,7 +106388,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103433,9 +106442,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103585,7 +106592,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103639,9 +106646,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103939,7 +106944,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -103993,9 +106998,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104080,7 +107083,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104134,9 +107137,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104309,11 +107310,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -104409,7 +107410,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104463,9 +107464,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -104604,6 +107603,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -104662,7 +107669,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105131,7 +108138,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105239,7 +108246,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105263,7 +108270,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105363,7 +108370,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105452,9 +108459,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -105574,9 +108578,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -105620,11 +108622,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -106290,9 +109288,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -106446,7 +109442,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -106500,9 +109496,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -106701,7 +109695,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -106755,9 +109749,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -106957,7 +109949,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107011,9 +110003,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107177,7 +110167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107231,9 +110221,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107300,9 +110288,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -107422,7 +110407,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107476,9 +110461,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -107654,11 +110637,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -108077,9 +111056,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -108383,9 +111360,6 @@ Most code systems occasionally refine the displays defined for concepts between - - - @@ -108519,7 +111493,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -108540,7 +111514,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -108665,7 +111639,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -108754,9 +111728,6 @@ Most code systems occasionally refine the displays defined for concepts between - - - @@ -108876,9 +111847,7 @@ Most code systems occasionally refine the displays defined for concepts between - + @@ -109713,7 +112682,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -109767,9 +112736,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -109813,11 +112780,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -110407,11 +113370,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -110455,7 +113414,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -110476,7 +113435,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -110601,7 +113560,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -110690,9 +113649,6 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - - - @@ -110812,9 +113768,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -111094,9 +114048,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -111441,7 +114393,7 @@ One exception to this is that the granularity of CommunicationRequest.intent is - + @@ -111495,9 +114447,7 @@ One exception to this is that the granularity of CommunicationRequest.intent is - + @@ -111541,11 +114491,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -112046,9 +114992,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -112265,11 +115209,7 @@ One exception to this is that the granularity of CommunicationRequest.intent is - + @@ -112495,7 +115435,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -112516,7 +115456,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -112618,7 +115558,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -112707,9 +115647,6 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - - - @@ -112829,9 +115766,7 @@ When using contentCodeableConcept, the CodeableConcept is what is being communic - + @@ -112875,11 +115810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -113366,7 +116297,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -113420,9 +116351,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -113588,11 +116517,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -113943,7 +116868,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -113964,7 +116889,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -114113,7 +117038,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -114202,9 +117127,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -114324,9 +117246,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -114415,11 +117335,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -114923,7 +117841,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -114977,9 +117895,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -115032,7 +117948,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115049,9 +117965,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -115195,7 +118111,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115221,206 +118137,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -115476,7 +118192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115530,9 +118246,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115760,7 +118474,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115814,9 +118528,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -115899,9 +118611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -116330,11 +119040,9 @@ If the section has content (instead of sub-sections), the section.code does not - + - + @@ -116701,7 +119409,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -116710,9 +119418,9 @@ Some reporting work flows require that the original narrative of a final documen - + - + @@ -116812,7 +119520,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -116830,69 +119538,6 @@ Some reporting work flows require that the original narrative of a final documen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117071,9 +119716,7 @@ Some reporting work flows require that the original narrative of a final documen - + @@ -117327,7 +119970,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -117348,7 +119991,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -117440,7 +120083,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -117529,9 +120172,6 @@ If the section has content (instead of sub-sections), the section.code does not - - - @@ -117651,9 +120291,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -117697,11 +120335,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118343,7 +120977,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -118397,9 +121031,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -118551,7 +121183,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118605,9 +121237,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118782,7 +121412,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -118836,9 +121466,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119044,7 +121672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119098,9 +121726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119329,7 +121955,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119383,9 +122009,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -119573,11 +122197,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -120347,13 +122967,3119 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -120374,7 +126100,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -120542,7 +126268,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -120631,9 +126357,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -120753,9 +126476,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -120890,16 +126611,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -120948,8 +126667,7 @@ The data type is CodeableConcept because verificationStatus has some clinical ju - + @@ -121108,16 +126826,7 @@ The data type is CodeableConcept because verificationStatus has some clinical ju - + @@ -121136,7 +126845,7 @@ OR < 272379006 |Event|"> - + @@ -121159,9 +126868,6 @@ OR < 272379006 |Event|"> - - - @@ -121280,7 +126986,7 @@ OR < 272379006 |Event|"> - + @@ -121335,7 +127041,7 @@ OR < 272379006 |Event|"> - + @@ -121552,7 +127258,7 @@ OR < 272379006 |Event|"> - + @@ -121606,9 +127312,7 @@ OR < 272379006 |Event|"> - + @@ -121821,7 +127525,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -121875,9 +127579,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -122158,16 +127860,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -122203,8 +127903,7 @@ The data type is CodeableConcept because verificationStatus has some clinical ju - + @@ -122324,16 +128023,7 @@ The data type is CodeableConcept because verificationStatus has some clinical ju - + @@ -122352,7 +128042,7 @@ OR < 272379006 |Event|"> - + @@ -122362,9 +128052,6 @@ OR < 272379006 |Event|"> - - - @@ -122457,7 +128144,7 @@ OR < 272379006 |Event|"> - + @@ -122499,7 +128186,7 @@ OR < 272379006 |Event|"> - + @@ -122838,7 +128525,7 @@ OR < 272379006 |Event|"> - + @@ -122859,7 +128546,7 @@ OR < 272379006 |Event|"> - + @@ -122947,7 +128634,7 @@ OR < 272379006 |Event|"> - + @@ -123036,9 +128723,6 @@ OR < 272379006 |Event|"> - - - @@ -123158,9 +128842,7 @@ OR < 272379006 |Event|"> - + @@ -123204,11 +128886,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -123789,9 +129467,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -123979,7 +129654,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -124033,9 +129708,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -124184,7 +129857,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124238,9 +129911,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124389,7 +130060,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124443,9 +130114,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124650,7 +130319,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124704,9 +130373,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124848,7 +130515,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -124902,9 +130569,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -125024,11 +130689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -125388,9 +131049,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -125765,7 +131423,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -125786,7 +131444,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -125886,38 +131544,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -125953,7 +131579,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -126042,9 +131668,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -126164,9 +131787,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -126242,8 +131863,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -126294,55 +131914,15 @@ Note: An implementation-specific requirement will be needed"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -126363,7 +131943,7 @@ Note: Scope can be derived from category if going from V2 to FHIR."> - + @@ -126664,9 +132244,7 @@ Note: Scope can be derived from category if going from V2 to FHIR."> - + @@ -126690,8 +132268,7 @@ Alternately, creating an invariant for individual scopes that forces one or more - + @@ -126709,7 +132286,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -126763,9 +132340,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -126819,7 +132394,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -126847,7 +132421,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -126876,7 +132449,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -126892,14 +132464,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -126943,7 +132514,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -126997,9 +132568,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -127095,7 +132664,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127228,7 +132797,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127282,9 +132851,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127434,7 +133001,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127488,9 +133055,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127571,11 +133136,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -127852,7 +133417,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -127906,9 +133471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -128069,38 +133632,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -128139,8 +133670,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -128178,38 +133708,11 @@ Note: An implementation-specific requirement will be needed"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128221,7 +133724,7 @@ Note: Scope can be derived from category if going from V2 to FHIR."> - + @@ -128418,9 +133921,7 @@ Note: Scope can be derived from category if going from V2 to FHIR."> - + @@ -128431,8 +133932,7 @@ Alternately, creating an invariant for individual scopes that forces one or more - + @@ -128444,7 +133944,6 @@ Note: An implementation-specific requirement will be needed"> - @@ -128459,7 +133958,6 @@ Note: An implementation-specific requirement will be needed"> - @@ -128475,7 +133973,6 @@ Note: An implementation-specific requirement will be needed"> - @@ -128483,14 +133980,13 @@ Note: An implementation-specific requirement will be needed"> - + - + @@ -128536,7 +134032,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -128686,7 +134182,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -128918,7 +134414,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -128939,7 +134435,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -129068,7 +134564,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -129157,9 +134653,6 @@ Note: An implementation-specific requirement will be needed"> - - - @@ -129279,9 +134772,7 @@ Note: An implementation-specific requirement will be needed"> - + @@ -129388,7 +134879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -129553,7 +135044,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -129589,7 +135080,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -129700,7 +135191,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -129796,7 +135287,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130000,7 +135491,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130159,7 +135650,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130213,9 +135704,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130490,7 +135979,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130544,9 +136033,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130847,7 +136334,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130885,7 +136372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -130939,9 +136426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131157,7 +136642,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131211,9 +136696,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131323,7 +136806,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131377,9 +136860,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131490,8 +136971,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -131520,7 +137001,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131686,7 +137167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131740,9 +137221,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -131976,7 +137455,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132030,9 +137509,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132283,7 +137760,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132337,9 +137814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132740,7 +138215,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -132794,9 +138269,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133282,7 +138755,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133325,7 +138798,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133379,9 +138852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133534,7 +139005,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133588,9 +139059,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -133744,7 +139213,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134298,7 +139767,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134341,7 +139810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134395,9 +139864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134553,7 +140020,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134608,7 +140075,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134662,9 +140129,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134796,7 +140261,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134850,9 +140315,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -134984,7 +140447,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135038,9 +140501,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135115,7 +140576,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135219,7 +140680,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135319,7 +140780,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135342,7 +140803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135414,7 +140875,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135471,7 +140932,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135584,7 +141045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -135975,7 +141436,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -136155,8 +141616,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -136172,7 +141633,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -136957,7 +142418,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137106,7 +142567,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137426,7 +142887,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137518,7 +142979,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137669,7 +143130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137706,7 +143167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137727,7 +143188,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137873,7 +143334,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -137962,9 +143423,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -138084,9 +143542,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -138593,8 +144049,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -138683,7 +144138,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -138737,9 +144192,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -139004,7 +144457,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -139058,9 +144511,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -139225,7 +144676,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -139279,9 +144730,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -139816,8 +145265,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -140160,7 +145608,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -140181,7 +145629,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -140311,7 +145759,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -140400,9 +145848,6 @@ For selfpay it may provide multiple paying persons and/or organizations."> - - - @@ -140522,9 +145967,7 @@ For selfpay it may provide multiple paying persons and/or organizations."> - + @@ -141022,7 +146465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141076,9 +146519,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141247,7 +146688,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141301,9 +146742,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141471,7 +146910,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141525,9 +146964,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141872,7 +147309,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -141926,9 +147363,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -142688,7 +148123,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -142709,7 +148144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -142839,7 +148274,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -142928,9 +148363,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -143050,9 +148482,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -143546,7 +148976,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -143600,9 +149030,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -143779,7 +149207,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -143833,9 +149261,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -144258,7 +149684,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -144312,9 +149738,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -144668,7 +150092,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -144722,9 +150146,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -145616,7 +151038,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -145637,7 +151059,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -145779,7 +151201,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -145868,9 +151290,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -145990,9 +151409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -146447,7 +151864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -146501,9 +151918,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -146734,7 +152149,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -146788,9 +152203,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147430,7 +152843,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147451,7 +152864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147465,7 +152878,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147586,7 +152999,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147675,9 +153088,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -147797,9 +153207,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147843,7 +153251,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147920,7 +153328,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -147985,7 +153393,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -148039,9 +153447,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -148086,11 +153492,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -148123,15 +153529,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -148160,21 +153558,13 @@ http://hl7.org/fhir/NamingSystem/iccbba-other-di."> - + - + @@ -148399,21 +153789,21 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - - - - - + + + + + - + - + @@ -148430,14 +153820,6 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - - - - - - - - @@ -148595,7 +153977,7 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - + @@ -148671,7 +154053,7 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - + @@ -148725,9 +154107,7 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - + @@ -148796,9 +154176,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -148910,6 +154289,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | + @@ -148940,201 +154320,6 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -149176,7 +154361,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149230,9 +154415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149397,7 +154580,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149451,9 +154634,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149521,8 +154702,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + @@ -149536,6 +154718,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + @@ -149548,21 +154745,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + + + @@ -149629,7 +154828,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149683,9 +154882,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149729,11 +154926,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -149826,7 +155023,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149880,9 +155077,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -149926,11 +155121,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -150123,6 +155318,233 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150237,7 +155659,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -150283,7 +155705,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -150317,7 +155739,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -150341,15 +155763,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -150365,21 +155779,13 @@ http://hl7.org/fhir/NamingSystem/iccbba-other-di."> - + - + @@ -150526,16 +155932,16 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - - - - - + + + + + - + @@ -150544,14 +155950,6 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - - - - - - - - @@ -150657,7 +156055,7 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - + @@ -150708,9 +156106,8 @@ http://hl7.org/fhir/NamingSystem/iccbba-other"> - - + + @@ -150783,6 +156180,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | + @@ -150800,51 +156198,6 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -150931,8 +156284,9 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - - + + + @@ -150941,12 +156295,27 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia + + + + + + + + + + + + + + + - - + + @@ -150955,6 +156324,8 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia + + @@ -150989,7 +156360,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151036,7 +156407,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151155,6 +156526,72 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151213,7 +156650,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151234,7 +156671,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151248,7 +156685,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151351,7 +156788,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151440,9 +156877,6 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - - - @@ -151562,9 +156996,7 @@ In the PHD case, there are 11073 10101 nomenclature codes that define the specia - + @@ -151604,10 +157036,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -151675,7 +157133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -151729,9 +157187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -151773,8 +157229,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -151849,6 +157305,228 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151928,7 +157606,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -151982,9 +157660,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152053,9 +157729,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -152128,48 +157803,15 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -152188,8 +157830,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + @@ -152203,7 +157845,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + @@ -152214,8 +157856,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + @@ -152254,12 +157896,10 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + - + @@ -152299,20 +157939,53 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -152326,19 +157999,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + - + - + - + @@ -152351,10 +158024,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - @@ -152397,7 +158066,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152451,9 +158120,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152587,7 +158254,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152641,9 +158308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152802,7 +158467,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152856,9 +158521,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -152992,7 +158655,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153046,9 +158709,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153166,6 +158827,193 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153231,7 +159079,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153285,9 +159133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153470,32 +159316,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -153522,199 +159342,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -153752,7 +159383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153806,9 +159437,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -153850,8 +159479,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -153874,46 +159503,39 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -153996,19 +159618,189 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -154120,7 +159912,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -154174,9 +159966,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -154294,6 +160084,822 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -154310,10 +160916,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + - + @@ -154342,8 +160961,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -154379,6 +160998,67 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -154433,9 +161113,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -154482,12 +161161,26 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + + + + + + + + + + + + + + + @@ -154503,6 +161196,19 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | + + + + + + + + + + + + + @@ -154510,43 +161216,12 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -154731,6 +161406,45 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -154833,19 +161547,6 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - - - - - - - - - - @@ -154859,49 +161560,10 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -154913,8 +161575,8 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - + + @@ -154924,28 +161586,34 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + + @@ -154994,14 +161662,49 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + @@ -155090,6 +161793,261 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155100,7 +162058,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + @@ -155121,7 +162079,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + @@ -155247,7 +162205,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + @@ -155336,9 +162294,6 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - - - @@ -155458,9 +162413,7 @@ UDILabelName | UserFriendlyName | PatientReportedName | ManufactureDeviceName | - + @@ -155622,9 +162575,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -155672,9 +162622,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -155916,7 +162863,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -155970,9 +162917,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -156445,9 +163390,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -156482,9 +163424,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -156848,7 +163787,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -156869,7 +163808,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -156986,7 +163925,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -157075,9 +164014,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -157197,9 +164133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -157297,9 +164231,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -157339,9 +164270,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -157577,7 +164505,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -157631,9 +164559,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -157815,9 +164741,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -157844,9 +164767,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -158041,7 +164961,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -158062,7 +164982,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -158076,7 +164996,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -158205,7 +165125,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -158294,9 +165214,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -158416,9 +165333,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -159033,7 +165948,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -159087,9 +166002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -159759,7 +166672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -160674,7 +167587,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -160707,13 +167620,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -160728,7 +167641,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -160867,7 +167780,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -160956,9 +167869,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -161078,9 +167988,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -161201,9 +168109,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -161277,14 +168185,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -161669,9 +168577,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -161800,9 +168705,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -161850,8 +168755,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -162099,9 +169004,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -162149,7 +169051,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -162170,7 +169072,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -162324,7 +169226,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -162413,9 +169315,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -162535,9 +169434,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -162753,9 +169650,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -162803,9 +169697,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -162854,6 +169745,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -163214,6 +170106,38 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -163248,9 +170172,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -163299,7 +170223,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -163353,9 +170277,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -163397,10 +170319,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -163429,8 +170351,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -163552,9 +170474,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -163773,9 +170692,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -163810,9 +170726,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -163856,6 +170769,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -164117,6 +171031,25 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + @@ -164138,9 +171071,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -164163,10 +171096,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -164182,8 +171115,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -164253,9 +171186,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -164305,7 +171235,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -164326,7 +171256,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -164465,7 +171395,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -164554,9 +171484,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -164676,9 +171603,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -165255,7 +172180,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -165309,9 +172234,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -165834,7 +172757,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -165855,7 +172778,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -166013,7 +172936,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -166102,9 +173025,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -166224,9 +173144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -166354,9 +173272,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -166413,7 +173329,7 @@ This element is labeled as a modifier because the status contains the codes that - + @@ -166522,9 +173438,7 @@ This element is labeled as a modifier because the status contains the codes that - + @@ -166880,11 +173794,7 @@ The typeCode should be mapped from the ClinicalDocument/code element to a set of - + @@ -167052,7 +173962,7 @@ serviceEvent/effectiveTime/high/ - + @@ -167106,9 +174016,7 @@ serviceEvent/effectiveTime/high/ - + @@ -167380,7 +174288,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -167434,9 +174342,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -167478,7 +174384,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -167489,7 +174395,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -167506,9 +174412,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -167606,9 +174512,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -167638,7 +174542,7 @@ In the HL7 Healthcare Privacy and Security Classification (HCS) there are code s - + @@ -167714,7 +174618,7 @@ In the HL7 Healthcare Privacy and Security Classification (HCS) there are code s - + @@ -167768,9 +174672,7 @@ In the HL7 Healthcare Privacy and Security Classification (HCS) there are code s - + @@ -167837,9 +174739,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -168146,9 +175046,7 @@ Composition.date"> - + @@ -168192,7 +175090,7 @@ This element is labeled as a modifier because the status contains the codes that - + @@ -168275,9 +175173,7 @@ This element is labeled as a modifier because the status contains the codes that - + @@ -168542,11 +175438,7 @@ The typeCode should be mapped from the ClinicalDocument/code element to a set of - + @@ -168814,13 +175706,13 @@ serviceEvent/effectiveTime/high/ - + - + @@ -168829,9 +175721,9 @@ serviceEvent/effectiveTime/high/ - - - + + + @@ -168903,9 +175795,7 @@ serviceEvent/effectiveTime/high/ - + @@ -168922,7 +175812,7 @@ In the HL7 Healthcare Privacy and Security Classification (HCS) there are code s - + @@ -168984,9 +175874,7 @@ In the HL7 Healthcare Privacy and Security Classification (HCS) there are code s - + @@ -169157,7 +176045,7 @@ Composition.date"> - + @@ -169175,7 +176063,7 @@ Composition.date"> - + @@ -169282,7 +176170,7 @@ Composition.date"> - + @@ -169371,9 +176259,6 @@ Composition.date"> - - - @@ -169509,9 +176394,7 @@ Composition.date"> - + @@ -169694,9 +176577,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -169725,7 +176606,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -169746,7 +176627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -169881,7 +176762,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -169970,9 +176851,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -170092,9 +176970,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -170277,7 +177153,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -170331,9 +177207,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -170535,7 +177409,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -170589,9 +177463,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -170726,9 +177598,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -171061,7 +177930,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171115,9 +177984,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171161,7 +178028,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171238,22 +178105,26 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + + + + - + + @@ -171322,15 +178193,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + @@ -171365,6 +178236,66 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -171509,7 +178440,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171563,9 +178494,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171760,7 +178689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171802,7 +178731,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -171856,9 +178785,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -172300,7 +179227,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -172354,9 +179281,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -172482,9 +179407,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -172588,7 +179511,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -172887,9 +179810,6 @@ There may be many levels in the hierachy, and this may only pic specific levels - - - @@ -173120,7 +180040,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -173171,17 +180091,21 @@ There may be many levels in the hierachy, and this may only pic specific levels - - - - + + + + + + + - + + @@ -173229,10 +180153,10 @@ There may be many levels in the hierachy, and this may only pic specific levels - - - - + + + + @@ -173259,6 +180183,40 @@ There may be many levels in the hierachy, and this may only pic specific levels + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173452,7 +180410,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -173783,9 +180741,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -173850,7 +180806,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -173882,7 +180838,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -173903,7 +180859,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -174023,7 +180979,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -174112,9 +181068,6 @@ There may be many levels in the hierachy, and this may only pic specific levels - - - @@ -174234,9 +181187,7 @@ There may be many levels in the hierachy, and this may only pic specific levels - + @@ -174591,9 +181542,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -174613,13 +181561,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -174890,9 +181832,6 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - - - @@ -174912,13 +181851,7 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - + @@ -174956,7 +181889,7 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - + @@ -174977,7 +181910,7 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - + @@ -175107,7 +182040,7 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - + @@ -175196,9 +182129,6 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - - - @@ -175318,9 +182248,7 @@ and not "https://pacs.hospital.org/wado-rs/studies/1.2.250.1.59.40211.12345 - + @@ -175784,7 +182712,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -175805,7 +182733,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -175935,7 +182863,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -176024,9 +182952,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -176146,9 +183071,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -176647,7 +183570,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -176668,7 +183591,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -176798,7 +183721,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -176887,9 +183810,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -177009,9 +183929,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -177170,7 +184088,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -177224,9 +184142,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -177413,7 +184329,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -177467,9 +184383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -178208,7 +185122,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -178229,7 +185143,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -178317,7 +185231,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -178406,9 +185320,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -178528,9 +185439,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -178574,11 +185483,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -179550,11 +186455,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180141,7 +187042,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180162,7 +187063,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180176,7 +187077,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180207,7 +187108,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180250,7 +187151,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -180339,9 +187240,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -180461,9 +187359,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -181186,7 +188082,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -181240,9 +188136,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -181538,7 +188432,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -181552,19 +188446,48 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -181574,6 +188497,1334 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -181619,7 +189870,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -181673,9 +189924,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -181890,7 +190139,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182450,25 +190699,447 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - - - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -182584,7 +191255,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182605,7 +191276,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182619,7 +191290,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182650,7 +191321,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182693,7 +191364,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -182782,9 +191453,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -182904,9 +191572,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183290,7 +191956,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183344,9 +192010,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183427,7 +192091,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183481,9 +192145,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183893,7 +192555,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -183947,9 +192609,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -184024,23 +192684,233 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -184098,7 +192968,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -184152,9 +193022,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -184229,9 +193097,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -184575,7 +193441,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185026,18 +193892,67 @@ If the section has content (instead of sub-sections), the section.code does not - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -185081,9 +193996,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185289,7 +194202,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185310,7 +194223,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185400,7 +194313,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185489,9 +194402,6 @@ If the section has content (instead of sub-sections), the section.code does not - - - @@ -185611,9 +194521,7 @@ If the section has content (instead of sub-sections), the section.code does not - + @@ -185657,11 +194565,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -186296,8 +195200,8 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + @@ -186305,6 +195209,142 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186324,10 +195364,35 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186370,7 +195435,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -186424,9 +195489,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -186493,6 +195556,39 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -186621,16 +195717,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + - + - + @@ -186647,8 +195743,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -186662,7 +195758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -186673,8 +195769,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -186713,12 +195809,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -186758,14 +195852,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -186784,14 +195878,47 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -186810,14 +195937,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -186836,14 +195963,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -186865,7 +195992,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -186892,14 +196019,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + @@ -186920,20 +196046,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - - + @@ -186971,7 +196096,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -187025,9 +196150,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -187070,7 +196193,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -187096,7 +196219,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -187157,11 +196280,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -187536,10 +196655,24 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + + + + + + + + + + + + + + + @@ -187551,10 +196684,22 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + + + + + + + + + + + + + @@ -187583,6 +196728,26 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + + + + @@ -187659,12 +196824,12 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - + + + + - + @@ -187672,10 +196837,10 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + - + @@ -187685,8 +196850,28 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + + + + + + + + + + + + + + + + + + + + + @@ -187698,8 +196883,8 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + @@ -187711,8 +196896,8 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + @@ -187727,7 +196912,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -187741,14 +196926,13 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + @@ -187756,20 +196940,19 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - - + @@ -187782,7 +196965,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -187795,7 +196978,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -187821,7 +197004,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -187842,7 +197025,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -187930,7 +197113,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -188019,9 +197202,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -188141,9 +197321,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -188187,11 +197365,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -188705,7 +197879,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -188759,9 +197933,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -188957,7 +198129,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189011,9 +198183,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189209,7 +198379,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189263,9 +198433,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189398,7 +198566,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189452,9 +198620,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189587,7 +198753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189641,9 +198807,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189828,7 +198992,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -189882,9 +199046,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -190015,7 +199177,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -190069,9 +199231,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -190408,7 +199568,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -190462,9 +199622,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -190634,11 +199792,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -191487,7 +200641,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -191508,7 +200662,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -191639,7 +200793,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -191728,9 +200882,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -191850,9 +201001,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -192475,7 +201624,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -192529,9 +201678,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -192767,7 +201914,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -192821,9 +201968,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193227,7 +202372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193281,9 +202426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193529,7 +202672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193583,9 +202726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193875,7 +203016,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -193929,9 +203070,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194190,7 +203329,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194244,9 +203383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194519,7 +203656,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194573,9 +203710,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194744,7 +203879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194798,9 +203933,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -194979,7 +204112,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -195033,9 +204166,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -195782,7 +204913,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -195836,9 +204967,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -196050,7 +205179,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -196104,9 +205233,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -196589,7 +205716,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -196643,9 +205770,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -197132,7 +206257,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -197186,9 +206311,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -197814,7 +206937,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -197868,9 +206991,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198194,7 +207315,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198248,9 +207369,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198601,7 +207720,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198655,9 +207774,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198808,7 +207925,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -198862,9 +207979,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199196,7 +208311,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199250,9 +208365,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199412,9 +208525,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -199501,7 +208611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199555,9 +208665,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199865,7 +208973,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -199919,9 +209027,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -203340,9 +212446,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -203607,7 +212710,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -203628,7 +212731,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -203782,7 +212885,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -203871,9 +212974,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -203993,9 +213093,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -204702,7 +213800,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -204756,9 +213854,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -205011,7 +214107,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -205065,9 +214161,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -205962,7 +215056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -205983,7 +215077,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -206106,7 +215200,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -206195,9 +215289,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -206317,9 +215408,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -206915,7 +216004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -206936,7 +216025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -207066,7 +216155,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -207155,9 +216244,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -207277,9 +216363,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -207513,7 +216597,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -207741,7 +216825,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -207795,9 +216879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -208321,7 +217403,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -208693,7 +217775,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -208714,7 +217796,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -208806,7 +217888,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -208895,9 +217977,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -209017,9 +218096,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -209063,11 +218140,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -209599,7 +218672,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -209653,9 +218726,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -209867,7 +218938,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -209921,9 +218992,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -210095,7 +219164,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -210149,9 +219218,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -210401,11 +219468,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -210982,7 +220045,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -211003,7 +220066,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -211141,7 +220204,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -211230,9 +220293,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -211352,9 +220412,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -211740,7 +220798,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -211794,9 +220852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212030,7 +221086,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212084,9 +221140,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212635,7 +221689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212656,7 +221710,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212782,7 +221836,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -212871,9 +221925,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -212993,9 +222044,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -213826,7 +222875,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -213847,7 +222896,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -213976,7 +223025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -214065,9 +223114,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -214187,9 +223233,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -214764,7 +223808,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -214818,9 +223862,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -215032,9 +224074,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -215163,7 +224202,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -215217,9 +224256,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -215434,7 +224471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -215488,9 +224525,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -216106,9 +225141,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -216352,18 +225384,2250 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -216378,7 +227642,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -216521,7 +227785,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -216610,9 +227874,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -216732,9 +227993,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -217066,12 +228325,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -217313,153 +228567,9 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - @@ -217472,13 +228582,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + @@ -217711,7 +228818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -217765,9 +228872,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -218064,9 +229169,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -218251,7 +229353,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -218305,9 +229407,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -218477,7 +229577,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -218531,9 +229631,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -218972,12 +230070,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -219136,40 +230229,17 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - - - - - - - - - - - - - - - - - - + - - - - - - - + @@ -219488,9 +230558,6 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - - - @@ -219800,7 +230867,7 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - + @@ -219821,7 +230888,7 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - + @@ -219964,7 +231031,7 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - + @@ -220053,9 +231120,6 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - - - @@ -220175,9 +231239,7 @@ A reference value pointing to a ServiceRequest resource is allowed but is not re - + @@ -220276,6 +231338,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -220405,9 +231468,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -220455,9 +231515,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -220501,9 +231558,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -220895,9 +231949,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -220991,9 +232042,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221040,9 +232088,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221151,7 +232196,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -221205,9 +232250,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -221273,9 +232316,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221401,9 +232441,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221548,7 +232585,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -221602,9 +232639,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -221802,9 +232837,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221847,9 +232879,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -221912,7 +232941,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -221966,9 +232995,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -222156,7 +233183,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -222210,9 +233237,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -222339,9 +233364,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -222484,6 +233506,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -222566,9 +233589,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -222603,9 +233623,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -222636,9 +233653,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -222913,9 +233927,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -222983,9 +233994,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223019,9 +234027,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223102,9 +234107,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223191,9 +234193,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223377,9 +234376,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223409,9 +234405,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223575,9 +234568,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -223636,7 +234626,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -223657,7 +234647,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -223791,7 +234781,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -223880,9 +234870,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -224002,9 +234989,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -224812,7 +235797,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -224833,7 +235818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -224971,7 +235956,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -225060,9 +236045,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -225182,9 +236164,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -225279,6 +236259,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -225516,7 +236497,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -225570,9 +236551,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -225873,7 +236852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -225927,9 +236906,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -226322,6 +237299,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -226834,7 +237812,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -226855,7 +237833,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -226956,7 +237934,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -227045,9 +238023,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -227167,9 +238142,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -227213,11 +238186,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -227816,7 +238785,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -227870,9 +238839,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -228035,7 +239002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228089,9 +239056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228246,7 +239211,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228300,9 +239265,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228384,7 +239347,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228438,9 +239401,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228573,7 +239534,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228627,9 +239588,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228792,12 +239751,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228893,7 +239847,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -228947,9 +239901,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229147,7 +240099,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229201,9 +240153,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229336,7 +240286,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229390,9 +240340,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229554,7 +240502,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229608,9 +240556,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229720,7 +240666,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229774,9 +240720,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -229947,7 +240891,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -230001,9 +240945,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -230218,11 +241160,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -230826,12 +241764,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -231219,7 +242152,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -231240,7 +242173,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -231365,7 +242298,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -231454,9 +242387,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -231576,9 +242506,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -231648,6 +242576,82 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231738,36 +242742,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -231800,8 +242774,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -231809,6 +242783,186 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -231833,11 +242987,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -231874,7 +243028,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -231928,9 +243082,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -231984,7 +243136,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -232004,8 +243155,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -232047,7 +243198,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -232101,9 +243252,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -232157,6 +243306,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -232179,40 +243331,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -232257,6 +243375,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -232279,40 +243400,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -232478,7 +243565,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -232532,9 +243619,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -232588,7 +243673,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -232608,8 +243692,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -232621,37 +243705,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -232732,269 +243786,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -233031,6 +243822,56 @@ description of the substance according to standardised sets of properties."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233082,23 +243923,6 @@ description of the substance according to standardised sets of properties."> - - - - - - - - - - - - - - - - - @@ -233118,10 +243942,55 @@ description of the substance according to standardised sets of properties."> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -233138,7 +244007,7 @@ description of the substance according to standardised sets of properties."> - + @@ -233160,7 +244029,6 @@ description of the substance according to standardised sets of properties."> - @@ -233172,8 +244040,8 @@ description of the substance according to standardised sets of properties."> - - + + @@ -233196,6 +244064,9 @@ description of the substance according to standardised sets of properties."> + + + @@ -233210,27 +244081,6 @@ description of the substance according to standardised sets of properties."> - - - - - - - - - - - - - - - - - - - - - @@ -233257,6 +244107,9 @@ description of the substance according to standardised sets of properties."> + + + @@ -233271,27 +244124,6 @@ description of the substance according to standardised sets of properties."> - - - - - - - - - - - - - - - - - - - - - @@ -233386,7 +244218,6 @@ description of the substance according to standardised sets of properties."> - @@ -233398,32 +244229,15 @@ description of the substance according to standardised sets of properties."> - - + + - - - - - - - - - - - - - - - - - - + @@ -233470,93 +244284,6 @@ description of the substance according to standardised sets of properties."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -233567,7 +244294,7 @@ description of the substance according to standardised sets of properties."> - + @@ -233588,7 +244315,7 @@ description of the substance according to standardised sets of properties."> - + @@ -233680,7 +244407,7 @@ description of the substance according to standardised sets of properties."> - + @@ -233712,7 +244439,7 @@ description of the substance according to standardised sets of properties."> - + @@ -233801,9 +244528,6 @@ description of the substance according to standardised sets of properties."> - - - @@ -233923,9 +244647,7 @@ description of the substance according to standardised sets of properties."> - + @@ -234127,9 +244849,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -234311,7 +245031,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -234365,9 +245085,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -234640,7 +245358,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -234694,9 +245412,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -234834,7 +245550,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -234888,9 +245604,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235023,7 +245737,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235077,9 +245791,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235214,7 +245926,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235268,9 +245980,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235466,7 +246176,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235520,9 +246230,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235707,7 +246415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235761,9 +246469,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235873,7 +246579,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -235927,9 +246633,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -236036,7 +246740,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -236090,9 +246794,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -236255,7 +246957,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -236377,9 +247079,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -236985,7 +247685,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -237006,7 +247706,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -237149,7 +247849,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -237238,9 +247938,6 @@ For searching knowing previous names that the product/plan was known by can be v - - - @@ -237360,9 +248057,7 @@ For searching knowing previous names that the product/plan was known by can be v - + @@ -237705,7 +248400,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -237759,9 +248454,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -237921,7 +248614,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -237975,9 +248668,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -238594,7 +249285,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -238615,7 +249306,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -238749,7 +249440,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -238838,9 +249529,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -238960,9 +249648,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239337,7 +250023,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239391,9 +250077,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239624,7 +250308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239678,9 +250362,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239833,7 +250515,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -239887,9 +250569,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -240841,7 +251521,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -240862,7 +251542,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -240954,7 +251634,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -241043,9 +251723,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -241165,9 +251842,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -241211,11 +251886,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -242385,11 +253056,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -243135,7 +253802,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -243156,7 +253823,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -243284,7 +253951,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -243373,9 +254040,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -243495,9 +254159,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -243646,7 +254308,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -243700,9 +254362,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -243930,7 +254590,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -243951,7 +254611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -244098,7 +254758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -244187,9 +254847,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -244309,9 +254966,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -244826,7 +255481,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -244880,9 +255535,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -245573,7 +256226,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -245594,7 +256247,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -245723,7 +256376,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -245812,9 +256465,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -245934,9 +256584,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -246144,9 +256792,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -246449,7 +257095,7 @@ For searching knowing previous names that the location was known by can be very - + @@ -246503,9 +257149,7 @@ For searching knowing previous names that the location was known by can be very - + @@ -246707,9 +257351,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -246751,7 +257393,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -246805,9 +257447,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -247176,9 +257816,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -247459,9 +258097,7 @@ For searching knowing previous names that the location was known by can be very - + @@ -247597,7 +258233,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -247618,7 +258254,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -247743,7 +258379,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -247832,9 +258468,6 @@ Specific services within the location may have their own hours which could be sh - - - @@ -247954,9 +258587,7 @@ Specific services within the location may have their own hours which could be sh - + @@ -248026,6 +258657,49 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -248119,8 +258793,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -248129,8 +258803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + @@ -248145,7 +258818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248193,7 +258866,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248247,9 +258920,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248397,6 +259068,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -248451,20 +259152,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - - + - + @@ -248540,7 +259240,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248561,7 +259261,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248661,7 +259361,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248750,9 +259450,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -248872,9 +259569,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -248918,11 +259613,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -250457,7 +261148,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -250511,9 +261202,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -250863,7 +261552,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -250917,9 +261606,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251172,7 +261859,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251226,9 +261913,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251412,7 +262097,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251466,9 +262151,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251652,7 +262335,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251706,9 +262389,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -251927,11 +262608,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -253464,7 +264141,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -253485,7 +264162,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -253621,7 +264298,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -253710,9 +264387,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -253832,9 +264506,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -253938,9 +264610,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -253985,9 +264654,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -254324,9 +264990,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -254385,7 +265048,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -254439,9 +265102,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -254564,7 +265225,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -254618,9 +265279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -254849,7 +265508,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -254903,9 +265562,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255031,7 +265688,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255085,9 +265742,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255221,7 +265876,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255275,9 +265930,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255452,7 +266105,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255506,9 +266159,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -255796,9 +266447,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -255830,9 +266478,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -256052,9 +266697,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -256535,7 +267177,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -256556,7 +267198,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -256664,7 +267306,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -256690,7 +267332,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -256779,9 +267421,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -256901,9 +267540,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257014,7 +267651,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257069,14 +267706,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -257136,7 +267773,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257147,14 +267784,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + @@ -257223,7 +267860,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257277,9 +267914,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257347,9 +267982,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + - + @@ -257364,7 +268006,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257426,7 +268068,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257492,7 +268134,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257546,9 +268188,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257676,7 +268316,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257732,7 +268372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257774,10 +268414,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -257815,7 +268455,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257826,10 +268466,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -257876,9 +268516,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + - + @@ -257893,7 +268540,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -257929,7 +268576,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -258027,7 +268674,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -258048,7 +268695,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -258182,7 +268829,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -258271,9 +268918,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -258393,9 +269037,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -259057,7 +269699,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -259111,9 +269753,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -259445,7 +270085,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -259499,9 +270139,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -259544,7 +270182,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -260430,7 +271068,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -260611,7 +271249,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -260632,7 +271270,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -260779,7 +271417,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -260868,9 +271506,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -260990,9 +271625,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -261171,9 +271804,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -261241,6 +271871,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -261504,7 +272164,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -261558,9 +272218,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -261781,9 +272439,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -261871,13 +272526,43 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -262109,7 +272794,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -262185,7 +272870,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -262239,9 +272924,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -262337,9 +273020,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -262386,9 +273066,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -262627,9 +273304,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -262684,6 +273358,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + @@ -262970,9 +273661,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -263034,13 +273722,30 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + @@ -263194,7 +273899,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263259,9 +273964,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -263295,9 +273997,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -263389,7 +274088,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263410,7 +274109,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263536,7 +274235,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263625,9 +274324,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -263747,9 +274443,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263852,7 +274546,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -263942,44 +274636,17 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -263995,67 +274662,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -264115,7 +274730,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264169,9 +274784,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264266,7 +274879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264291,33 +274904,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -264385,7 +274971,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264439,9 +275025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264534,300 +275118,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -264854,40 +275144,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -264929,7 +275185,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -264983,9 +275239,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265181,7 +275435,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265235,9 +275489,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265370,7 +275622,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265424,9 +275676,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265479,7 +275729,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265534,7 +275784,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265588,9 +275838,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265697,7 +275945,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265751,9 +275999,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265912,7 +276158,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -265966,9 +276212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266107,7 +276351,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266161,9 +276405,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266229,6 +276471,35 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -266296,7 +276567,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266350,9 +276621,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266392,32 +276661,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -266442,343 +276685,20 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -266805,7 +276725,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266860,7 +276780,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -266914,9 +276834,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267024,7 +276942,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267078,9 +276996,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267239,7 +277155,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267293,9 +277209,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267388,16 +277302,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + - + - + @@ -267414,8 +277328,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -267429,7 +277343,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267440,8 +277354,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -267480,12 +277394,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -267525,14 +277437,42 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -267550,24 +277490,476 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + @@ -267633,7 +278025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267697,77 +278089,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -267819,7 +278158,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -267831,20 +278170,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - @@ -267898,124 +278223,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -268029,27 +278236,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - @@ -268186,7 +278372,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -268341,6 +278527,22 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + @@ -268367,19 +278569,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - @@ -268391,136 +278580,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -268534,7 +278602,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -268659,10 +278727,151 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -268672,10 +278881,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -268684,19 +278893,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + - - + + + + + + + + + - + + + + @@ -268712,7 +278938,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -268733,7 +278959,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -268878,7 +279104,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -268967,9 +279193,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -269089,9 +279312,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -269178,13 +279399,189 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -269275,11 +279672,41 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -269359,7 +279786,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -269448,71 +279875,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -269554,7 +279916,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -269603,7 +279965,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -269622,6 +279984,41 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -269672,8 +280069,8 @@ Clinical decision support systems should take the status into account when deter - - + + @@ -269800,6 +280197,79 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -269846,49 +280316,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -269982,145 +280409,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -270151,7 +280439,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -270234,15 +280522,154 @@ Clinical decision support systems should take the status into account when deter - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -270265,24 +280692,45 @@ Clinical decision support systems should take the status into account when deter - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -270300,10 +280748,6 @@ Note that one should NOT use the List or Composition resource to accomplish the - - - - @@ -270358,7 +280802,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -270412,9 +280856,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -270500,7 +280942,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -270554,9 +280996,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -270987,7 +281427,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -271041,9 +281481,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -271116,7 +281554,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -271159,9 +281597,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -271182,45 +281617,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -271257,6 +281653,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -271355,13 +281754,124 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -271426,11 +281936,28 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + - + @@ -271484,7 +282011,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -271547,45 +282074,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -271614,7 +282102,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -271650,7 +282138,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -271669,6 +282157,28 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + + + + + + @@ -271706,8 +282216,8 @@ Clinical decision support systems should take the status into account when deter - - + + @@ -271795,6 +282305,53 @@ Clinical decision support systems should take the status into account when deter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -271828,36 +282385,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -271925,93 +282452,6 @@ Clinical decision support systems should take the status into account when deter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -272029,7 +282469,7 @@ Clinical decision support systems should take the status into account when deter - + @@ -272086,8 +282526,25 @@ Clinical decision support systems should take the status into account when deter - - + + + + + + + + + + + + + + + + + + + @@ -272104,20 +282561,28 @@ Clinical decision support systems should take the status into account when deter - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -272126,10 +282591,6 @@ Note that one should NOT use the List or Composition resource to accomplish the - - - - @@ -272427,7 +282888,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -272457,9 +282918,6 @@ Note that one should NOT use the List or Composition resource to accomplish the - - - @@ -272480,32 +282938,6 @@ Note that one should NOT use the List or Composition resource to accomplish the - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -272529,6 +282961,9 @@ Note that one should NOT use the List or Composition resource to accomplish the + + + @@ -272561,7 +282996,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -272582,7 +283017,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -272596,9 +283031,7 @@ Note that one should NOT use the List or Composition resource to accomplish the - + @@ -272629,11 +283062,7 @@ The primary difference between a medicationusage and a medicationadministration - + @@ -272723,7 +283152,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -272812,9 +283241,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - @@ -272934,9 +283360,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -273017,9 +283441,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -273063,49 +283487,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -273137,7 +283518,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -273583,6 +283964,145 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -273602,7 +284122,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -273610,16 +284129,50 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -273666,9 +284219,9 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + @@ -273699,36 +284252,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -273747,7 +284270,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -274045,6 +284568,23 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + @@ -274056,7 +284596,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - @@ -274064,6 +284603,31 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + @@ -274074,7 +284638,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -274095,7 +284659,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -274220,7 +284784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -274309,9 +284873,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - @@ -274431,9 +284992,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -274529,6 +285088,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -274559,6 +285126,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -274617,7 +285192,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -274720,15 +285296,61 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -274780,6 +285402,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -274845,14 +285475,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -274872,7 +285502,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -274905,36 +285535,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -274965,10 +285565,48 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -274977,8 +285615,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + @@ -274993,7 +285630,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275008,7 +285645,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275060,8 +285697,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -275134,7 +285771,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275188,9 +285825,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275323,6 +285958,44 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -275368,7 +286041,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275422,9 +286095,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275569,7 +286240,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275623,9 +286294,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275770,7 +286439,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -275824,9 +286493,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276001,7 +286668,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276055,9 +286722,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276203,7 +286868,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276257,9 +286922,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276301,8 +286964,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -276313,6 +286976,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -276391,37 +287055,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -276452,14 +287085,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + @@ -276476,10 +287109,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + - - + + @@ -276493,7 +287130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -276504,8 +287141,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -276544,12 +287181,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -276589,15 +287224,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + - - + + @@ -276613,89 +287248,37 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - - - - + + + + - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -276710,179 +287293,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -276934,6 +287345,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -276951,6 +287370,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -276983,7 +287410,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -277047,15 +287475,48 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -277081,6 +287542,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + @@ -277120,8 +287589,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -277134,7 +287603,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -277154,23 +287623,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - @@ -277188,22 +287640,46 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -277213,7 +287689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -277244,8 +287720,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -277331,6 +287807,31 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + @@ -277572,13 +288073,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + @@ -277623,24 +288125,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - @@ -277658,10 +288142,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -277669,113 +288153,56 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + - - - - - + + + + + - + - + - - - - + + + + + + + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -277788,7 +288215,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -277809,7 +288236,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -277912,7 +288339,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -278001,9 +288428,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -278123,9 +288547,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -278169,11 +288591,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -278913,7 +289331,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -278967,9 +289385,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -279160,9 +289576,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -279217,7 +289630,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -279271,9 +289684,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -279429,11 +289840,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -279971,9 +290378,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -280051,7 +290455,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -280072,7 +290476,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -280202,7 +290606,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -280291,9 +290695,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -280413,9 +290814,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -280567,7 +290966,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -280621,9 +291020,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -280996,7 +291393,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -281050,9 +291447,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -281407,7 +291802,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -281461,9 +291856,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -282314,7 +292707,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -282335,7 +292728,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -282415,7 +292808,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -282504,9 +292897,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -282626,9 +293016,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283128,7 +293516,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283149,7 +293537,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283273,7 +293661,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283362,9 +293750,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -283484,9 +293869,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283808,7 +294191,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283862,9 +294245,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -283930,9 +294311,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -283993,9 +294371,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -284030,9 +294405,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -284120,9 +294492,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -284224,7 +294593,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -284278,9 +294647,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -284544,7 +294911,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -284598,9 +294965,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -284666,9 +295031,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -284703,9 +295065,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -284818,9 +295177,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -285078,7 +295434,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285132,9 +295488,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285423,7 +295777,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285477,9 +295831,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285545,9 +295897,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -285754,7 +296103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285808,9 +296157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -285977,7 +296324,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -286031,9 +296378,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -286166,7 +296511,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -286220,9 +296565,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -286500,9 +296843,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286537,9 +296877,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286561,9 +296898,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286612,9 +296946,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286780,9 +297111,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286804,9 +297132,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -286867,9 +297192,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -287125,9 +297447,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -287363,7 +297682,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -287384,7 +297703,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -287488,7 +297807,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -287577,9 +297896,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -287699,9 +298015,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -287745,11 +298059,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -288302,7 +298612,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -288356,9 +298666,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -288630,11 +298938,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -289085,7 +299389,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -289103,7 +299407,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -289232,7 +299536,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -289321,9 +299625,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -289443,9 +299744,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -289537,6 +299836,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -289655,9 +299955,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -289992,7 +300290,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -290046,9 +300344,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -290348,7 +300644,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -290402,9 +300698,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -290547,7 +300841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -290601,9 +300895,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -290898,6 +301190,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -290969,9 +301262,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -291494,7 +301785,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -291515,7 +301806,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -291667,7 +301958,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -291756,9 +302047,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -291878,9 +302166,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -292527,7 +302813,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -292581,9 +302867,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -292761,7 +303045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -292815,9 +303099,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -292991,7 +303273,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -293045,9 +303327,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -293316,7 +303596,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -293370,9 +303650,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -293659,7 +303937,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -293713,9 +303991,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -294050,7 +304326,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -294104,9 +304380,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -295621,7 +305895,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -295642,7 +305916,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -295767,7 +306041,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -295856,9 +306130,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -295978,9 +306249,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296244,7 +306513,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296298,9 +306567,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296442,7 +306709,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296496,9 +306763,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296667,7 +306932,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296721,9 +306986,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296881,7 +307144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -296935,9 +307198,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -297109,6 +307370,33 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -297543,6 +307831,20 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + @@ -297570,7 +307872,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -297594,7 +307896,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -297768,7 +308070,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -297857,9 +308159,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -297979,9 +308278,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -298203,7 +308500,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - @@ -298385,6 +308681,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -298657,14 +308955,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -298742,9 +309033,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -298881,9 +309170,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -298906,9 +309193,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -299125,7 +309409,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -299179,9 +309463,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -299330,7 +309612,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299378,7 +309660,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299583,7 +309865,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299637,9 +309919,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299720,7 +310000,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299735,12 +310015,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -299817,9 +310092,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -300132,7 +310405,6 @@ The alternate way is to use the value element for actual observations and use th - @@ -300270,6 +310542,8 @@ The alternate way is to use the value element for actual observations and use th + + @@ -300469,14 +310743,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -300541,9 +310808,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -300641,9 +310906,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -300653,9 +310916,6 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - - - @@ -300875,7 +311135,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -300910,7 +311170,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -301063,7 +311323,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -301078,12 +311338,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -301147,9 +311402,7 @@ If the use case requires BodySite to be handled as a separate resource (e.g. to - + @@ -301251,7 +311504,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -301272,7 +311525,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -301385,9 +311638,7 @@ The alternate way is to use the value element for actual observations and use th - + @@ -301413,7 +311664,7 @@ OMC"> - + @@ -301502,9 +311753,6 @@ OMC"> - - - @@ -301624,9 +311872,7 @@ OMC"> - + @@ -301808,8 +312054,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -302247,11 +312492,11 @@ Unknown does not represent "other" - one of the defined statuses must - + - + @@ -302378,8 +312623,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -302463,8 +312707,7 @@ OMC-4"> - + @@ -302503,8 +312746,7 @@ Example: 14975008 |Forearm structure|."> - + @@ -302680,7 +312922,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -302734,9 +312976,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -302953,7 +313193,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -303007,9 +313247,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -303481,7 +313719,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -303535,9 +313773,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -303722,9 +313958,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -303812,8 +314046,7 @@ OMC"> - + @@ -304056,7 +314289,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -304135,8 +314368,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -304194,8 +314426,7 @@ OMC-4"> - + @@ -304221,8 +314452,7 @@ Example: 14975008 |Forearm structure|."> - + @@ -304732,7 +314962,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -304756,7 +314986,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -304848,7 +315078,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -304937,9 +315167,6 @@ Example: 702659008 |Automated count technique|."> - - - @@ -305059,9 +315286,7 @@ Example: 702659008 |Automated count technique|."> - + @@ -305105,11 +315330,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -305616,11 +315837,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -305972,7 +316189,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -306026,9 +316243,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -306357,7 +316572,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306411,9 +316626,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306566,7 +316779,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306620,9 +316833,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306782,7 +316993,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306836,9 +317047,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -306965,11 +317174,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -307294,11 +317499,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -307797,7 +317998,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -307818,7 +318019,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -307944,7 +318145,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -308033,9 +318234,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -308155,9 +318353,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -308246,7 +318442,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -308300,9 +318496,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -308390,9 +318584,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -308515,9 +318707,7 @@ The required element provides a base level of computable interoperability across - + @@ -308662,9 +318852,7 @@ For resource issues, this will be a simple XPath limited to element names, repet - + @@ -308748,9 +318936,7 @@ The required element provides a base level of computable interoperability across - + @@ -308803,7 +318989,7 @@ For resource issues, this will be a simple XPath limited to element names, repet - + @@ -308824,7 +319010,7 @@ For resource issues, this will be a simple XPath limited to element names, repet - + @@ -308979,7 +319165,7 @@ For resource issues, this will be a simple XPath limited to element names, repet - + @@ -309068,9 +319254,6 @@ For resource issues, this will be a simple XPath limited to element names, repet - - - @@ -309190,9 +319373,7 @@ For resource issues, this will be a simple XPath limited to element names, repet - + @@ -309284,9 +319465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -309336,11 +319515,7 @@ This element is labeled as a modifier because it may be used to mark that the re - + @@ -309438,9 +319613,7 @@ We expect that some jurisdictions will profile this optionality to be a single c - + @@ -309663,7 +319836,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -309717,9 +319890,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -310013,9 +320184,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -310052,11 +320221,7 @@ This element is labeled as a modifier because it may be used to mark that the re - + @@ -310128,9 +320293,7 @@ We expect that some jurisdictions will profile this optionality to be a single c - + @@ -310394,7 +320557,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -310415,7 +320578,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -310429,7 +320592,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -310450,8 +320613,8 @@ For searching knowing previous names that the organization was known by can be v - - + + @@ -310536,7 +320699,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -310625,9 +320788,6 @@ For searching knowing previous names that the organization was known by can be v - - - @@ -310747,9 +320907,7 @@ For searching knowing previous names that the organization was known by can be v - + @@ -311193,8 +321351,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -311462,7 +321620,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -311483,7 +321641,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -311608,7 +321766,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -311697,9 +321855,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -311819,9 +321974,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -311951,14 +322104,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -312005,7 +322158,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -312055,8 +322209,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -312118,10 +322272,149 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312143,6 +322436,36 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312233,37 +322556,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -312371,7 +322663,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -312425,9 +322717,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -312723,7 +323013,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -312777,9 +323067,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -312936,7 +323224,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -312990,9 +323278,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -313034,14 +323320,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - + + @@ -313067,23 +323353,20 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - - - @@ -313102,8 +323385,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -313198,8 +323481,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -313226,7 +323509,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -313263,8 +323547,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -313300,6 +323584,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + @@ -313312,6 +323613,23 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + @@ -313363,24 +323681,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - @@ -313636,10 +323936,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + @@ -313656,8 +323956,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -313665,9 +323965,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -313678,8 +323975,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -313701,7 +323998,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -313722,7 +324019,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -313806,7 +324103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -313895,9 +324192,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -313961,7 +324255,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -314015,9 +324309,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -314169,6 +324461,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -314205,6 +324500,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -314444,6 +324742,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -314480,6 +324781,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -314564,7 +324868,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -314588,7 +324892,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -314738,7 +325042,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -314827,9 +325131,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -314949,9 +325250,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -315041,12 +325340,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -315465,10 +325759,7 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - + @@ -315570,7 +325861,7 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - + @@ -315624,9 +325915,7 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - + @@ -316011,7 +326300,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -316065,9 +326354,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -316135,9 +326422,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -316208,10 +326492,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -316289,13 +326570,10 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - - + + - + @@ -316342,7 +326620,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -316396,9 +326674,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -316586,12 +326862,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -316893,10 +327164,7 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - + @@ -317198,9 +327466,6 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - - - @@ -317258,10 +327523,7 @@ Deceased patients may also be marked as inactive for the same reasons, but may b - + @@ -317313,13 +327575,10 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - - + + - + @@ -317405,7 +327664,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -317426,7 +327685,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -317565,7 +327824,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -317654,9 +327913,6 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - - - @@ -317776,9 +328032,7 @@ Jurisdictions may decide that they can profile this down to 1 if desired, or 1 p - + @@ -318569,7 +328823,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -318590,7 +328844,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -318720,7 +328974,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -318809,9 +329063,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -318931,9 +329182,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -319420,7 +329669,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -319474,9 +329723,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -319888,7 +330135,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -319942,9 +330189,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -320589,7 +330834,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -320610,7 +330855,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -320726,7 +330971,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -320815,9 +331060,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -320937,9 +331179,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321213,7 +331453,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321267,9 +331507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321338,10 +331576,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -321431,7 +331667,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321485,9 +331721,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321752,10 +331986,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -321841,7 +332073,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321862,7 +332094,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -321989,7 +332221,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -322078,9 +332310,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -322200,9 +332429,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -322281,6 +332508,42 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -322436,6 +332699,44 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -322472,16 +332773,62 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -322538,15 +332885,207 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -322562,16 +333101,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + - - + + - + @@ -322619,7 +333157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -322673,9 +333211,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -322833,6 +333369,29 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + @@ -322936,6 +333495,31 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + @@ -322959,12 +333543,45 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -322999,27 +333616,83 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + - + @@ -323095,7 +333768,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -323116,7 +333789,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -323208,7 +333881,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -323297,9 +333970,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -323419,9 +334089,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -323465,11 +334133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -324607,7 +335271,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -324661,9 +335325,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -324969,7 +335631,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325023,9 +335685,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325107,6 +335767,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -325123,6 +335784,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + @@ -325214,7 +335887,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325268,9 +335941,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325415,7 +336086,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325469,9 +336140,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325677,7 +336346,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325731,9 +336400,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -325773,10 +336440,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -326084,9 +336781,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326210,7 +336905,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -326264,9 +336959,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -326429,7 +337122,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326483,9 +337176,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326669,7 +337360,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326723,9 +337414,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326902,7 +337591,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -326956,9 +337645,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -327219,7 +337906,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -327273,9 +337960,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -327730,7 +338415,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -327742,6 +338427,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -327846,7 +338532,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -327900,9 +338586,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -328071,11 +338755,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -328997,6 +339677,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur + @@ -329008,6 +339689,18 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + @@ -329200,10 +339893,27 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + + + + + + + + + - + @@ -329394,9 +340104,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -330082,13 +340790,14 @@ In addition, because the subject needs to be resolved during realization, use of - + + @@ -330209,7 +340918,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -330230,7 +340939,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -330378,7 +341087,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -330467,9 +341176,6 @@ In addition, because the subject needs to be resolved during realization, use of - - - @@ -330589,9 +341295,7 @@ In addition, because the subject needs to be resolved during realization, use of - + @@ -330723,7 +341427,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -330807,10 +341511,44 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -330990,7 +341728,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331040,7 +341778,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331094,9 +341832,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331303,9 +342039,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -331433,7 +342166,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331491,10 +342224,31 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + - + @@ -331622,7 +342376,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331746,9 +342500,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -331789,7 +342540,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331810,7 +342561,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -331958,7 +342709,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -332047,9 +342798,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -332169,9 +342917,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -332657,7 +343403,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -332711,9 +343457,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -332928,7 +343672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -332982,9 +343726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -333118,9 +343860,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -333617,9 +344357,7 @@ So the endpoint satisfies the need to be able to define the technical connection - + @@ -333644,7 +344382,7 @@ So the endpoint satisfies the need to be able to define the technical connection - + @@ -333665,7 +344403,7 @@ So the endpoint satisfies the need to be able to define the technical connection - + @@ -333799,7 +344537,7 @@ So the endpoint satisfies the need to be able to define the technical connection - + @@ -333888,9 +344626,6 @@ So the endpoint satisfies the need to be able to define the technical connection - - - @@ -334010,9 +344745,7 @@ So the endpoint satisfies the need to be able to define the technical connection - + @@ -334254,9 +344987,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -334544,9 +345275,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -334773,7 +345502,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -334827,9 +345556,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -335122,9 +345849,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -335406,7 +346130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -335460,9 +346184,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -335806,9 +346528,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -336018,9 +346738,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -336342,9 +347060,6 @@ Age is generally used when the patient reports an age at which the procedure was - - - @@ -336622,7 +347337,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -336643,7 +347358,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -336790,7 +347505,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -336879,9 +347594,6 @@ Age is generally used when the patient reports an age at which the procedure was - - - @@ -337001,9 +347713,7 @@ Age is generally used when the patient reports an age at which the procedure was - + @@ -337138,11 +347848,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -337258,19 +347968,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + - + - + @@ -337287,8 +347999,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -337360,12 +348072,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -337384,6 +348103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -337414,6 +348134,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -337519,7 +348242,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337573,9 +348296,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337618,7 +348339,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337649,7 +348370,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337720,7 +348441,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337732,10 +348453,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - + @@ -337776,10 +348498,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -337798,6 +348520,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -337850,7 +348575,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337904,9 +348629,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337948,7 +348671,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -337985,7 +348708,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338035,7 +348758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338060,8 +348783,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -338191,7 +348921,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338272,14 +349002,16 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + - + @@ -338288,8 +349020,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -338348,12 +349080,19 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -338367,6 +349106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -338389,6 +349129,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -338456,7 +349199,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338474,7 +349217,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338532,17 +349275,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + + - + @@ -338570,10 +349314,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - + + + @@ -338584,6 +349328,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -338610,7 +349357,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338634,7 +349381,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338671,7 +349418,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338683,8 +349430,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + @@ -338711,7 +349465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338732,7 +349486,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338841,7 +349595,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -338930,9 +349684,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -339052,9 +349803,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340078,7 +350827,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340132,9 +350881,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340440,7 +351187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340494,9 +351241,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340538,7 +351283,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -340788,11 +351533,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -341014,7 +351755,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -341068,9 +351809,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -341246,7 +351985,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -341300,9 +352039,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -342333,7 +353070,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -342505,11 +353242,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -342808,7 +353541,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -342829,7 +353562,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -342962,7 +353695,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -343051,9 +353784,6 @@ The value may come from the ElementDefinition referred to by .definition."> - - - @@ -343173,9 +353903,7 @@ The value may come from the ElementDefinition referred to by .definition."> - + @@ -343221,11 +353949,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -343507,10 +354235,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -343552,9 +354278,9 @@ This element is optional to allow for systems that might not know the value, how - - - + + + @@ -343604,9 +354330,9 @@ This element is optional to allow for systems that might not know the value, how - - - + + + @@ -343617,6 +354343,8 @@ This element is optional to allow for systems that might not know the value, how + + @@ -343696,7 +354424,7 @@ This element is optional to allow for systems that might not know the value, how - + @@ -343750,9 +354478,7 @@ This element is optional to allow for systems that might not know the value, how - + @@ -343827,9 +354553,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -343935,7 +354659,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -343989,9 +354713,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -344037,11 +354759,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -344093,9 +354815,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -344200,7 +354919,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -344395,10 +355114,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -344427,9 +355144,9 @@ This element is optional to allow for systems that might not know the value, how - - - + + + @@ -344466,14 +355183,16 @@ This element is optional to allow for systems that might not know the value, how - - - + + + + + @@ -344539,9 +355258,7 @@ This element is optional to allow for systems that might not know the value, how - + @@ -344599,7 +355316,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -344642,9 +355359,6 @@ There is no need for this element if the item pointed to by the linkId has a def - - - @@ -344701,7 +355415,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -344722,7 +355436,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -344847,7 +355561,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -344936,9 +355650,6 @@ There is no need for this element if the item pointed to by the linkId has a def - - - @@ -345058,9 +355769,7 @@ There is no need for this element if the item pointed to by the linkId has a def - + @@ -345102,8 +355811,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -345132,14 +355841,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -345366,7 +356075,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -345444,241 +356153,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -345817,7 +356291,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -345871,9 +356345,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -346085,8 +356557,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -346102,10 +356574,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -346240,7 +356712,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -346284,78 +356756,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -346523,7 +356923,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -346544,7 +356944,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -346679,7 +357079,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -346768,9 +357168,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -346890,9 +357287,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -347426,7 +357821,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -347480,9 +357875,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -347550,9 +357943,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -347964,9 +358354,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -348014,7 +358401,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -348035,7 +358422,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -348160,7 +358547,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -348249,9 +358636,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -348371,9 +358755,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -348975,6 +359357,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -349054,7 +359471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349108,9 +359525,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349150,10 +359565,40 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -349359,6 +359804,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -349401,7 +359881,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349455,9 +359935,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349600,7 +360078,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349654,9 +360132,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349916,7 +360392,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -349970,9 +360446,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -350850,6 +361324,28 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + @@ -350888,10 +361384,27 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + - + @@ -351006,6 +361519,28 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + @@ -351489,7 +362024,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -351510,7 +362045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -351626,8 +362161,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -351657,7 +362191,7 @@ StudyProtocolVersion"> - + @@ -351746,9 +362280,6 @@ StudyProtocolVersion"> - - - @@ -351868,9 +362399,7 @@ StudyProtocolVersion"> - + @@ -352106,7 +362635,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -352160,9 +362689,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -352610,7 +363137,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -352664,9 +363191,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353275,7 +363800,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353329,9 +363854,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353482,7 +364005,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353536,9 +364059,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353777,7 +364298,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -353831,9 +364352,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354066,7 +364585,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354120,9 +364639,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354339,7 +364856,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354393,9 +364910,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354675,7 +365190,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354729,9 +365244,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354906,7 +365419,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -354960,9 +365473,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -355185,7 +365696,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -355239,9 +365750,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -355356,8 +365865,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -356793,7 +367301,7 @@ StudyProtocolVersion"> - + @@ -356814,7 +367322,7 @@ StudyProtocolVersion"> - + @@ -356954,7 +367462,7 @@ StudyProtocolVersion"> - + @@ -357043,9 +367551,6 @@ StudyProtocolVersion"> - - - @@ -357165,9 +367670,7 @@ StudyProtocolVersion"> - + @@ -357299,9 +367802,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -357339,7 +367840,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -357393,9 +367894,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -357933,9 +368432,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -358202,7 +368699,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -358223,7 +368720,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -358371,7 +368868,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -358460,9 +368957,6 @@ It is likely that more than one "state" pattern will be recorded for a - - - @@ -358582,9 +369076,7 @@ It is likely that more than one "state" pattern will be recorded for a - + @@ -359009,7 +369501,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -359019,8 +369511,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -359178,7 +369672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -359232,9 +369726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -359842,13 +370334,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + + @@ -360131,7 +370625,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -360152,7 +370646,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -360282,7 +370776,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -360371,9 +370865,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -360493,9 +370984,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -360735,6 +371224,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -360982,6 +371472,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -361051,7 +371542,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -361072,7 +371563,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -361190,7 +371681,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -361279,9 +371770,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -361401,9 +371889,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -361447,11 +371933,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -362327,7 +372809,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -362381,9 +372863,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -362529,11 +373009,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -363094,7 +373570,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -363115,7 +373591,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -363270,7 +373746,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -363359,9 +373835,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -363481,9 +373954,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -364634,6 +375105,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -364647,9 +375119,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -364821,9 +375290,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -364924,7 +375390,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -365806,14 +376272,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + - - - @@ -365933,9 +376397,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -366010,7 +376471,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -366043,7 +376504,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -366064,7 +376525,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -366193,7 +376654,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -366282,9 +376743,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -366404,9 +376862,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -366592,12 +377048,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + - + - + @@ -366928,8 +377385,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + - + @@ -367066,7 +377524,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367087,7 +377545,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367212,7 +377670,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367301,9 +377759,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -367423,9 +377878,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367638,8 +378091,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -367653,6 +378106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -367682,8 +378136,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -367839,7 +378293,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367893,9 +378347,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -367950,6 +378402,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -368123,20 +378577,20 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + - + - + + @@ -368150,9 +378604,76 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -368257,7 +378778,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -368311,9 +378832,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -368383,14 +378902,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -368410,11 +378929,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -368534,7 +379053,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -368588,9 +379107,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -368694,6 +379211,41 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369066,8 +379618,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -369076,6 +379628,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + @@ -369097,8 +379650,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -369197,6 +379750,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + @@ -369310,6 +379865,49 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369318,15 +379916,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - - - @@ -369407,10 +380003,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -369421,11 +380017,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -369529,6 +380125,28 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + @@ -369693,7 +380311,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -369714,7 +380332,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -369843,7 +380461,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -369932,9 +380550,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -370054,9 +380669,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -370261,8 +380874,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -370732,9 +381344,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -370807,9 +381416,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -370859,7 +381465,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -370913,9 +381519,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -371106,7 +381710,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371160,9 +381764,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371229,9 +381831,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -371266,9 +381865,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -371456,7 +382052,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371510,9 +382106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371568,7 +382162,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371789,7 +382383,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -371843,9 +382437,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -372149,8 +382741,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -372412,9 +383003,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -372461,9 +383049,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -372583,9 +383168,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -372607,9 +383189,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -372728,7 +383307,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -372947,7 +383526,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -372971,7 +383550,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -373211,7 +383790,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -373300,9 +383879,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -373422,9 +383998,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -373468,11 +384042,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -373595,12 +384165,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -374164,7 +384729,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -374218,9 +384783,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -374471,7 +385034,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -374525,9 +385088,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -374659,9 +385220,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -374829,7 +385388,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -374883,9 +385442,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -375024,7 +385581,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -375078,9 +385635,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -375324,11 +385879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -375412,12 +385963,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -375929,9 +386475,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -376117,7 +386661,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -376138,7 +386682,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -376232,7 +386776,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -376321,9 +386865,6 @@ The type must match the elements defined in the differential and the snapshot. F - - - @@ -376443,9 +386984,7 @@ The type must match the elements defined in the differential and the snapshot. F - + @@ -376489,11 +387028,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377073,7 +387608,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -377127,9 +387662,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -377351,7 +387884,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377405,9 +387938,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377602,7 +388133,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377656,9 +388187,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377851,7 +388380,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -377905,9 +388434,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378014,7 +388541,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378068,9 +388595,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378214,171 +388739,21 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -378605,7 +388980,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378659,9 +389034,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378914,7 +389287,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -378968,9 +389341,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -379036,6 +389407,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + @@ -379113,7 +389493,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -379167,9 +389547,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -379235,20 +389613,18 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + - - - + @@ -379320,11 +389696,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -379996,166 +390368,16 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -380396,6 +390618,15 @@ In some cases, the resource can no longer be found at the stated url, but the ur + + + + + + + + + @@ -380437,15 +390668,13 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - - + + + + - - - + @@ -380473,7 +390702,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -380494,7 +390723,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -380617,7 +390846,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -380706,9 +390935,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -380828,9 +391054,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -380930,9 +391154,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -381135,7 +391357,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -381189,9 +391411,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -381520,9 +391740,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -381685,9 +391902,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -381956,9 +392171,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -382036,7 +392248,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -382057,7 +392269,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -382177,7 +392389,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -382266,9 +392478,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -382388,9 +392597,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -382470,7 +392677,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -382559,6 +392766,247 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -382594,11 +393042,12 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + - + @@ -382698,7 +393147,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -382748,6 +393197,73 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -382770,7 +393286,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + + @@ -382812,7 +393329,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -382833,7 +393350,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -382877,8 +393394,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -382967,7 +393484,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -383056,9 +393573,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -383178,9 +393692,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -383419,9 +393931,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -383562,10 +394072,7 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + @@ -383580,7 +394087,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -383628,7 +394135,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -383699,7 +394206,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -383925,10 +394432,8 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + + @@ -383970,7 +394475,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -384024,9 +394529,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -384068,8 +394571,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -384079,7 +394582,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384093,15 +394596,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + - - + + @@ -384130,14 +394633,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -384160,7 +394663,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384205,7 +394708,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384259,9 +394762,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384304,7 +394805,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384331,7 +394832,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384365,7 +394866,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384392,7 +394893,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384452,14 +394953,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + @@ -384476,14 +394977,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + @@ -384501,9 +395002,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + - - + + @@ -384517,7 +395022,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384528,8 +395033,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -384568,12 +395073,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -384613,15 +395116,312 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -384640,14 +395440,14 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -384673,20 +395473,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + - - - - + + + + - + - + - + - + @@ -384699,13 +395503,228 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -384857,9 +395876,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -384956,17 +395973,14 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + - + @@ -385001,7 +396015,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385046,7 +396060,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385194,10 +396208,8 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + + @@ -385213,23 +396225,23 @@ Unknown does not represent "other" - one of the defined statuses must - - + + - + - - - - - + + + + + @@ -385249,10 +396261,10 @@ Unknown does not represent "other" - one of the defined statuses must - - + + - + @@ -385266,7 +396278,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385286,7 +396298,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385300,7 +396312,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385321,7 +396333,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385335,7 +396347,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385369,10 +396381,10 @@ Unknown does not represent "other" - one of the defined statuses must - + - + @@ -385380,10 +396392,86 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -385393,10 +396481,48 @@ Unknown does not represent "other" - one of the defined statuses must - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -385407,8 +396533,8 @@ Unknown does not represent "other" - one of the defined statuses must - - + + @@ -385427,19 +396553,90 @@ Unknown does not represent "other" - one of the defined statuses must + + + + - - - - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -385451,7 +396648,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385472,7 +396669,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385601,7 +396798,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -385690,9 +396887,6 @@ Unknown does not represent "other" - one of the defined statuses must - - - @@ -385812,9 +397006,7 @@ Unknown does not represent "other" - one of the defined statuses must - + @@ -386186,7 +397378,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -386240,9 +397432,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -386633,7 +397823,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -386654,7 +397844,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -386779,7 +397969,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -386868,9 +398058,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -386990,9 +398177,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -387037,11 +398222,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -387122,40 +398307,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -387272,20 +398427,20 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + - + @@ -387440,7 +398595,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -387494,9 +398649,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -387781,8 +398934,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -387824,7 +398977,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -387878,9 +399031,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -387920,15 +399071,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + - - + + @@ -387950,175 +399101,31 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -388133,7 +399140,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -388167,6 +399174,231 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -388212,7 +399444,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -388266,9 +399498,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -388428,498 +399658,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -388931,7 +399669,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389054,7 +399792,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389108,9 +399846,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389152,8 +399888,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -389316,7 +400052,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389370,9 +400106,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389608,7 +400342,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -389662,9 +400396,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390015,7 +400747,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390069,9 +400801,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390232,34 +400962,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -390305,7 +401007,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390359,9 +401061,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390439,11 +401139,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -390509,9 +401209,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -390763,7 +401460,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -390817,9 +401514,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -391033,7 +401728,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -391079,27 +401774,10 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - + + @@ -391164,15 +401842,15 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + - + @@ -391393,8 +402071,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -391408,11 +402086,11 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - + + + + + @@ -391425,112 +402103,33 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + @@ -391551,6 +402150,70 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -391636,166 +402299,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -391858,8 +402368,8 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - + + @@ -392280,21 +402790,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - - - - - - - - - - - - - @@ -392337,7 +402832,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -392376,9 +402871,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -392611,7 +403103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -392629,7 +403121,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -392745,7 +403237,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -392834,9 +403326,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -392956,9 +403445,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393143,7 +403630,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393197,9 +403684,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393436,7 +403921,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393490,9 +403975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393677,7 +404160,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -393731,9 +404214,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394136,7 +404617,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394157,7 +404638,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394273,7 +404754,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394362,9 +404843,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -394484,9 +404962,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394697,7 +405173,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394751,9 +405227,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394860,7 +405334,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -394914,9 +405388,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395101,7 +405573,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395155,9 +405627,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395290,7 +405760,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395344,9 +405814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395505,7 +405973,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395559,9 +406027,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395746,7 +406212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -395800,9 +406266,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396348,7 +406812,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396369,7 +406833,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396485,7 +406949,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396574,9 +407038,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -396696,9 +407157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396857,7 +407316,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -396911,9 +407370,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397342,7 +407799,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397363,7 +407820,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397479,7 +407936,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397568,9 +408025,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -397690,9 +408144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397799,7 +408251,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -397853,9 +408305,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398015,7 +408465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398069,9 +408519,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398231,7 +408679,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398285,9 +408733,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398810,7 +409256,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398831,7 +409277,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -398947,7 +409393,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399036,9 +409482,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -399158,9 +409601,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399501,7 +409942,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399555,9 +409996,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399690,7 +410129,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399744,9 +410183,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -399957,7 +410394,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400011,9 +410448,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400146,7 +410581,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400200,9 +410635,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400413,7 +410846,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400467,9 +410900,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400654,7 +411085,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -400708,9 +411139,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401295,7 +411724,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401316,7 +411745,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401450,7 +411879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401539,9 +411968,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -401661,9 +412087,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401782,7 +412206,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -401986,7 +412410,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402040,9 +412464,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402382,7 +412804,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402662,7 +413084,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402683,7 +413105,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402697,7 +413119,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402821,7 +413243,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -402910,9 +413332,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -403032,9 +413451,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -403169,6 +413586,37 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -403393,7 +413841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -403447,9 +413895,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -403996,6 +414442,24 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + + + + + + + + + + + + + + + + @@ -404444,7 +414908,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -404465,7 +414929,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -404607,7 +415071,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -404696,9 +415160,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -404818,9 +415279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -405204,9 +415663,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -405277,9 +415734,6 @@ In most cases, Tasks will have an intent of "order"."> - - - @@ -406040,7 +416494,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -406094,9 +416548,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -406285,7 +416737,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -406339,9 +416791,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -406507,6 +416957,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -406543,6 +416996,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -406647,7 +417103,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -406701,9 +417157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -406869,6 +417323,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -406905,6 +417362,9 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or + + + @@ -407221,9 +417681,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -407268,9 +417726,6 @@ In most cases, Tasks will have an intent of "order"."> - - - @@ -407972,6 +418427,9 @@ In most cases, Tasks will have an intent of "order"."> + + + @@ -408008,6 +418466,9 @@ In most cases, Tasks will have an intent of "order"."> + + + @@ -408184,6 +418645,9 @@ In most cases, Tasks will have an intent of "order"."> + + + @@ -408220,6 +418684,9 @@ In most cases, Tasks will have an intent of "order"."> + + + @@ -408280,7 +418747,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -408301,7 +418768,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -408425,7 +418892,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -408514,9 +418981,6 @@ In most cases, Tasks will have an intent of "order"."> - - - @@ -408636,9 +419100,7 @@ In most cases, Tasks will have an intent of "order"."> - + @@ -408682,11 +419144,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409300,7 +419758,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -409354,9 +419812,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -409492,7 +419948,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409546,9 +420002,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409717,7 +420171,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409771,9 +420225,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409882,7 +420334,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -409936,9 +420388,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410127,7 +420577,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410181,9 +420631,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410377,7 +420825,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410431,9 +420879,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410592,7 +421038,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410646,9 +421092,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410846,7 +421290,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -410900,9 +421344,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -411009,7 +421451,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -411063,9 +421505,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -411172,7 +421612,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -411226,9 +421666,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -411357,11 +421795,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -412219,7 +422653,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -412240,7 +422674,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -412369,7 +422803,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -412458,9 +422892,6 @@ In some cases, the resource can no longer be found at the stated url, but the ur - - - @@ -412580,9 +423011,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -412687,9 +423116,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -412713,9 +423140,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -412782,9 +423206,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -412923,7 +423344,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -412977,9 +423398,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -413146,7 +423565,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413200,9 +423619,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413295,7 +423712,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413349,9 +423766,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413432,7 +423847,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413486,9 +423901,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413554,9 +423967,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -413658,7 +424068,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413712,9 +424122,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413780,9 +424188,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -413884,7 +424289,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -413938,9 +424343,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414085,7 +424488,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414139,9 +424542,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414270,7 +424671,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414324,9 +424725,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414411,7 +424810,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414465,9 +424864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414593,9 +424990,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -414606,9 +425001,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -414649,9 +425041,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -414834,9 +425223,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -414897,9 +425283,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -415071,7 +425454,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -415092,7 +425475,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -415184,7 +425567,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -415273,9 +425656,6 @@ This element is labeled as a modifier because the status contains codes that mar - - - @@ -415395,9 +425775,7 @@ This element is labeled as a modifier because the status contains codes that mar - + @@ -415441,21 +425819,17 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + - + @@ -415488,11 +425862,11 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + - + @@ -416025,7 +426399,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -416079,9 +426453,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -416125,11 +426497,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -416230,7 +426598,7 @@ The origin indices provided elsewhere in the test script must be one of these or - + @@ -416284,9 +426652,7 @@ The origin indices provided elsewhere in the test script must be one of these or - + @@ -416330,11 +426696,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -416442,7 +426804,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -416496,9 +426858,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -416579,7 +426939,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -416633,9 +426993,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -416769,7 +427127,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -416823,9 +427181,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417090,7 +427446,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417144,9 +427500,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417240,9 +427594,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -417278,9 +427629,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -417330,7 +427678,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417384,9 +427732,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417584,7 +427930,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417638,9 +427984,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417935,7 +428279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -417989,9 +428333,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418084,7 +428426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418138,9 +428480,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418229,7 +428569,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418283,9 +428623,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418352,9 +428690,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -418486,9 +428821,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -418531,9 +428863,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -418729,7 +429058,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -418783,9 +429112,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -419079,7 +429406,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -419133,9 +429460,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -419256,9 +429581,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -419378,9 +429700,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -419527,9 +429846,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -419692,9 +430008,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -419906,7 +430219,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -419960,9 +430273,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420107,7 +430418,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420161,9 +430472,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420325,7 +430634,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420379,9 +430688,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420466,7 +430773,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420520,9 +430827,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -420625,17 +430930,13 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + - + @@ -420659,7 +430960,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -420990,11 +431291,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -421045,11 +431342,7 @@ The origin indices provided elsewhere in the test script must be one of these or - + @@ -421290,9 +431583,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -421315,9 +431605,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -421600,9 +431887,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -421682,9 +431966,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -421714,9 +431995,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -421996,9 +432274,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -422066,9 +432341,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -422150,9 +432422,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -422250,9 +432519,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -422523,7 +432789,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -422547,7 +432813,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -422639,7 +432905,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -422728,9 +432994,6 @@ The destination indices provided elsewhere in the test script must be one of the - - - @@ -422850,9 +433113,7 @@ The destination indices provided elsewhere in the test script must be one of the - + @@ -422896,11 +433157,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -423520,7 +433777,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -423574,9 +433831,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -423651,9 +433906,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -423749,7 +434002,7 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - + @@ -423803,9 +434056,7 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - + @@ -423959,7 +434210,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424013,9 +434264,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424162,7 +434411,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424216,9 +434465,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424285,9 +434532,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -424410,7 +434654,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424464,9 +434708,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424736,9 +434978,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -424776,7 +435016,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -424830,9 +435070,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -425023,7 +435261,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425077,9 +435315,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425231,7 +435467,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425285,9 +435521,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425447,7 +435681,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425501,9 +435735,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425777,7 +436009,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -425831,9 +436063,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -426015,7 +436245,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -426069,9 +436299,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -426232,11 +436460,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -426642,9 +436866,7 @@ In some cases, the resource can no longer be found at the stated url, but the ur - + @@ -426826,9 +437048,6 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - - - @@ -427036,9 +437255,7 @@ The Value Set Definition specification defines an ActiveOnly element, which is t - + @@ -427494,7 +437711,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -427515,7 +437732,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -427631,7 +437848,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -427720,9 +437937,6 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - - - @@ -427842,9 +438056,7 @@ Expansion.parameter is a simplified list of parameters - a subset of the featur - + @@ -428252,7 +438464,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -428306,9 +438518,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -428618,7 +438828,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -428672,9 +438882,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -428977,7 +439185,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -429031,9 +439239,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -429696,7 +439902,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -429717,7 +439923,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -429851,7 +440057,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -429940,9 +440146,6 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - - - @@ -430062,9 +440265,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -430449,7 +440650,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -430503,9 +440704,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -430632,8 +440831,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -430769,7 +440967,7 @@ Often insurance will not cover a lens with power between +75 and -75."> - + @@ -430823,9 +441021,7 @@ Often insurance will not cover a lens with power between +75 and -75."> - + @@ -431494,8 +441690,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-types.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-types.xml index cf121f9b285..9dfc740a8f3 100644 --- a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-types.xml +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile/profiles-types.xml @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -231,7 +231,7 @@ - + @@ -243,7 +243,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -373,9 +373,7 @@ - + @@ -437,9 +435,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -468,7 +464,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -480,7 +476,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -533,7 +529,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -591,7 +587,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -622,7 +618,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -640,7 +636,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -652,7 +648,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -704,7 +700,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -762,7 +758,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -792,7 +788,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -810,7 +806,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -822,7 +818,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -876,7 +872,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -934,7 +930,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -964,7 +960,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -982,7 +978,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -994,7 +990,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1047,7 +1043,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1105,7 +1101,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1134,7 +1130,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1152,7 +1148,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1164,7 +1160,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1216,7 +1212,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1274,7 +1270,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1304,7 +1300,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1322,7 +1318,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1334,7 +1330,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1386,7 +1382,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1444,7 +1440,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1474,7 +1470,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1492,7 +1488,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1504,7 +1500,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1557,7 +1553,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1615,7 +1611,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1646,7 +1642,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1664,7 +1660,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1676,7 +1672,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1730,7 +1726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1788,7 +1784,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1818,7 +1814,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1836,7 +1832,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1848,7 +1844,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1901,7 +1897,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1959,7 +1955,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -1990,7 +1986,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2008,7 +2004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2020,7 +2016,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2073,7 +2069,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2131,7 +2127,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2164,7 +2160,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2184,7 +2180,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2196,7 +2192,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2249,7 +2245,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2307,7 +2303,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2340,7 +2336,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2360,7 +2356,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2372,7 +2368,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2426,7 +2422,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2484,7 +2480,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2514,7 +2510,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2532,7 +2528,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2544,7 +2540,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2598,7 +2594,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2656,7 +2652,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2686,7 +2682,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2704,7 +2700,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2716,7 +2712,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2769,7 +2765,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2827,7 +2823,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2856,7 +2852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2874,7 +2870,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2886,7 +2882,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2939,7 +2935,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -2997,7 +2993,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3029,7 +3025,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3048,7 +3044,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3060,7 +3056,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3112,7 +3108,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3170,7 +3166,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3200,7 +3196,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3218,7 +3214,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3230,7 +3226,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3283,7 +3279,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3341,7 +3337,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3370,7 +3366,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3388,7 +3384,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3400,7 +3396,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3453,7 +3449,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3511,7 +3507,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3542,7 +3538,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3560,7 +3556,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3572,7 +3568,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3625,7 +3621,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3683,7 +3679,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3712,7 +3708,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3730,7 +3726,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3742,7 +3738,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3796,7 +3792,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3854,7 +3850,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3884,7 +3880,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3902,7 +3898,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -3914,7 +3910,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4021,7 +4017,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4052,7 +4048,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4067,7 +4063,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4079,7 +4075,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4175,7 +4171,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4266,7 +4262,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4319,7 +4315,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4739,7 +4735,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -4778,7 +4774,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5049,7 +5045,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5058,7 +5054,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5125,7 +5121,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5165,7 +5161,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5287,7 +5283,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5438,7 +5434,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5465,7 +5461,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5477,7 +5473,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5558,7 +5554,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5825,7 +5821,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5837,7 +5833,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -5927,7 +5923,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6016,7 +6012,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6068,7 +6064,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6502,7 +6498,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6540,7 +6536,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6776,7 +6772,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6788,7 +6784,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6855,7 +6851,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6917,9 +6913,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -6981,9 +6975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7012,7 +7004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7024,7 +7016,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7103,7 +7095,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7115,7 +7107,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7206,7 +7198,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7443,7 +7435,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7452,7 +7444,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7517,7 +7509,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7686,7 +7678,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7698,7 +7690,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -7789,7 +7781,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8218,7 +8210,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8230,7 +8222,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8298,7 +8290,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8456,7 +8448,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8468,7 +8460,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8566,7 +8558,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8651,7 +8643,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8740,7 +8732,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8880,7 +8872,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -8942,7 +8934,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9017,7 +9009,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9026,7 +9018,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9091,7 +9083,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9175,7 +9167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9258,7 +9250,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9300,7 +9292,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9309,7 +9301,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9400,7 +9392,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9522,7 +9514,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9692,7 +9684,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9701,7 +9693,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9765,7 +9757,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9849,7 +9841,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9919,7 +9911,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -9932,9 +9924,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -10004,7 +9994,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10213,7 +10203,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10423,7 +10413,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10532,7 +10522,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10565,7 +10555,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10607,7 +10597,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10620,9 +10610,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10802,7 +10790,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10822,7 +10810,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10834,7 +10822,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10902,7 +10890,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10990,7 +10978,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -10999,7 +10987,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11066,7 +11054,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11106,7 +11094,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11228,7 +11216,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11379,7 +11367,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11406,7 +11394,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11415,7 +11403,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11488,7 +11476,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11550,9 +11538,7 @@ The value of mustSupport SHALL be a FHIRPath resolveable on the type of the Data - + @@ -11687,7 +11673,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11798,7 +11784,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11843,7 +11829,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11887,7 +11873,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11932,7 +11918,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -11998,7 +11984,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12083,7 +12069,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12140,7 +12126,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12345,7 +12331,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12414,7 +12400,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12445,7 +12431,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12475,7 +12461,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12506,7 +12492,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12555,7 +12541,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12598,7 +12584,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12688,7 +12674,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12700,7 +12686,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12770,7 +12756,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12810,7 +12796,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -12932,7 +12918,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13086,7 +13072,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13113,7 +13099,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13125,7 +13111,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13340,7 +13326,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13402,9 +13388,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13507,7 +13491,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13677,7 +13661,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13760,7 +13744,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13868,7 +13852,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -13952,7 +13936,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14098,7 +14082,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14474,7 +14458,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14746,7 +14730,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14831,7 +14815,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -14958,7 +14942,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -15002,7 +14986,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -15020,9 +15004,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -15105,6 +15087,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -15141,6 +15126,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -15353,6 +15341,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -15389,6 +15380,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -15456,17 +15450,7 @@ No default values are ever defined in the FHIR specification, nor can they be de - + @@ -15550,6 +15534,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -15586,6 +15573,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -15691,7 +15681,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -15871,6 +15861,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -15907,6 +15900,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -16210,7 +16206,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -16355,7 +16351,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -16707,7 +16703,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -16794,7 +16790,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -16956,7 +16952,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -17070,7 +17066,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -17329,7 +17325,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -17443,7 +17439,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -17528,7 +17524,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -17618,7 +17614,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -18007,7 +18003,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -18092,7 +18088,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -18122,7 +18118,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -18140,9 +18136,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -18220,6 +18214,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -18256,6 +18253,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -18426,6 +18426,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -18462,6 +18465,9 @@ No default values are ever defined in the FHIR specification, nor can they be de + + + @@ -18520,17 +18526,7 @@ No default values are ever defined in the FHIR specification, nor can they be de - + @@ -18609,6 +18605,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -18645,6 +18644,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -18814,6 +18816,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -18850,6 +18855,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -19103,7 +19111,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19328,7 +19336,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19460,7 +19468,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19523,7 +19531,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19532,7 +19540,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19604,7 +19612,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19738,7 +19746,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19855,7 +19863,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19901,7 +19909,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19913,7 +19921,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -19993,7 +20001,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20068,7 +20076,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20165,6 +20173,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -20201,6 +20212,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -20296,7 +20310,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20386,6 +20400,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -20422,6 +20439,9 @@ When pattern[x] is used to constrain a complex object, it means that each proper + + + @@ -20479,7 +20499,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20491,7 +20511,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20582,7 +20602,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20669,7 +20689,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -20959,7 +20979,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21132,7 +21152,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21144,7 +21164,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21234,7 +21254,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21321,7 +21341,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21366,7 +21386,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21590,7 +21610,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21621,7 +21641,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21757,7 +21777,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21766,7 +21786,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21839,7 +21859,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -21901,9 +21921,7 @@ When pattern[x] is used to constrain a complex object, it means that each proper - + @@ -22149,7 +22167,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22161,7 +22179,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22232,7 +22250,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22347,9 +22365,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -22424,7 +22440,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22463,7 +22479,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22520,9 +22536,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22555,7 +22569,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22580,7 +22594,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22600,7 +22614,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22612,7 +22626,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22688,7 +22702,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22804,7 +22818,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22869,7 +22883,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22896,7 +22910,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22908,7 +22922,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -22979,7 +22993,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -23063,7 +23077,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -23152,7 +23166,7 @@ This element can be used to indicate where the current master source of a resour - + @@ -23201,649 +23215,13 @@ This element can be used to indicate where the current master source of a resour - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -23852,7 +23230,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -23916,7 +23294,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24028,7 +23406,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24138,7 +23516,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24214,7 +23592,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24268,7 +23646,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24303,7 +23681,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24315,7 +23693,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24351,9 +23729,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24406,7 +23782,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24548,9 +23924,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24623,7 +23997,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24632,7 +24006,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24696,7 +24070,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24758,9 +24132,7 @@ Period is not used for a duration (a measure of elapsed time). See [Duration](da - + @@ -24972,7 +24344,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -24984,7 +24356,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25051,7 +24423,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25139,7 +24511,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25148,7 +24520,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25221,7 +24593,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25283,9 +24655,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25747,7 +25117,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25756,7 +25126,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25829,7 +25199,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25891,9 +25261,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -25970,7 +25338,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26045,7 +25413,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26073,7 +25441,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26085,7 +25453,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26175,7 +25543,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26297,7 +25665,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26496,7 +25864,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26595,7 +25963,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26607,7 +25975,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26697,7 +26065,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26910,7 +26278,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -26922,7 +26290,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27012,7 +26380,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27203,7 +26571,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27212,7 +26580,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27307,7 +26675,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27563,7 +26931,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27575,7 +26943,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27655,7 +27023,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27748,9 +27116,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -27773,7 +27139,7 @@ The type is the Canonical URL of Resource Definition that is the type this refer - + @@ -27794,13 +27160,7 @@ The type is the Canonical URL of Resource Definition that is the type this refer - + @@ -27910,9 +27270,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -27921,7 +27279,7 @@ The type is the Canonical URL of Resource Definition that is the type this refer - + @@ -27942,13 +27300,7 @@ The type is the Canonical URL of Resource Definition that is the type this refer - + @@ -27992,7 +27344,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28001,7 +27353,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28067,7 +27419,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28128,8 +27480,9 @@ Reference is intended to point to a structure that can potentially be expressed - + + @@ -28151,7 +27504,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28161,6 +27514,41 @@ Reference is intended to point to a structure that can potentially be expressed + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28237,32 +27625,6 @@ Reference is intended to point to a structure that can potentially be expressed - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -28290,8 +27652,8 @@ Reference is intended to point to a structure that can potentially be expressed - - + + @@ -28315,6 +27677,33 @@ Reference is intended to point to a structure that can potentially be expressed + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28330,8 +27719,9 @@ Reference is intended to point to a structure that can potentially be expressed - + + @@ -28339,7 +27729,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28349,6 +27739,27 @@ Reference is intended to point to a structure that can potentially be expressed + + + + + + + + + + + + + + + + + + + + + @@ -28383,18 +27794,6 @@ Reference is intended to point to a structure that can potentially be expressed - - - - - - - - - - - - @@ -28408,8 +27807,8 @@ Reference is intended to point to a structure that can potentially be expressed - - + + @@ -28419,6 +27818,19 @@ Reference is intended to point to a structure that can potentially be expressed + + + + + + + + + + + + + @@ -28429,7 +27841,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28438,7 +27850,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28517,7 +27929,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28924,7 +28336,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -28933,7 +28345,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29003,7 +28415,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29088,7 +28500,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29215,7 +28627,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29254,7 +28666,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29323,7 +28735,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29393,7 +28805,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29417,7 +28829,7 @@ Reference is intended to point to a structure that can potentially be expressed - + @@ -29446,1996 +28858,13 @@ Reference is intended to point to a structure that can potentially be expressed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -31447,7 +28876,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31484,9 +28913,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -31531,7 +28958,7 @@ A Timing schedule can be a list of events and/or criteria for when the event hap - + @@ -31593,9 +29020,7 @@ A Timing schedule can be a list of events and/or criteria for when the event hap - + @@ -31782,7 +29207,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -32001,8 +29426,7 @@ Modifier extensions SHALL NOT change the meaning of any elements on Resource or - + @@ -32024,7 +29448,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32158,8 +29582,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32181,7 +29604,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32289,7 +29712,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32358,7 +29781,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32384,9 +29807,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32592,8 +30013,7 @@ A Timing schedule can be a list of events and/or criteria for when the event hap - + @@ -32601,7 +30021,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32679,8 +30099,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32688,7 +30107,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32754,7 +30173,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32795,7 +30214,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32819,7 +30238,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32828,7 +30247,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -32917,7 +30336,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33001,7 +30420,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33173,7 +30592,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33251,7 +30670,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33260,7 +30679,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33325,7 +30744,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33409,7 +30828,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33460,7 +30879,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33496,7 +30915,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33533,7 +30952,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33556,7 +30975,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33568,7 +30987,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33657,7 +31076,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33779,7 +31198,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33937,7 +31356,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -33949,7 +31368,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -34038,7 +31457,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + @@ -34160,7 +31579,7 @@ Normal practice is to use the 'mo' code as a calendar month when calculating the - + diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/sp/search-parameters.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/sp/search-parameters.xml new file mode 100644 index 00000000000..a2c77d35c76 --- /dev/null +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/sp/search-parameters.xml @@ -0,0 +1,70615 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset/valuesets.xml b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset/valuesets.xml index 29d097964cd..2a78fe70835 100644 --- a/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset/valuesets.xml +++ b/hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset/valuesets.xml @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -788,7 +788,7 @@ - + @@ -844,7 +844,7 @@ - + @@ -868,7 +868,7 @@ - + @@ -914,7 +914,7 @@ - + @@ -938,7 +938,7 @@ - + @@ -972,7 +972,7 @@ - + @@ -1022,7 +1022,7 @@ - + @@ -1037,7 +1037,7 @@ - + @@ -1101,7 +1101,7 @@ - + @@ -1121,8 +1121,8 @@ - - + + @@ -1161,7 +1161,7 @@ - + @@ -1185,7 +1185,7 @@ - + @@ -1292,7 +1292,7 @@ - + @@ -1307,7 +1307,7 @@ - + @@ -1351,7 +1351,7 @@ - + @@ -1372,7 +1372,7 @@ - + @@ -1401,7 +1401,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1600,7 +1600,7 @@ - + @@ -1624,7 +1624,7 @@ - + @@ -1778,7 +1778,7 @@ - + @@ -1793,7 +1793,7 @@ - + @@ -1852,7 +1852,7 @@ - + @@ -1873,7 +1873,7 @@ - + @@ -1902,7 +1902,7 @@ - + @@ -1926,7 +1926,7 @@ - + @@ -1984,7 +1984,7 @@ - + @@ -2045,7 +2045,7 @@ - + @@ -2060,7 +2060,7 @@ - + @@ -2089,7 +2089,7 @@ - + @@ -2110,7 +2110,7 @@ - + @@ -2199,7 +2199,7 @@ - + @@ -2223,7 +2223,7 @@ - + @@ -2282,7 +2282,7 @@ - + @@ -2297,7 +2297,7 @@ - + @@ -2347,7 +2347,7 @@ - + @@ -2466,7 +2466,7 @@ - + @@ -2655,7 +2655,7 @@ - + @@ -2735,7 +2735,7 @@ - + @@ -2824,7 +2824,7 @@ - + @@ -2858,7 +2858,7 @@ - + @@ -20153,7 +20153,7 @@ - + @@ -20338,7 +20338,7 @@ - + @@ -20400,7 +20400,7 @@ - + @@ -20451,7 +20451,7 @@ - + @@ -20562,7 +20562,7 @@ - + @@ -21159,13 +21159,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -21177,7 +21260,7 @@ - + @@ -21222,7 +21305,7 @@ - + @@ -21246,7 +21329,7 @@ - + @@ -21296,7 +21379,7 @@ - + @@ -21320,7 +21403,7 @@ - + @@ -21370,7 +21453,7 @@ - + @@ -21394,7 +21477,7 @@ - + @@ -21454,7 +21537,7 @@ - + @@ -21478,7 +21561,7 @@ - + @@ -21528,7 +21611,7 @@ - + @@ -21552,7 +21635,7 @@ - + @@ -21592,7 +21675,7 @@ - + @@ -21616,7 +21699,7 @@ - + @@ -21676,7 +21759,7 @@ - + @@ -21700,7 +21783,7 @@ - + @@ -21744,748 +21827,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -22509,7 +21857,7 @@ - + @@ -22598,7 +21946,7 @@ - + @@ -22613,7 +21961,7 @@ - + @@ -22642,7 +21990,7 @@ - + @@ -22663,7 +22011,7 @@ - + @@ -22708,7 +22056,7 @@ - + @@ -22729,7 +22077,7 @@ - + @@ -22764,7 +22112,7 @@ - + @@ -22785,7 +22133,7 @@ - + @@ -22809,7 +22157,7 @@ - + @@ -22829,17 +22177,137 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22850,7 +22318,7 @@ - + @@ -22871,7 +22339,7 @@ - + @@ -22936,10 +22404,10 @@ - + - + @@ -22956,8 +22424,8 @@ - - + + @@ -23027,7 +22495,7 @@ - + @@ -23047,8 +22515,8 @@ - - + + @@ -23083,7 +22551,7 @@ - + @@ -23107,7 +22575,7 @@ - + @@ -23142,7 +22610,7 @@ - + @@ -23166,7 +22634,7 @@ - + @@ -23206,7 +22674,7 @@ - + @@ -23230,7 +22698,7 @@ - + @@ -23270,7 +22738,7 @@ - + @@ -23294,7 +22762,7 @@ - + @@ -23344,7 +22812,7 @@ - + @@ -23368,7 +22836,7 @@ - + @@ -23408,7 +22876,7 @@ - + @@ -23432,7 +22900,7 @@ - + @@ -23482,7 +22950,7 @@ - + @@ -23494,7 +22962,7 @@ - + @@ -23539,7 +23007,7 @@ - + @@ -23559,8 +23027,8 @@ - - + + @@ -23625,7 +23093,7 @@ - + @@ -23645,8 +23113,8 @@ - - + + @@ -23706,7 +23174,7 @@ - + @@ -23726,8 +23194,8 @@ - - + + @@ -23797,7 +23265,7 @@ - + @@ -23817,8 +23285,8 @@ - - + + @@ -23863,7 +23331,7 @@ - + @@ -23875,7 +23343,7 @@ - + @@ -23910,7 +23378,7 @@ - + @@ -23924,6 +23392,7 @@ + @@ -23953,7 +23422,7 @@ - + @@ -24015,7 +23484,7 @@ - + @@ -24063,7 +23532,7 @@ - + @@ -24120,7 +23589,7 @@ - + @@ -24187,7 +23656,7 @@ - + @@ -24249,7 +23718,7 @@ - + @@ -24311,7 +23780,7 @@ - + @@ -24325,6 +23794,7 @@ + @@ -24344,7 +23814,7 @@ - + @@ -24358,6 +23828,7 @@ + @@ -24387,7 +23858,7 @@ - + @@ -24424,6 +23895,7 @@ + @@ -24479,7 +23951,7 @@ - + @@ -24551,7 +24023,7 @@ - + @@ -24588,6 +24060,7 @@ + @@ -24628,7 +24101,7 @@ - + @@ -24705,7 +24178,7 @@ - + @@ -24772,7 +24245,7 @@ - + @@ -24849,7 +24322,7 @@ - + @@ -24917,7 +24390,7 @@ - + @@ -24977,7 +24450,7 @@ - + @@ -25057,7 +24530,7 @@ - + @@ -25122,7 +24595,7 @@ - + @@ -25192,7 +24665,7 @@ - + @@ -25257,7 +24730,7 @@ - + @@ -25332,7 +24805,7 @@ - + @@ -25397,7 +24870,7 @@ - + @@ -25457,7 +24930,7 @@ - + @@ -25517,7 +24990,7 @@ - + @@ -25531,6 +25004,7 @@ + @@ -25560,7 +25034,7 @@ - + @@ -25622,7 +25096,7 @@ - + @@ -25704,7 +25178,7 @@ - + @@ -25757,11 +25231,6 @@ - - - - - @@ -25771,7 +25240,7 @@ - + @@ -25833,7 +25302,7 @@ - + @@ -25872,34 +25341,19 @@ - - - + + + - + - - - - - - - - - - - - - - - - + @@ -25910,7 +25364,7 @@ - + @@ -25982,7 +25436,7 @@ - + @@ -26043,13 +25497,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -26063,6 +25589,7 @@ + @@ -26092,7 +25619,7 @@ - + @@ -26140,6 +25667,11 @@ + + + + + @@ -26169,7 +25701,7 @@ - + @@ -26231,7 +25763,7 @@ - + @@ -26398,7 +25930,7 @@ - + @@ -26455,7 +25987,7 @@ - + @@ -26512,7 +26044,7 @@ - + @@ -26574,7 +26106,7 @@ - + @@ -26646,7 +26178,7 @@ - + @@ -26683,6 +26215,7 @@ + @@ -26743,7 +26276,7 @@ - + @@ -26860,7 +26393,7 @@ - + @@ -26922,7 +26455,7 @@ - + @@ -27080,6 +26613,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27089,7 +26652,7 @@ - + @@ -27265,180 +26828,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -27476,65 +26872,80 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + @@ -27545,7 +26956,7 @@ - + @@ -27584,19 +26995,29 @@ - - - + + + - - - + + + + + + + + + + + + + - + @@ -27608,6 +27029,11 @@ + + + + + @@ -27619,14 +27045,19 @@ - - - + + + - - - + + + + + + + + @@ -27637,7 +27068,7 @@ - + @@ -27739,7 +27170,7 @@ - + @@ -27831,7 +27262,7 @@ - + @@ -27893,12 +27324,12 @@ - + - + - + @@ -27910,14 +27341,14 @@ - + - - + + @@ -27934,33 +27365,48 @@ - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + - + - + - + @@ -27972,14 +27418,14 @@ - + - - + + @@ -27996,88 +27442,83 @@ - + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28087,7 +27528,7 @@ - + @@ -28175,6 +27616,11 @@ + + + + + @@ -28184,7 +27630,7 @@ - + @@ -28301,7 +27747,7 @@ - + @@ -28342,37 +27788,37 @@ - + - - + + - + - + - + - + - + @@ -28383,7 +27829,7 @@ - + @@ -28445,7 +27891,7 @@ - + @@ -28488,16 +27934,36 @@ + + + + + - - + + + + + + + + + + + + + + + + + @@ -28507,7 +27973,7 @@ - + @@ -28634,7 +28100,7 @@ - + @@ -28701,7 +28167,7 @@ - + @@ -28768,7 +28234,7 @@ - + @@ -28855,7 +28321,7 @@ - + @@ -28942,7 +28408,7 @@ - + @@ -29128,7 +28594,7 @@ - + @@ -29329,7 +28795,7 @@ - + @@ -29387,6 +28853,11 @@ + + + + + @@ -29396,7 +28867,7 @@ - + @@ -29463,7 +28934,7 @@ - + @@ -29477,6 +28948,7 @@ + @@ -29501,7 +28973,7 @@ - + @@ -29568,11 +29040,11 @@ - + - + @@ -29590,7 +29062,7 @@ - + @@ -29626,6 +29098,16 @@ + + + + + + + + + + @@ -29635,7 +29117,7 @@ - + @@ -29717,7 +29199,7 @@ - + @@ -29763,7 +29245,7 @@ - + @@ -29773,7 +29255,7 @@ - + @@ -29784,7 +29266,7 @@ - + @@ -29851,7 +29333,7 @@ - + @@ -29918,7 +29400,7 @@ - + @@ -29955,6 +29437,7 @@ + @@ -30010,7 +29493,7 @@ - + @@ -30024,6 +29507,7 @@ + @@ -30058,7 +29542,7 @@ - + @@ -30072,6 +29556,7 @@ + @@ -30096,7 +29581,7 @@ - + @@ -30153,7 +29638,7 @@ - + @@ -30220,7 +29705,7 @@ - + @@ -30292,12 +29777,12 @@ - + - + - + @@ -30309,6 +29794,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30369,7 +29995,7 @@ - + @@ -32146,7 +31772,7 @@ - + @@ -32213,7 +31839,7 @@ - + @@ -32275,7 +31901,7 @@ - + @@ -32337,7 +31963,7 @@ - + @@ -32399,7 +32025,7 @@ - + @@ -32459,7 +32085,7 @@ - + @@ -32521,7 +32147,7 @@ - + @@ -32578,7 +32204,7 @@ - + @@ -32640,7 +32266,7 @@ - + @@ -32688,7 +32314,7 @@ - + @@ -32760,7 +32386,7 @@ - + @@ -32892,7 +32518,7 @@ - + @@ -32934,7 +32560,7 @@ - + @@ -32951,46 +32577,52 @@ + - + - + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + - + - + @@ -33001,7 +32633,7 @@ - + @@ -33062,13 +32694,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -33089,14 +32768,17 @@ + + + @@ -33107,7 +32789,7 @@ - + @@ -33126,8 +32808,8 @@ - - + + @@ -33136,9 +32818,9 @@ - - - + + + @@ -33149,7 +32831,7 @@ - + @@ -33166,6 +32848,7 @@ + @@ -33201,7 +32884,7 @@ - + @@ -33222,17 +32905,17 @@ - + - + - + @@ -33243,7 +32926,7 @@ - + @@ -33280,7 +32963,7 @@ - + @@ -33342,7 +33025,7 @@ - + @@ -33480,7 +33163,7 @@ - + @@ -33520,6 +33203,7 @@ + @@ -33570,7 +33254,7 @@ - + @@ -33584,6 +33268,7 @@ + @@ -33698,7 +33383,7 @@ - + @@ -33737,7 +33422,7 @@ - + @@ -33807,7 +33492,7 @@ - + @@ -33847,6 +33532,7 @@ + @@ -34012,7 +33698,7 @@ - + @@ -34098,7 +33784,7 @@ - + @@ -34160,7 +33846,7 @@ - + @@ -34197,7 +33883,7 @@ - + @@ -34239,7 +33925,7 @@ - + @@ -34293,7 +33979,7 @@ - + @@ -34336,7 +34022,7 @@ - + @@ -34394,7 +34080,7 @@ - + @@ -34416,7 +34102,7 @@ - + @@ -34431,6 +34117,7 @@ + @@ -34439,22 +34126,27 @@ - + - + - + + + + + + - + @@ -34466,7 +34158,7 @@ - + @@ -34503,6 +34195,7 @@ + @@ -34603,7 +34296,7 @@ - + @@ -34685,7 +34378,7 @@ - + @@ -34742,7 +34435,7 @@ - + @@ -34777,7 +34470,7 @@ - + @@ -34819,7 +34512,7 @@ - + @@ -34993,7 +34686,7 @@ - + @@ -35028,7 +34721,7 @@ - + @@ -35072,7 +34765,7 @@ - + @@ -35122,7 +34815,7 @@ - + @@ -35194,7 +34887,7 @@ - + @@ -35266,7 +34959,7 @@ - + @@ -35353,7 +35046,7 @@ - + @@ -35375,7 +35068,7 @@ - + @@ -35392,96 +35085,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -35492,7 +35098,7 @@ - + @@ -35659,7 +35265,7 @@ - + @@ -35726,7 +35332,7 @@ - + @@ -35788,7 +35394,7 @@ - + @@ -35844,9 +35450,7 @@ - + @@ -35904,7 +35508,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - + @@ -35918,6 +35522,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli + @@ -35942,7 +35547,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - + @@ -35956,6 +35561,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli + @@ -35980,7 +35586,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - + @@ -36042,7 +35648,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - + @@ -36114,7 +35720,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - + @@ -36200,70 +35806,7 @@ Spelling note: "descendant" is a more correct spelling, but the spelli - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -36274,7 +35817,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36341,7 +35884,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36403,7 +35946,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36475,7 +36018,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36552,7 +36095,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36604,7 +36147,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36666,7 +36209,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36733,7 +36276,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36789,7 +36332,12 @@ A specific time might or might not be pre-allocated."> - + + + + + + @@ -36800,7 +36348,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36857,7 +36405,7 @@ A specific time might or might not be pre-allocated."> - + @@ -36959,7 +36507,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37019,7 +36567,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37079,7 +36627,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37141,7 +36689,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37213,7 +36761,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37298,7 +36846,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37347,7 +36895,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37409,7 +36957,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37453,7 +37001,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37502,7 +37050,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37569,7 +37117,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37636,7 +37184,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37736,7 +37284,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37801,7 +37349,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37881,7 +37429,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37895,6 +37443,7 @@ A specific time might or might not be pre-allocated."> + @@ -37924,7 +37473,7 @@ A specific time might or might not be pre-allocated."> - + @@ -37996,7 +37545,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38088,7 +37637,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38195,7 +37744,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38262,7 +37811,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38325,7 +37874,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38388,7 +37937,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38451,7 +38000,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38518,7 +38067,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38605,7 +38154,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38672,7 +38221,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38739,7 +38288,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38806,7 +38355,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38873,7 +38422,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38930,7 +38479,7 @@ A specific time might or might not be pre-allocated."> - + @@ -38997,7 +38546,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39079,7 +38628,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39149,7 +38698,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39214,7 +38763,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39274,7 +38823,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39289,6 +38838,7 @@ A specific time might or might not be pre-allocated."> + @@ -39298,7 +38848,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39312,6 +38862,7 @@ A specific time might or might not be pre-allocated."> + @@ -39441,7 +38992,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39455,6 +39006,7 @@ A specific time might or might not be pre-allocated."> + @@ -39468,9 +39020,7 @@ A specific time might or might not be pre-allocated."> - + @@ -39496,7 +39046,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39510,6 +39060,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a + @@ -39544,7 +39095,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39611,7 +39162,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39668,7 +39219,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39725,7 +39276,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39797,7 +39348,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39864,7 +39415,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -39996,7 +39547,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40078,7 +39629,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40135,7 +39686,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40202,7 +39753,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40259,7 +39810,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40321,7 +39872,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40403,7 +39954,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40460,7 +40011,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40562,7 +40113,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40669,7 +40220,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40741,7 +40292,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40803,7 +40354,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40865,7 +40416,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -40937,7 +40488,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41003,13 +40554,95 @@ Future versions of FHIR may make significant changes to Trial Use content that a + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -41066,7 +40699,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41128,7 +40761,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41239,7 +40872,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41350,7 +40983,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41391,7 +41024,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41432,7 +41065,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41473,7 +41106,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41514,7 +41147,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41625,7 +41258,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41666,7 +41299,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41707,7 +41340,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41748,7 +41381,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41789,7 +41422,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41830,7 +41463,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41871,7 +41504,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41912,7 +41545,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41953,7 +41586,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -41994,7 +41627,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42035,7 +41668,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42076,7 +41709,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42148,7 +41781,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42205,7 +41838,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42272,7 +41905,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42339,7 +41972,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42406,7 +42039,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42473,7 +42106,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42545,7 +42178,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42602,7 +42235,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42642,7 +42275,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42734,7 +42367,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42801,7 +42434,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42846,7 +42479,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42896,7 +42529,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -42953,7 +42586,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43015,7 +42648,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43082,7 +42715,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43129,7 +42762,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43179,7 +42812,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43249,7 +42882,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43324,7 +42957,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43409,7 +43042,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43423,6 +43056,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a + @@ -43452,7 +43086,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43466,6 +43100,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a + @@ -43500,7 +43135,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43514,6 +43149,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a + @@ -43538,7 +43174,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43610,7 +43246,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43717,7 +43353,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43768,7 +43404,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43837,7 +43473,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43899,7 +43535,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -43966,7 +43602,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44063,7 +43699,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44155,7 +43791,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44227,7 +43863,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44289,7 +43925,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44381,7 +44017,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44448,7 +44084,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44515,7 +44151,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44577,7 +44213,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44654,7 +44290,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44716,7 +44352,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44773,7 +44409,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44830,7 +44466,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44907,7 +44543,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -44984,7 +44620,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -45071,7 +44707,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -45158,7 +44794,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -45224,8 +44860,7 @@ Future versions of FHIR may make significant changes to Trial Use content that a - + @@ -45261,7 +44896,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45328,7 +44963,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45384,7 +45019,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45441,7 +45076,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45503,7 +45138,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45705,7 +45340,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45767,7 +45402,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45834,7 +45469,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45891,7 +45526,7 @@ or intervention but are still being followed according to the primary objective - + @@ -45973,7 +45608,7 @@ or intervention but are still being followed according to the primary objective - + @@ -46030,7 +45665,7 @@ or intervention but are still being followed according to the primary objective - + @@ -46089,7 +45724,7 @@ or intervention but are still being followed according to the primary objective - + @@ -46166,7 +45801,7 @@ or intervention but are still being followed according to the primary objective - + @@ -46248,7 +45883,7 @@ or intervention but are still being followed according to the primary objective - + @@ -46289,245 +45924,17 @@ or intervention but are still being followed according to the primary objective - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -46538,7 +45945,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -46595,7 +46002,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -46702,7 +46109,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -46774,7 +46181,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -46836,7 +46243,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -46938,7 +46345,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47000,7 +46407,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47057,7 +46464,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47114,7 +46521,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47186,7 +46593,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47263,7 +46670,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47329,7 +46736,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47393,13 +46800,720 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -47471,7 +47585,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47522,75 +47636,13 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -47632,7 +47684,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47663,13 +47715,223 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -47708,15 +47970,30 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - - + + - - + + + + + + + + + + + + + + + + + @@ -47726,7 +48003,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47765,9 +48042,81 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -47778,7 +48127,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47855,7 +48204,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47922,7 +48271,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -47988,13 +48337,207 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -48071,7 +48614,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48111,23 +48654,23 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - - + + - - + + - - + + - - + + @@ -48138,7 +48681,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48220,7 +48763,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48296,13 +48839,714 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -48394,7 +49638,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48521,7 +49765,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48583,7 +49827,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48650,7 +49894,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48717,7 +49961,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48774,7 +50018,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48840,13 +50084,254 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -48869,7 +50354,7 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von - + @@ -48883,4152 +50368,12 @@ Grundpauschale für Ärzte, Institute und Krankenhäuser, die zur Erbringung von + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -53053,895 +50398,5005 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53952,7 +55407,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -53975,7 +55430,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54009,7 +55464,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54028,8 +55483,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -54053,7 +55508,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54076,7 +55531,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54240,11 +55695,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - @@ -54319,11 +55769,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - @@ -54456,7 +55901,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54468,7 +55913,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54563,7 +56008,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54575,7 +56020,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54615,7 +56060,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54627,7 +56072,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54672,7 +56117,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54684,7 +56129,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54719,7 +56164,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54791,7 +56236,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54863,7 +56308,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54906,7 +56351,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -54985,7 +56430,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -55037,7 +56482,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -55078,7 +56523,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -55223,7 +56668,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -55541,7 +56986,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -58301,7 +59746,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61026,7 +62471,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61072,7 +62517,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61122,7 +62567,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61313,7 +62758,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61374,7 +62819,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61395,6 +62840,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -61418,7 +62864,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61439,6 +62885,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -61471,7 +62918,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61499,7 +62946,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61515,7 +62962,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61542,7 +62989,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61584,7 +63031,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61605,6 +63052,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -61647,7 +63095,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61667,6 +63115,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -61689,7 +63138,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61717,7 +63166,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61770,7 +63219,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61791,7 +63240,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61820,7 +63269,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61866,13 +63315,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -61922,7 +63421,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -61952,13 +63451,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -61979,6 +63528,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62002,7 +63552,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62052,7 +63602,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62073,6 +63623,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62095,7 +63646,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62116,6 +63667,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62139,7 +63691,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62159,6 +63711,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62181,7 +63734,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62202,7 +63755,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62231,7 +63784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62281,7 +63834,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62302,6 +63855,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62325,7 +63879,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62375,7 +63929,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62396,6 +63950,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62419,7 +63974,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62469,7 +64024,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62490,6 +64045,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62524,7 +64080,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62549,7 +64105,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62577,7 +64133,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62598,6 +64154,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62627,7 +64184,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62647,6 +64204,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62669,7 +64227,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62697,7 +64255,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62718,7 +64276,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62747,7 +64305,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62767,6 +64325,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62789,7 +64348,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62856,7 +64415,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62877,6 +64436,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -62900,7 +64460,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62950,7 +64510,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -62971,7 +64531,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63000,7 +64560,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63025,7 +64585,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63053,7 +64613,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63103,7 +64663,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63124,7 +64684,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63153,7 +64713,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63174,7 +64734,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63203,7 +64763,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63224,6 +64784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63271,7 +64832,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63322,7 +64883,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63343,7 +64904,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63372,7 +64933,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63393,6 +64954,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63416,7 +64978,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63437,6 +64999,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63460,7 +65023,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63481,7 +65044,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63510,7 +65073,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63531,7 +65094,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63560,7 +65123,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63580,6 +65143,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63602,7 +65166,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63623,7 +65187,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63652,7 +65216,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63672,6 +65236,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63694,7 +65259,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63716,13 +65281,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -63743,7 +65358,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63772,7 +65387,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63822,7 +65437,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63842,6 +65457,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63878,7 +65494,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63899,6 +65515,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -63921,7 +65538,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63937,7 +65554,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63965,7 +65582,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -63993,7 +65610,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64021,7 +65638,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64037,7 +65654,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64064,7 +65681,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64088,7 +65705,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64117,7 +65734,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64138,6 +65755,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64161,7 +65779,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64182,6 +65800,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64205,7 +65824,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64226,6 +65845,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64249,7 +65869,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64299,7 +65919,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64349,7 +65969,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64377,7 +65997,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64427,7 +66047,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64469,7 +66089,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64490,6 +66110,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64533,7 +66154,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64554,7 +66175,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64583,7 +66204,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64619,11 +66240,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - + + + @@ -64634,7 +66257,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64656,7 +66279,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64680,7 +66303,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64701,7 +66324,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64724,63 +66347,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -64800,6 +66373,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64844,7 +66418,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64894,7 +66468,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64944,7 +66518,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -64965,6 +66539,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -64988,7 +66563,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65038,7 +66613,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65059,6 +66634,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -65081,7 +66657,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65102,7 +66678,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65131,7 +66707,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65159,7 +66735,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65187,7 +66763,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65208,7 +66784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65237,7 +66813,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65253,7 +66829,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65281,7 +66857,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65301,6 +66877,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -65323,7 +66900,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65376,7 +66953,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65420,7 +66997,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65441,7 +67018,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65470,7 +67047,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65491,6 +67068,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -65514,7 +67092,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65535,6 +67113,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -65603,7 +67182,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65619,7 +67198,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65649,7 +67228,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65700,7 +67279,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65750,7 +67329,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65771,6 +67350,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -65794,7 +67374,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65831,7 +67411,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65847,7 +67427,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65925,40 +67505,50 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + - + - + - + - - - - + + + + + - - + + + + + + + + + + + + - - + @@ -65970,7 +67560,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -65991,7 +67581,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66020,7 +67610,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66041,6 +67631,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -66097,7 +67688,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66147,7 +67738,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66171,7 +67762,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66200,7 +67791,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66221,7 +67812,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66250,7 +67841,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66266,7 +67857,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66380,7 +67971,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66447,7 +68038,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66471,8 +68062,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -66494,13 +68085,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -66521,7 +68162,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66550,7 +68191,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66603,7 +68244,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66624,6 +68265,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -66701,17 +68343,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -66722,9 +68364,10 @@ The MedicationUsage resource was previously called MedicationStatement."> + - + @@ -66744,7 +68387,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66765,7 +68408,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66794,7 +68437,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66814,7 +68457,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66843,7 +68486,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66893,7 +68536,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66914,7 +68557,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66943,7 +68586,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -66964,6 +68607,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -66987,7 +68631,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67008,6 +68652,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67061,7 +68706,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67085,7 +68730,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67114,7 +68759,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67135,7 +68780,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67164,7 +68809,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67214,7 +68859,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67235,7 +68880,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67264,7 +68909,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67285,7 +68930,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67314,7 +68959,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67355,13 +69000,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -67382,7 +69077,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67411,7 +69106,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67432,6 +69127,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67455,7 +69151,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67476,6 +69172,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67504,7 +69201,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67520,7 +69217,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67542,13 +69239,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -67598,7 +69345,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67619,6 +69366,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67654,7 +69402,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67675,6 +69423,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67703,7 +69452,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67724,6 +69473,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67752,7 +69502,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67802,7 +69552,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67852,7 +69602,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67873,8 +69623,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -67902,7 +69652,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -67923,6 +69673,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -67981,7 +69732,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68010,7 +69761,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68060,7 +69811,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68080,6 +69831,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68102,17 +69854,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -68123,6 +69875,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68145,7 +69898,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68188,7 +69941,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68209,6 +69962,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68231,7 +69985,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68252,6 +70006,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68275,7 +70030,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68328,7 +70083,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68381,7 +70136,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68402,7 +70157,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68607,7 +70362,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68628,7 +70383,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68657,7 +70412,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68686,7 +70441,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68707,6 +70462,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68901,7 +70657,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68922,6 +70678,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68945,7 +70702,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -68966,6 +70723,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -68989,7 +70747,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69010,8 +70768,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -69034,56 +70792,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -69108,7 +70823,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69213,7 +70928,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69266,7 +70981,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69349,7 +71064,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69371,7 +71086,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69419,7 +71134,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69440,7 +71155,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69469,7 +71184,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69490,7 +71205,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69519,7 +71234,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69539,6 +71254,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -69561,7 +71277,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69638,7 +71354,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69654,7 +71370,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69682,7 +71398,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69703,6 +71419,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -69782,7 +71499,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69832,7 +71549,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -69868,63 +71585,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -69968,13 +71635,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -69995,6 +71712,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70018,7 +71736,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70039,7 +71757,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70068,7 +71786,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70089,8 +71807,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -70119,7 +71837,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70163,13 +71881,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -70190,8 +71958,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -70215,7 +71983,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70268,7 +72036,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70289,6 +72057,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70312,7 +72081,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70332,6 +72101,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70354,7 +72124,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70375,6 +72145,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70397,7 +72168,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70425,7 +72196,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70453,7 +72224,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70474,7 +72245,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70503,7 +72274,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70524,6 +72295,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70541,13 +72313,48 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -70612,7 +72419,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70633,6 +72440,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -70655,7 +72463,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70677,7 +72485,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70733,7 +72541,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70754,7 +72562,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70783,7 +72591,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70799,7 +72607,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70827,7 +72635,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70871,7 +72679,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70896,7 +72704,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70924,7 +72732,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -70974,7 +72782,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71013,34 +72821,34 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + - + - + - + - + - - + + - - + + @@ -71052,7 +72860,57 @@ The MedicationUsage resource was previously called MedicationStatement."> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71068,7 +72926,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71096,7 +72954,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71117,6 +72975,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -71133,57 +72992,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -71204,7 +73019,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71233,7 +73048,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71283,7 +73098,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71304,7 +73119,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71333,7 +73148,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71386,7 +73201,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71402,7 +73217,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71430,7 +73245,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71451,6 +73266,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -71500,7 +73316,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71521,7 +73337,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71550,7 +73366,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71571,7 +73387,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71600,7 +73416,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71668,7 +73484,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71709,7 +73525,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71729,6 +73545,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -71751,7 +73568,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71772,6 +73589,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -71795,7 +73613,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71845,7 +73663,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71883,7 +73701,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71899,7 +73717,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71945,7 +73763,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -71966,8 +73784,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -71995,7 +73813,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72045,7 +73863,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72065,6 +73883,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72087,7 +73906,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72108,6 +73927,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72131,7 +73951,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72152,6 +73972,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72169,63 +73990,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -72246,7 +74017,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72275,7 +74046,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72296,7 +74067,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72325,7 +74096,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72346,6 +74117,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72368,7 +74140,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72384,7 +74156,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72412,7 +74184,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72432,6 +74204,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72458,7 +74231,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72479,7 +74252,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72508,7 +74281,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72529,7 +74302,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72558,7 +74331,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72610,7 +74383,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72631,6 +74404,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -72662,7 +74436,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72712,7 +74486,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72734,7 +74508,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72758,7 +74532,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72779,7 +74553,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -72802,121 +74576,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -72938,63 +74604,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -73044,7 +74660,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73065,6 +74681,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73087,7 +74704,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73146,7 +74763,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73167,7 +74784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73196,7 +74813,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73217,7 +74834,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73246,7 +74863,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73296,7 +74913,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73316,7 +74933,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73345,7 +74962,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73369,7 +74986,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73398,7 +75015,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73419,7 +75036,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73448,7 +75065,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73469,6 +75086,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73509,7 +75127,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73530,7 +75148,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73559,7 +75177,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73580,6 +75198,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73602,7 +75221,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73652,7 +75271,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73673,6 +75292,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73695,7 +75315,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73745,7 +75365,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73787,7 +75407,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73808,6 +75428,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73833,7 +75454,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73883,7 +75504,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73904,7 +75525,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73933,7 +75554,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -73954,6 +75575,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -73977,7 +75599,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74002,7 +75624,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74030,7 +75652,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74058,7 +75680,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74089,13 +75711,48 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -74148,7 +75805,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74191,7 +75848,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74212,7 +75869,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74241,7 +75898,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74262,7 +75919,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74291,7 +75948,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74312,6 +75969,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -74335,7 +75993,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74357,7 +76015,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74401,7 +76059,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74417,7 +76075,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74445,7 +76103,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74461,7 +76119,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74604,7 +76262,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74647,7 +76305,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74657,7 +76315,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74697,7 +76355,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74707,7 +76365,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74761,7 +76419,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74811,7 +76469,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74832,7 +76490,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74861,7 +76519,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74882,7 +76540,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74911,7 +76569,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -74955,7 +76613,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75005,11 +76663,11 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + @@ -75029,7 +76687,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75058,7 +76716,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75109,7 +76767,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75154,7 +76812,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75197,7 +76855,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75240,7 +76898,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75249,12 +76907,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - @@ -75296,7 +76948,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75346,7 +76998,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75366,6 +77018,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -75382,13 +77035,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -75438,7 +77141,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75459,6 +77162,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -75481,7 +77185,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75502,7 +77206,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75531,7 +77235,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75552,6 +77256,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -75575,7 +77280,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75643,7 +77348,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75664,6 +77369,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -75727,7 +77433,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75748,7 +77454,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75777,7 +77483,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75798,8 +77504,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -75828,7 +77534,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75872,7 +77578,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -75893,6 +77599,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -75956,7 +77663,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76006,7 +77713,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76031,7 +77738,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76059,7 +77766,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76080,7 +77787,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76109,7 +77816,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76125,7 +77832,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76161,7 +77868,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76182,6 +77889,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -76205,7 +77913,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76230,7 +77938,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76258,7 +77966,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76308,7 +78016,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76329,6 +78037,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -76352,7 +78061,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76402,7 +78111,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76422,6 +78131,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -76450,7 +78160,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76471,7 +78181,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76500,7 +78210,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76553,7 +78263,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76574,6 +78284,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -76610,7 +78321,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76654,13 +78365,48 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -76681,7 +78427,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76710,7 +78456,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76735,7 +78481,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76758,7 +78504,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76783,7 +78529,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76806,66 +78552,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -76887,7 +78580,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76915,7 +78608,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -76936,8 +78629,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -76965,7 +78658,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77015,7 +78708,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77036,7 +78729,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77065,7 +78758,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77081,7 +78774,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77111,7 +78804,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77132,6 +78825,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77149,13 +78843,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -77176,6 +78920,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77204,7 +78949,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77254,7 +78999,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77274,6 +79019,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77296,7 +79042,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77338,7 +79084,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77359,7 +79105,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77388,7 +79134,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77409,7 +79155,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77438,7 +79184,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77459,6 +79205,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77487,7 +79234,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77509,7 +79256,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77537,7 +79284,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77574,7 +79321,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77599,7 +79346,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77627,7 +79374,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77648,6 +79395,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77676,7 +79424,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77701,7 +79449,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77729,7 +79477,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77764,7 +79512,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77784,6 +79532,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77806,7 +79555,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -77827,6 +79576,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -77979,7 +79729,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78029,7 +79779,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78079,7 +79829,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78129,7 +79879,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78150,7 +79900,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78179,7 +79929,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78222,7 +79972,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78243,8 +79993,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -78266,63 +80016,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -78343,6 +80043,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -78366,7 +80067,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78407,7 +80108,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78457,7 +80158,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78499,7 +80200,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78520,6 +80221,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -78724,7 +80426,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78768,7 +80470,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78789,6 +80491,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -78825,7 +80528,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78846,6 +80549,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -78874,7 +80578,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -78895,8 +80599,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -78924,17 +80628,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -78945,6 +80649,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -78955,6 +80660,9 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + @@ -78990,7 +80698,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79011,6 +80719,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79046,7 +80755,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79067,7 +80776,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79096,7 +80805,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79117,6 +80826,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79140,7 +80850,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79193,7 +80903,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79214,6 +80924,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79237,7 +80948,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79258,6 +80969,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79296,7 +81008,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79317,6 +81029,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79339,7 +81052,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79381,7 +81094,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79402,7 +81115,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79431,7 +81144,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79478,7 +81191,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79499,7 +81212,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79528,7 +81241,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79578,7 +81291,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79599,6 +81312,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79622,7 +81336,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79643,6 +81357,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -79687,7 +81402,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79737,7 +81452,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79753,7 +81468,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79781,7 +81496,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79806,7 +81521,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79829,7 +81544,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79850,8 +81565,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -79920,7 +81635,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79944,7 +81659,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -79973,7 +81688,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80017,7 +81732,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80038,6 +81753,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80077,7 +81793,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80098,7 +81814,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80127,7 +81843,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80148,6 +81864,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80176,7 +81893,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80219,7 +81936,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80240,6 +81957,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80268,7 +81986,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80288,6 +82006,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80314,7 +82033,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80335,6 +82054,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80363,7 +82083,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80384,6 +82104,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80407,7 +82128,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80428,6 +82149,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80548,7 +82270,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80581,7 +82303,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80602,6 +82324,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -80636,7 +82359,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80661,7 +82384,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80717,7 +82440,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80784,7 +82507,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80826,7 +82549,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80876,7 +82599,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80897,7 +82620,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80926,7 +82649,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80951,7 +82674,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -80979,7 +82702,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90496,7 +92219,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90524,7 +92247,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90545,7 +92268,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90574,7 +92297,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90590,7 +92313,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90621,7 +92344,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90665,7 +92388,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90686,6 +92409,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -90709,7 +92433,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90745,7 +92469,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90798,7 +92522,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90823,7 +92547,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90851,7 +92575,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90904,7 +92628,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -90920,7 +92644,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91010,7 +92734,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91031,6 +92755,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91054,7 +92779,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91082,7 +92807,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91107,7 +92832,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91135,7 +92860,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91156,7 +92881,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91185,7 +92910,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91213,7 +92938,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91234,7 +92959,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91263,7 +92988,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91313,7 +93038,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91407,7 +93132,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91428,6 +93153,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91450,7 +93176,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91471,7 +93197,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91500,7 +93226,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91550,7 +93276,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91571,6 +93297,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91594,7 +93321,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91614,6 +93341,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91636,7 +93364,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91656,6 +93384,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91678,7 +93407,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91731,7 +93460,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91752,6 +93481,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91775,7 +93505,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91796,6 +93526,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91819,7 +93550,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91840,6 +93571,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -91862,7 +93594,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91883,8 +93615,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -91912,7 +93644,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -91962,7 +93694,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92012,7 +93744,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92033,6 +93765,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92083,7 +93816,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92099,7 +93832,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92123,7 +93856,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92147,7 +93880,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92187,7 +93920,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92208,7 +93941,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92237,7 +93970,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92292,7 +94025,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92312,6 +94045,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92340,7 +94074,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92384,13 +94118,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -92411,6 +94195,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92434,7 +94219,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92455,6 +94240,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92483,7 +94269,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92526,7 +94312,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92548,7 +94334,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92576,7 +94362,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92622,7 +94408,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92647,7 +94433,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92675,7 +94461,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92717,7 +94503,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92745,7 +94531,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92782,7 +94568,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92803,6 +94589,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92824,13 +94611,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -92851,6 +94688,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92874,7 +94712,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92895,6 +94733,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -92917,7 +94756,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92939,7 +94778,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92967,7 +94806,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -92988,8 +94827,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -93017,7 +94856,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93067,7 +94906,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93112,7 +94951,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93133,6 +94972,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93161,7 +95001,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93181,6 +95021,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93203,7 +95044,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93224,6 +95065,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93247,7 +95089,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93268,6 +95110,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93290,7 +95133,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93314,7 +95157,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93327,205 +95170,11 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -93537,7 +95186,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93553,7 +95202,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93577,7 +95226,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93598,6 +95247,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93615,13 +95265,67 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -93642,7 +95346,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93671,7 +95375,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93735,13 +95439,47 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -93776,7 +95514,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93814,7 +95552,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93835,7 +95573,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93864,7 +95602,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93885,6 +95623,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -93907,7 +95646,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93928,7 +95667,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93957,7 +95696,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -93999,7 +95738,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94020,6 +95759,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94043,7 +95783,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94064,8 +95804,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -94088,7 +95828,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94113,7 +95853,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94141,7 +95881,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94162,7 +95902,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94191,7 +95931,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94212,6 +95952,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94262,7 +96003,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94282,6 +96023,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94304,7 +96046,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94325,6 +96067,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94335,13 +96078,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -94362,6 +96155,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94389,7 +96183,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94432,7 +96226,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94482,7 +96276,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94532,7 +96326,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94575,7 +96369,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94596,7 +96390,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94625,7 +96419,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94675,7 +96469,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94696,6 +96490,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94767,7 +96562,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94810,17 +96605,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -94831,6 +96626,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -94853,7 +96649,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94903,7 +96699,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -94953,7 +96749,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95006,7 +96802,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95027,6 +96823,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95071,7 +96868,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95121,7 +96918,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95142,6 +96939,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95165,7 +96963,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95215,7 +97013,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95236,7 +97034,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95265,7 +97063,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95318,7 +97116,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95339,6 +97137,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95362,7 +97161,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95383,6 +97182,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95399,7 +97199,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95423,7 +97223,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95452,7 +97252,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95488,13 +97288,67 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -95515,6 +97369,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95531,7 +97386,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95584,7 +97439,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95605,6 +97460,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95635,7 +97491,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95712,7 +97568,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95740,7 +97596,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95776,7 +97632,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95812,7 +97668,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95832,6 +97688,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95854,13 +97711,55 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -95881,6 +97780,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95904,7 +97804,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95925,7 +97825,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95954,7 +97854,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -95975,6 +97875,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -95998,7 +97899,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96014,7 +97915,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96037,7 +97938,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96057,6 +97958,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -96079,7 +97981,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96100,7 +98002,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96129,7 +98031,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96150,7 +98052,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96179,7 +98081,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96195,7 +98097,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96218,7 +98120,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96259,50 +98161,43 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + - + - + - + - + - + - - + - - - + + - - - - - - + - + @@ -96314,7 +98209,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96336,7 +98231,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96360,7 +98255,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96412,29 +98307,29 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + - + - + - - + + - - + + @@ -96446,7 +98341,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96462,7 +98357,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96494,11 +98389,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96513,7 +98404,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96534,6 +98425,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -96557,7 +98449,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96578,6 +98470,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -96606,7 +98499,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96656,7 +98549,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96706,7 +98599,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96727,7 +98620,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96756,7 +98649,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96783,8 +98676,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -96861,7 +98754,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -96882,6 +98775,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -96962,7 +98856,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97012,7 +98906,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97033,6 +98927,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97056,7 +98951,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97072,7 +98967,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97097,7 +98992,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97118,7 +99013,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97147,7 +99042,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97168,6 +99063,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97258,7 +99154,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97294,7 +99190,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97347,7 +99243,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97368,7 +99264,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97397,7 +99293,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97417,7 +99313,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97446,7 +99342,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97496,7 +99392,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97539,7 +99435,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97560,6 +99456,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97588,7 +99485,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97653,7 +99550,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97706,7 +99603,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97756,7 +99653,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97780,7 +99677,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97835,7 +99732,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97856,6 +99753,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97885,7 +99783,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97906,6 +99804,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97934,7 +99833,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97955,6 +99854,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -97977,7 +99877,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -97997,6 +99897,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -98019,7 +99920,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98040,7 +99941,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98069,7 +99970,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98096,8 +99997,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -98127,7 +100028,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98148,7 +100049,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98177,7 +100078,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98230,17 +100131,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -98272,7 +100173,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98293,7 +100194,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98322,7 +100223,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98343,7 +100244,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98372,7 +100273,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98393,6 +100294,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -98418,7 +100320,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98439,7 +100341,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98468,7 +100370,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98493,7 +100395,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98501,9 +100403,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98529,7 +100429,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98550,6 +100450,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -98600,7 +100501,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98621,7 +100522,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98650,7 +100551,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98694,7 +100595,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98719,7 +100620,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98747,7 +100648,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98757,7 +100658,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98768,7 +100669,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98797,7 +100698,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98847,7 +100748,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98897,7 +100798,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98947,7 +100848,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -98997,7 +100898,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99018,7 +100919,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99047,7 +100948,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99100,7 +101001,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99137,7 +101038,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99158,6 +101059,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99181,7 +101083,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99203,7 +101105,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99227,7 +101129,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99248,6 +101150,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99271,7 +101174,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99292,7 +101195,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99321,7 +101224,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99337,7 +101240,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99365,7 +101268,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99386,6 +101289,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99409,7 +101313,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99459,17 +101363,17 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + - + @@ -99480,6 +101384,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99496,12 +101401,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - @@ -99512,7 +101411,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99532,6 +101431,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99554,7 +101454,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99575,7 +101475,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99604,7 +101504,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99647,7 +101547,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99675,7 +101575,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99696,7 +101596,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99725,7 +101625,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99775,7 +101675,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99796,7 +101696,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99825,7 +101725,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -99846,6 +101746,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99863,63 +101764,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -99940,6 +101791,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -99962,7 +101814,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100006,7 +101858,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100027,8 +101879,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -100057,7 +101909,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100085,7 +101937,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100135,7 +101987,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100156,7 +102008,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100185,7 +102037,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -100933,14 +102785,14 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - + @@ -103030,7 +104882,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103051,6 +104903,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103068,62 +104921,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -103176,7 +104980,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103197,6 +105001,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103219,58 +105024,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -103291,6 +105051,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103314,7 +105075,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103335,6 +105096,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103363,7 +105125,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103413,7 +105175,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103466,7 +105228,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103487,7 +105249,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103530,7 +105292,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103546,7 +105308,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103574,7 +105336,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103627,7 +105389,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103648,6 +105410,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103679,7 +105442,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103700,6 +105463,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103734,7 +105498,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103777,7 +105541,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103798,7 +105562,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103827,7 +105591,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103848,6 +105612,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -103916,7 +105681,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103941,7 +105706,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -103963,63 +105728,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -104041,7 +105756,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104069,7 +105784,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104090,7 +105805,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104119,7 +105834,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104140,6 +105855,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104192,7 +105908,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104213,7 +105929,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104242,7 +105958,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104292,7 +106008,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104313,6 +106029,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104336,7 +106053,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104357,7 +106074,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104386,7 +106103,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104408,7 +106125,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104436,7 +106153,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104457,7 +106174,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104486,7 +106203,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104507,6 +106224,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104535,7 +106253,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104563,7 +106281,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104596,7 +106314,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104617,6 +106335,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104633,7 +106352,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104654,6 +106373,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104676,7 +106396,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104728,7 +106448,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104774,7 +106494,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104811,7 +106531,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104831,6 +106551,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104853,7 +106574,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104874,6 +106595,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104897,7 +106619,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104918,6 +106640,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -104940,7 +106663,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104970,7 +106693,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -104982,7 +106705,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105003,7 +106726,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105032,7 +106755,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105052,6 +106775,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105075,7 +106799,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105096,6 +106820,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105119,7 +106844,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105169,7 +106894,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105190,6 +106915,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105213,7 +106939,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105263,7 +106989,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105313,7 +107039,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105370,7 +107096,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105420,7 +107146,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105448,7 +107174,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105498,7 +107224,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105519,7 +107245,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105548,7 +107274,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105573,7 +107299,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105601,7 +107327,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105622,7 +107348,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105651,7 +107377,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105672,7 +107398,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105701,7 +107427,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105721,6 +107447,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105760,7 +107487,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105781,6 +107508,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105804,7 +107532,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105825,6 +107553,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -105853,7 +107582,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105874,7 +107603,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105903,7 +107632,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105924,7 +107653,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105953,7 +107682,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -105978,7 +107707,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106006,7 +107735,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106058,7 +107787,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106096,7 +107825,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106116,6 +107845,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106144,7 +107874,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106194,7 +107924,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106214,6 +107944,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106236,7 +107967,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106257,7 +107988,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106286,7 +108017,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106306,6 +108037,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106334,7 +108066,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106384,7 +108116,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106405,7 +108137,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106434,7 +108166,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106455,6 +108187,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106498,7 +108231,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106526,7 +108259,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106542,7 +108275,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106570,7 +108303,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106591,6 +108324,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106614,7 +108348,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106658,7 +108392,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106695,7 +108429,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106772,7 +108506,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106793,6 +108527,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106816,7 +108551,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106858,7 +108593,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106878,6 +108613,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -106900,7 +108636,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106956,7 +108692,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -106978,7 +108714,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107006,7 +108742,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107031,7 +108767,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107146,7 +108882,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107167,7 +108903,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107190,13 +108926,63 @@ The MedicationUsage resource was previously called MedicationStatement."> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -107220,7 +109006,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107259,7 +109045,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107272,7 +109058,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107283,8 +109069,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -107296,8 +109082,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -107306,200 +109092,6 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -107513,7 +109105,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107534,6 +109126,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -107557,7 +109150,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -107579,6 +109172,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -107887,55 +109481,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -107956,6 +109508,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -107992,7 +109545,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108017,7 +109570,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108045,7 +109598,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108066,6 +109619,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108094,18 +109648,12 @@ The MedicationUsage resource was previously called MedicationStatement."> - + - - - - - - @@ -108117,10 +109665,35 @@ The MedicationUsage resource was previously called MedicationStatement."> - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -108132,7 +109705,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108190,7 +109763,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108218,7 +109791,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108239,6 +109812,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108274,7 +109848,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108295,6 +109869,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108325,7 +109900,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108346,6 +109921,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108381,7 +109957,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108410,7 +109986,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108431,6 +110007,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108453,7 +110030,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108474,6 +110051,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108553,7 +110131,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108590,7 +110168,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108640,7 +110218,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108661,6 +110239,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108829,7 +110408,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108850,7 +110429,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108879,7 +110458,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108900,6 +110479,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -108923,7 +110503,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108964,7 +110544,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -108985,6 +110565,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -109002,55 +110583,13 @@ The MedicationUsage resource was previously called MedicationStatement."> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -109086,7 +110625,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109136,7 +110675,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109157,6 +110696,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -109225,7 +110765,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109246,6 +110786,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -109274,7 +110815,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109299,7 +110840,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109327,7 +110868,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109347,6 +110888,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -109369,7 +110911,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109419,7 +110961,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109439,7 +110981,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109468,7 +111010,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109526,7 +111068,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109547,7 +111089,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109576,7 +111118,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109600,8 +111142,8 @@ The MedicationUsage resource was previously called MedicationStatement."> - - + + @@ -109624,7 +111166,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109645,7 +111187,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109674,7 +111216,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109694,6 +111236,7 @@ The MedicationUsage resource was previously called MedicationStatement."> + @@ -109716,7 +111259,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109745,7 +111288,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109780,7 +111323,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109815,7 +111358,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109851,7 +111394,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -109921,7 +111464,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -111184,7 +112727,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + @@ -112211,7 +113754,7 @@ The MedicationUsage resource was previously called MedicationStatement."> - + diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml index 590fe2b2a0a..8c168a86659 100644 --- a/hapi-fhir-validation/pom.xml +++ b/hapi-fhir-validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java index afbd6b89540..6ed0f63fa9d 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java @@ -111,12 +111,7 @@ public class RemoteTerminologyServiceValidationSupport extends BaseValidationSup // at this point codeSystem couldn't be extracted for a multi-include ValueSet. Just on case it was // because the format was not well handled, let's allow to watch the VS by an easy logging change - try { - ourLog.trace("CodeSystem couldn't be extracted for code: {} for ValueSet: {}", - theCode, JsonUtil.serialize(theValueSet)); - } catch (IOException theE) { - ourLog.error("IOException trying to serialize ValueSet to json: " + theE); - } + ourLog.trace("CodeSystem couldn't be extracted for code: {} for ValueSet: {}", theCode, theValueSet.getId()); return null; } diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java index 0919cf6f177..845b5b3cb24 100644 --- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java +++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java @@ -31,6 +31,7 @@ import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.model.ValueSet; import org.hl7.fhir.r5.terminologies.ValueSetExpander; import org.hl7.fhir.r5.utils.validation.IResourceValidator; +import org.hl7.fhir.r5.utils.validation.ValidationContextCarrier; import org.hl7.fhir.utilities.TimeTracker; import org.hl7.fhir.utilities.TranslationServices; import org.hl7.fhir.utilities.i18n.I18nBase; @@ -371,6 +372,11 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo return retVal; } + @Override + public T fetchResource(Class class_, String uri, String version) { + return fetchResource(class_, uri + "|" + version); + } + @Override public T fetchResource(Class class_, String uri, CanonicalResource canonicalForSource) { throw new UnsupportedOperationException(); @@ -591,6 +597,11 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo return doValidation(convertedVs, validationOptions, system, code, display); } + @Override + public ValidationResult validateCode(ValidationOptions options, Coding code, ValueSet vs, ValidationContextCarrier ctxt) { + return validateCode(options, code, vs); + } + @Override public void validateCodeBatch(ValidationOptions options, List codes, ValueSet vs) { for (CodingValidationRequest next : codes) { diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupportTest.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupportTest.java index 74b2568f20c..3390ba15789 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupportTest.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupportTest.java @@ -60,7 +60,7 @@ public class RemoteTerminologyServiceValidationSupportTest { private static final String VALUE_SET_URL = "http://value.set/url"; private static final String ERROR_MESSAGE = "This is an error message"; - private static FhirContext ourCtx = FhirContext.forR4(); + private static FhirContext ourCtx = FhirContext.forR4Cached(); @RegisterExtension public RestfulServerExtension myRestfulServerExtension = new RestfulServerExtension(ourCtx); diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java index c79b6c85c7f..f6bf1955201 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java @@ -639,8 +639,9 @@ public class FhirInstanceValidatorR4Test extends BaseTest { String input = IOUtils.toString(FhirInstanceValidatorR4Test.class.getResourceAsStream("/r4/diagnosticreport-example-gingival-mass.json"), Constants.CHARSET_UTF8); ValidationResult output = myFhirValidator.validateWithResult(input); List errors = logResultsAndReturnAll(output); - assertEquals(1, errors.size()); + assertEquals(2, errors.size()); assertEquals("None of the codings provided are in the value set 'LOINC Diagnostic Report Codes' (http://hl7.org/fhir/ValueSet/report-codes), and a coding is recommended to come from this value set) (codes = http://loinc.org#1-8)", errors.get(0).getMessage()); + assertEquals("Base64 encoded values SHOULD not contain any whitespace (per RFC 4648). Note that non-validating readers are encouraged to accept whitespace anyway", errors.get(1).getMessage()); } @Test diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/QuestionnaireResponseValidatorR5Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/QuestionnaireResponseValidatorR5Test.java index 5564e86d538..6687cdfdd2c 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/QuestionnaireResponseValidatorR5Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r5/validation/QuestionnaireResponseValidatorR5Test.java @@ -385,9 +385,14 @@ public class QuestionnaireResponseValidatorR5Test { qa.getText().setDiv(new XhtmlNode().setValue("
AA
")).setStatus(Narrative.NarrativeStatus.GENERATED); qa.setStatus(QuestionnaireResponseStatus.INPROGRESS); qa.setQuestionnaire(questionnaireRef); - qa.addItem().setLinkId("link1") + qa.addItem() + .setLinkId("link1") .addAnswer() - .addItem().setLinkId("link11"); + .setValue(new Coding(codeSystemUrl, codeValue, null)) + .addItem() + .setLinkId("link11") + .addAnswer() + .setValue(new StringType("foo")); String rXml = xmlParser.encodeResourceToString(qa); ourLog.info(rXml); @@ -441,9 +446,14 @@ public class QuestionnaireResponseValidatorR5Test { qa.getText().setDiv(new XhtmlNode().setValue("
AA
")).setStatus(Narrative.NarrativeStatus.GENERATED); qa.setStatus(QuestionnaireResponseStatus.INPROGRESS); qa.setQuestionnaire(questionnaireRef); - qa.addItem().setLinkId("link1") + qa.addItem() + .setLinkId("link1") .addAnswer() - .addItem().setLinkId("link11"); + .setValue(new Coding(codeSystemUrl, codeValue, null)) + .addItem() + .setLinkId("link11") + .addAnswer() + .setValue(new StringType("foo")); String rXml = xmlParser.encodeResourceToString(qa); ourLog.info(rXml); @@ -482,7 +492,11 @@ public class QuestionnaireResponseValidatorR5Test { qa.setQuestionnaire(questionnaireRef); qa.addItem().setLinkId("link1") .addAnswer() - .addItem().setLinkId("link11"); + .setValue(new StringType("FOO")) + .addItem() + .setLinkId("link11") + .addAnswer() + .setValue(new StringType("BAR")); String rXml = xmlParser.encodeResourceToString(qa); ourLog.info(rXml); diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index fe07b76d442..12d53dfad9d 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml @@ -58,37 +58,37 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu2 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-validation-resources-dstu3 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ca.uhn.hapi.fhir hapi-fhir-validation-resources-r4 - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT org.apache.velocity diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java index 8c3e44e49a5..20b1a87706a 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ResourceMinimizerMojo.java @@ -226,39 +226,55 @@ public class ResourceMinimizerMojo extends AbstractMojo { // m.fhirVersion = "R4"; // m.execute(); // byteCount += m.getByteCount(); +// fileCount += m.getFileCount(); + +// m = new ResourceMinimizerMojo(); +// m.myCtx = ctxR4; +// m.targetDirectory = new File("./hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/r4/model/sp"); +// m.fhirVersion = "R4"; +// m.execute(); +// byteCount += m.getByteCount(); // fileCount += m.getFileCount(); m = new ResourceMinimizerMojo(); - m.myCtx = ctxR4; - m.targetDirectory = new File("./hapi-fhir-validation-resources-r4/src/main/resources/org/hl7/fhir/r4/model/sp"); - m.fhirVersion = "R4"; + m.myCtx = ctxR5; + m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile"); + m.fhirVersion = "R5"; m.execute(); byteCount += m.getByteCount(); fileCount += m.getFileCount(); -// m = new ResourceMinimizerMojo(); -// m.myCtx = ctxR5; -// m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/profile"); -// m.fhirVersion = "R5"; -// m.execute(); -// byteCount += m.getByteCount(); -// fileCount += m.getFileCount(); -// -// m = new ResourceMinimizerMojo(); -// m.myCtx = ctxR5; -// m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset"); -// m.fhirVersion = "R5"; -// m.execute(); -// byteCount += m.getByteCount(); -// fileCount += m.getFileCount(); -// -// m = new ResourceMinimizerMojo(); -// m.myCtx = ctxR5; -// m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension"); -// m.fhirVersion = "R5"; -// m.execute(); -// byteCount += m.getByteCount(); -// fileCount += m.getFileCount(); + m = new ResourceMinimizerMojo(); + m.myCtx = ctxR5; + m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/valueset"); + m.fhirVersion = "R5"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + + m = new ResourceMinimizerMojo(); + m.myCtx = ctxR5; + m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/extension"); + m.fhirVersion = "R5"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + + m = new ResourceMinimizerMojo(); + m.myCtx = ctxR5; + m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/sp"); + m.fhirVersion = "R5"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); + + m = new ResourceMinimizerMojo(); + m.myCtx = ctxR5; + m.targetDirectory = new File("./hapi-fhir-validation-resources-r5/src/main/resources/org/hl7/fhir/r5/model/compartment"); + m.fhirVersion = "R5"; + m.execute(); + byteCount += m.getByteCount(); + fileCount += m.getFileCount(); ourLog.info("Trimmed {} files", fileCount); ourLog.info("Trimmed {} bytes", FileUtils.byteCountToDisplaySize(byteCount)); diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index 42b85810799..b4d4254c178 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../pom.xml diff --git a/hapi-tinder-test/src/test/java/test/TestParticulars.java b/hapi-tinder-test/src/test/java/test/TestParticulars.java index 69b612b6917..aaffd314b22 100644 --- a/hapi-tinder-test/src/test/java/test/TestParticulars.java +++ b/hapi-tinder-test/src/test/java/test/TestParticulars.java @@ -5,19 +5,21 @@ import org.junit.jupiter.api.Test; import ca.uhn.test.realstructs.resource.ListResource; import ca.uhn.test.realstructs.resource.AuditEvent.ObjectElement; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class TestParticulars { @Test public void testElementsWithSpecialNames() { // This won't compile if tinder didn't generate the right names... - ListResource.class.getName(); - ObjectElement.class.getName(); + assertNotNull(ListResource.class.getName()); + assertNotNull(ObjectElement.class.getName()); } @Test public void testReferenceDoesntReturnNull() { ca.uhn.test.realstructs.resource.Patient p = new ca.uhn.test.realstructs.resource.Patient(); - p.getManagingOrganization().toString(); + assertNotNull(p.getManagingOrganization().toString()); } } diff --git a/pom.xml b/pom.xml index ffae7bba8a9..477205ab10e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-fhir pom - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT HAPI-FHIR An open-source implementation of the FHIR specification in Java. https://hapifhir.io @@ -766,7 +766,7 @@ - 5.6.7 + 5.6.21 1.0.3 -Dfile.encoding=UTF-8 -Xmx2048m @@ -788,16 +788,16 @@ 1.15 1.21 1.9 - 2.8.0 + 2.11.0 3.12.0 1.2 1.5.0 10.14.2.0 - 2.5.1 - 3.9.0 + 2.10.0 + 4.2.0 0.7.9 - 30.1.1-jre + 31.0.1-jre 2.8.9 2.2.11_1 2.3.1 @@ -805,12 +805,12 @@ 3.0.0 4.2.0 3.0.3 - 9.4.43.v20210629 + 9.4.44.v20210927 3.0.2 - 5.7.1 + 5.8.2 0.50.40 - 6.5.4 - 5.4.30.Final + 8.3.0 + 5.4.33 6.0.3.Final 8.7.0 @@ -818,7 +818,7 @@ 6.1.5.Final 4.4.13 4.5.13 - 2.13.0 + 2.13.1 ${jackson_version} 3.3.0 1.8 @@ -828,20 +828,21 @@ 4.0.0.Beta3 5.6.5 9.5.4 - 2.8.8 + 2.9.0 9.8.0-15 1.2_5 - 1.7.30 - 2.16.0 - 5.3.13 - 2.5.0 + 2.1.12 + 1.7.32 + 2.17.1 + 5.3.14 + 2.6.0 4.3.3 - 2.5.0 + 2.6.2 1.2.2.RELEASE 3.1.4 - 1.16.0 - 3.0.13.RELEASE + 1.16.2 + 3.0.14.RELEASE 4.4.1 @@ -872,7 +873,7 @@ ch.qos.logback logback-classic - 1.2.8 + 1.2.10 com.atlassian.commonmark @@ -961,7 +962,7 @@ com.h2database h2 - 1.4.200 + 2.0.204 com.helger @@ -1016,7 +1017,7 @@ commons-cli commons-cli - 1.4 + 1.5.0 commons-codec @@ -1056,12 +1057,12 @@ org.jdom jdom2 - 2.0.6 + 2.0.6.1 org.jetbrains annotations - 21.0.1 + 23.0.0 commons-io @@ -1138,7 +1139,7 @@ com.microsoft.sqlserver mssql-jdbc - 9.2.1.jre8 + 9.4.1.jre8 javax.servlet @@ -1172,28 +1173,28 @@ io.swagger.core.v3 swagger-models - 2.1.7 + ${swagger_version} io.swagger.core.v3 swagger-core - 2.1.7 + ${swagger_version} mysql mysql-connector-java - 8.0.24 + 8.0.27 + + + org.springdoc + springdoc-openapi-ui + 1.5.13 + + + net.sourceforge.htmlunit + htmlunit + 2.56.0 - - org.springdoc - springdoc-openapi-ui - 1.5.13 - - - net.sourceforge.htmlunit - htmlunit - 2.49.1 - net.sf.json-lib json-lib @@ -1225,7 +1226,7 @@ org.apache.commons commons-dbcp2 - 2.8.0 + 2.9.0 org.apache.commons @@ -1321,17 +1322,17 @@ org.apache.maven.scm maven-scm-api - 1.11.2 + 1.12.0 org.apache.maven.scm maven-scm-manager-plexus - 1.11.2 + 1.12.0 org.apache.maven.scm maven-scm-provider-gitexe - 1.11.2 + 1.12.0 org.apache.maven.wagon @@ -1381,7 +1382,7 @@ org.awaitility awaitility - 4.1.0 + 4.1.1 org.codehaus.plexus @@ -1492,7 +1493,7 @@ org.fusesource.jansi jansi - 2.3.2 + 2.4.0 org.glassfish @@ -1709,7 +1710,7 @@ org.postgresql postgresql - 42.2.24 + 42.3.1 org.quartz-scheduler @@ -1906,7 +1907,7 @@ org.webjars swagger-ui - 3.46.0 + 4.1.3 org.xmlunit @@ -2166,7 +2167,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 ca/uhn/fhir/model/dstu2/**/*.class @@ -2837,7 +2838,7 @@ CI - -Dspring.test.context.cache.maxSize=2 -Dfile.encoding=UTF-8 -Xmx2648m -XX:-TieredCompilation -Xverify:none -Dfile.encoding=UTF-8 -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:ReservedCodeCacheSize=220M + -Dspring.test.context.cache.maxSize=2 -Dfile.encoding=UTF-8 -Xmx2648m -XX:-TieredCompilation -Dfile.encoding=UTF-8 -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:ReservedCodeCacheSize=220M @@ -2901,9 +2902,20 @@ org.apache.maven.plugins maven-compiler-plugin + true -XDcompilePolicy=simple -Xplugin:ErrorProne + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml index 197e34fbb4d..d429f1bc3d4 100644 --- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml +++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../pom.xml diff --git a/tests/hapi-fhir-base-test-mindeps-client/pom.xml b/tests/hapi-fhir-base-test-mindeps-client/pom.xml index 3b70a9413ef..8e86f65aa23 100644 --- a/tests/hapi-fhir-base-test-mindeps-client/pom.xml +++ b/tests/hapi-fhir-base-test-mindeps-client/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../pom.xml diff --git a/tests/hapi-fhir-base-test-mindeps-server/pom.xml b/tests/hapi-fhir-base-test-mindeps-server/pom.xml index 15399602bc6..2df0a94975e 100644 --- a/tests/hapi-fhir-base-test-mindeps-server/pom.xml +++ b/tests/hapi-fhir-base-test-mindeps-server/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 5.7.0-PRE8-SNAPSHOT + 5.7.0-PRE9-SNAPSHOT ../../pom.xml