Update support for FHIR IG US Core with v3.1.1 and v4.0.0

conformance/fhir-ig-us-core/CHANGELOG

@@ -1,10 +1,9 @@
-# Version 2
+# US Core 3.1.1 (Version 2) - STU311
 Source - http://hl7.org/fhir/us/core/STU3.1.1/
 - Removed 3.1.0 Artifacts
 - Updated to 3.1.1 Artifacts STU3.1.1
-- Moved the package.tgz's examples folder to the fhir-examples project
-- Changed the text-generated for the CapabilityStatements CapabilityStatement-us-core-client.json and CapabilityStatement-us-core-server.json
-    as the xhtml was invalid
+- Examples are under src/test/resources/JSON/311
+- Replace all narrative text with minimal placeholder for space efficiency
 - Per https://github.com/IBM/FHIR/issues/1460 Relaxed required to extensible
     - https://jira.hl7.org/browse/FHIR-27911 Change binding to UCUM from required to extensible + max binding UCUM
     - Per https://chat.fhir.org/#narrow/stream/179252-IG-creation/topic/US.20Core.20QA.20Issue.20.233-.20nasty.20profiling.20error
@@ -17,4 +16,12 @@ Source - http://hl7.org/fhir/us/core/STU3.1.1/
    - The P element represents a paragraph. It cannot contain block-level elements (including P itself).
    - Refer to https://jira.hl7.org/browse/FHIR-28409 Invalid XHTML in Examples MedicationRequest-uscore-mo2 XML/JSON
 - Modify DiagnosticReport-cardiology-report JSON and XML samples contain invalid hashes https://jira.hl7.org/browse/FHIR-28408
-- Add implicit-system extensions to applicable token SearchParameter definitions (performance optimization for https://github.com/IBM/FHIR/issues/1929)
+- Add implicit-system extensions to applicable token SearchParameter definitions (performance optimization for https://github.com/IBM/FHIR/issues/1929)
+- Updated Examples to point to 3.1.1 profile
+- Update the StructureDefinitions and other artifacts for 3.1.1 internal references with target profiles and valueset bindings.
+
+# US Core 4.0.0 - STU4
+Source - https://www.hl7.org/fhir/us/core/stu4/
+- Examples are under src/test/resources/JSON/400
+- Replace all narrative text with minimal placeholder for space efficiency
+- Revised Endpoint in the Practitioner endpoint so it points to relative path, not absolute path

conformance/fhir-ig-us-core/README.md

@@ -1,31 +1,3 @@
-This profile HL7 FHIR® US Core Implementation Guide CI Build - 3.1.1.
+This profile HL7 FHIR® US Core Implementation Guide includes 3.1.1 and 4.0.0.
 
-COMMIT https://github.com/HL7/US-Core/commit/592ab2407fd0c53f75d9c671bbbc701ed81e509b
-
-Retrieved on 27 AUG 2020
-
-Check the Profiles are on the system: 
-
-```
-$ curl -ks -u fhiruser:change-password https://localhost:9443/fhir-server/api/v4/metadata 2>&1 | jq -r '.rest[].resource[] | "\(.type),\(.supportedProfile)"' | grep -i us-core
-AllergyIntolerance,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-allergyintolerance|3.1.1"]
-CarePlan,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-careplan|3.1.1"]
-CareTeam,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-careteam|3.1.1"]
-Condition,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition|3.1.1"]
-Device,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-implantable-device|3.1.1"]
-DiagnosticReport,["http://hl7.org/fhir/StructureDefinition/hlaresult|4.0.1","http://hl7.org/fhir/StructureDefinition/lipidprofile|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab|3.1.1","http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-note|3.1.1","http://hl7.org/fhir/StructureDefinition/diagnosticreport-genetics|4.0.1"]
-DocumentReference,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-documentreference|3.1.1"]
-Encounter,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-encounter|3.1.1"]
-Goal,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-goal|3.1.1"]
-Immunization,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-immunization|3.1.1"]
-Location,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-location|3.1.1"]
-Medication,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-medication|3.1.1"]
-MedicationRequest,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-medicationrequest|3.1.1"]
-Observation,["http://hl7.org/fhir/StructureDefinition/triglyceride|4.0.1","http://hl7.org/fhir/StructureDefinition/oxygensat|4.0.1","http://hl7.org/fhir/StructureDefinition/bp|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab|3.1.1","http://hl7.org/fhir/StructureDefinition/devicemetricobservation|4.0.1","http://hl7.org/fhir/StructureDefinition/observation-genetics|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/pediatric-weight-for-height|3.1.1","http://hl7.org/fhir/StructureDefinition/heartrate|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/us-core-smokingstatus|3.1.1","http://hl7.org/fhir/StructureDefinition/ldlcholesterol|4.0.1","http://hl7.org/fhir/StructureDefinition/resprate|4.0.1","http://hl7.org/fhir/StructureDefinition/bodyheight|4.0.1","http://hl7.org/fhir/StructureDefinition/bodytemp|4.0.1","http://hl7.org/fhir/StructureDefinition/cholesterol|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/head-occipital-frontal-circumference-percentile|3.1.1","http://hl7.org/fhir/StructureDefinition/headcircum|4.0.1","http://hl7.org/fhir/StructureDefinition/vitalspanel|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age|3.1.1","http://hl7.org/fhir/StructureDefinition/bodyweight|4.0.1","http://hl7.org/fhir/StructureDefinition/hdlcholesterol|4.0.1","http://hl7.org/fhir/us/core/StructureDefinition/us-core-pulse-oximetry|3.1.1","http://hl7.org/fhir/StructureDefinition/vitalsigns|4.0.1","http://hl7.org/fhir/StructureDefinition/bmi|4.0.1"]
-Organization,["http://hl7.org/fhir/us/carin/StructureDefinition/carin-bb-organization|0.1.0","http://hl7.org/fhir/us/core/StructureDefinition/us-core-organization|3.1.1"]
-Patient,["http://hl7.org/fhir/us/carin/StructureDefinition/carin-bb-patient|0.1.0","http://hl7.org/fhir/us/core/StructureDefinition/us-core-patient|3.1.1"]
-Practitioner,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitioner|3.1.1"]
-PractitionerRole,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-practitionerrole|3.1.1","http://hl7.org/fhir/us/carin/StructureDefinition/carin-bb-practitionerrole|0.1.0"]
-Procedure,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-procedure|3.1.1"]
-Provenance,["http://hl7.org/fhir/us/core/StructureDefinition/us-core-provenance|3.1.1","http://hl7.org/fhir/StructureDefinition/ehrsrle-provenance|4.0.1","http://hl7.org/fhir/StructureDefinition/provenance-relevant-history|4.0.1"]
-```
+Refer to the change log for details on the changes.

conformance/fhir-ig-us-core/pom.xml

@@ -31,10 +31,5 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>fhir-examples</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

conformance/fhir-ig-us-core/src/main/java/com/ibm/fhir/ig/us/core/USCore311ResourceProvider.java

@@ -0,0 +1,16 @@
+/*
+ * (C) Copyright IBM Corp. 2019, 2020
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ibm.fhir.ig.us.core;
+
+import com.ibm.fhir.registry.util.PackageRegistryResourceProvider;
+
+public class USCore311ResourceProvider extends PackageRegistryResourceProvider {
+    @Override
+    public String getPackageId() {
+        return "hl7.fhir.us.core.311";
+    }
+}

conformance/fhir-ig-us-core/src/main/java/com/ibm/fhir/ig/us/core/USCore400ResourceProvider.java

@@ -0,0 +1,16 @@
+/*
+ * (C) Copyright IBM Corp. 2021
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.ibm.fhir.ig.us.core;
+
+import com.ibm.fhir.registry.util.PackageRegistryResourceProvider;
+
+public class USCore400ResourceProvider extends PackageRegistryResourceProvider {
+    @Override
+    public String getPackageId() {
+        return "hl7.fhir.us.core.400";
+    }
+}

conformance/fhir-ig-us-core/src/main/resources/META-INF/services/com.ibm.fhir.registry.spi.FHIRRegistryResourceProvider

@@ -1 +1,2 @@
-com.ibm.fhir.ig.us.core.USCoreResourceProvider
+com.ibm.fhir.ig.us.core.USCore311ResourceProvider
+com.ibm.fhir.ig.us.core.USCore400ResourceProvider