Pull request #141: Fix out of order StructureDefinition elements

Merge in CIL/ci-fhir-r4 from CIFMM-4068-profile-element-out-of-order-schema-errors to master * commit 'c3375065a89a2958d30a3fc75f496d077237431f': Fix out of order StructureDefinition elements
AuDigitalHealth · Jul 21, 2023 · 5613ac1 · 5613ac1
2 parents 1662683 + c337506
commit 5613ac1
Show file tree

Hide file tree

Showing 22 changed files with 52 additions and 52 deletions.
diff --git a/input/resources/Profile/dh-composition-core-1.xml b/input/resources/Profile/dh-composition-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-composition-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-core-1"/>
-  <version value="0.0.4"/>
+  <version value="0.0.5"/>
   <name value="ADHACompositionCore"/>
   <title value="ADHA Core Composition"/>
   <status value="draft"/>
@@ -43,8 +43,8 @@
     </element>
     <element id="Composition.category">
       <path value="Composition.category"/>
-      <mustSupport value="true"/>
       <min value="1"/>
+      <mustSupport value="true"/>
     </element>
     <element id="Composition.subject">
       <path value="Composition.subject"/>

diff --git a/input/resources/Profile/dh-composition-ncspv-1.xml b/input/resources/Profile/dh-composition-ncspv-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-composition-ncspv-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-ncspv-1"/>
-  <version value="0.0.3"/>
+  <version value="0.0.4"/>
   <name value="DHCompositionNCSPV"/>
   <title value="ADHA National Cancer Screening Program Participation View"/>
   <status value="draft"/>
@@ -99,12 +99,12 @@
     <element id="Composition.section.entry">
       <path value="Composition.section.entry"/>
       <short value="National cancer screening program participation observation"/>
+      <min value="1"/>
       <type>
         <code value="Reference"/>
         <targetProfile
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-observation-ncspp-1"/>
       </type>
-      <min value="1"/>
     </element>
     <element id="Composition.section.emptyReason">
       <path value="Composition.section.emptyReason"/>

diff --git a/input/resources/Profile/dh-composition-po-1.xml b/input/resources/Profile/dh-composition-po-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-composition-po-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-po-1"/>
-  <version value="0.0.5"/>
+  <version value="0.0.6"/>
   <name value="ADHACompositionPO"/>
   <title value="ADHA Personal Observations Composition"/>
   <status value="draft"/>
@@ -91,6 +91,7 @@
     </element>
     <element id="Composition.section.entry">
       <path value="Composition.section.entry"/>
+      <min value="1"/>
       <type>
         <code value="Reference"/>
         <targetProfile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-headcircum"/>
@@ -113,7 +114,6 @@
         <expression value="entry.resolve().where($this is Observation).exists() implies entry.resolve().conformsTo('http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-observation-simple-1')"/>
         <source value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-composition-po-1"/>
       </constraint>
-      <min value="1"/>
     </element>
     <element id="Composition.section.emptyReason">
       <path value="Composition.section.emptyReason"/>

diff --git a/input/resources/Profile/dh-condition-core-1.xml b/input/resources/Profile/dh-condition-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-condition-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-condition-core-1"/>
-  <version value="1.0.0"/>
+  <version value="1.0.1"/>
   <name value="ADHAConditionCore"/>
   <title value="ADHA Core Condition"/>
   <status value="active"/>
@@ -45,8 +45,8 @@
     </element>
     <element id="Condition.clinicalStatus">
       <path value="Condition.clinicalStatus"/>
-      <mustSupport value="true"/>
       <condition value="inv-dh-cond-05"/>
+      <mustSupport value="true"/>
     </element>
     <element id="Condition.verificationStatus">
       <path value="Condition.verificationStatus"/>

diff --git a/input/resources/Profile/dh-consent-aodr-1.xml b/input/resources/Profile/dh-consent-aodr-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-consent-aodr-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-consent-aodr-1"/>
-  <version value="1.0.0"/>
+  <version value="1.0.1"/>
   <name value="ADHAConsentAODR"/>
   <title value="ADHA Record of Consent from Australian Organ Donor Register"/>
   <status value="active"/>
@@ -82,8 +82,8 @@
     </element>
     <element id="Consent.category:health">
       <path value="Consent.category"/>
-      <short value="Consent for healthcare service, procedure, or activity"/>
       <sliceName value="health"/>
+      <short value="Consent for healthcare service, procedure, or activity"/>
       <min value="1"/>
       <max value="1" />
       <patternCodeableConcept>
@@ -95,8 +95,8 @@
     </element>
     <element id="Consent.category:aodr">
       <path value="Consent.category"/>
-      <short value="Organ donation consent"/>
       <sliceName value="aodr"/>
+      <short value="Organ donation consent"/>
       <min value="1"/>
       <max value="1" />
       <patternCodeableConcept>

diff --git a/input/resources/Profile/dh-diagnosticreport-path-1.xml b/input/resources/Profile/dh-diagnosticreport-path-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-diagnosticreport-path-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-diagnosticreport-path-1"/>
-  <version value="0.1.3"/>
+  <version value="0.1.4"/>
   <name value="ADHADiagnosticReportPath"/>
   <title value="ADHA Pathology Report"/>
   <status value="draft"/>
@@ -32,24 +32,24 @@
     </element>
     <element id="DiagnosticReport.category">
       <path value="DiagnosticReport.category"/>
-      <short value="Classification of the report as laboratory + more specific discipline where available"/>
-      <comment value="A fixed category denoting a laboratory report and supports handling and searching of reports. A second category to provide a finer grain of discipline, e.g. Haematology should be provided if possible."/>
       <slicing>
         <discriminator>
           <type value="pattern"/>
           <path value="$this"/>
         </discriminator>
         <rules value="open"/>
       </slicing>
+      <short value="Classification of the report as laboratory + more specific discipline where available"/>
+      <comment value="A fixed category denoting a laboratory report and supports handling and searching of reports. A second category to provide a finer grain of discipline, e.g. Haematology should be provided if possible."/>
       <binding>
         <strength value="extensible" />
         <valueSet value="https://healthterminologies.gov.au/fhir/ValueSet/pathology-diagnostic-service-category-1" />
       </binding>
     </element>
     <element id="DiagnosticReport.category:Lab">
       <path value="DiagnosticReport.category"/>
-      <short value="Report generated by laboratories"/>
       <sliceName value="Lab"/>
+      <short value="Report generated by laboratories"/>
       <min value="1"/>
       <max value="1" />
       <patternCodeableConcept>

diff --git a/input/resources/Profile/dh-episodeofcare-mymedicare-1.xml b/input/resources/Profile/dh-episodeofcare-mymedicare-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-episodeofcare-mymedicare-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-episodeofcare-mymedicare-1"/>
-  <version value="0.0.3"/>
+  <version value="0.0.4"/>
   <name value="ADHAEpisodeOfCareMyMedicare"/>
   <title value="ADHA GP Practice Registration Entry"/>
   <status value="draft"/>
@@ -59,8 +59,8 @@
     </element>
     <element id="EpisodeOfCare.type:primaryCare">
       <path value="EpisodeOfCare.type"/>
-      <short value="GP practice - primary care management"/>
       <sliceName value="primaryCare"/>
+      <short value="GP practice - primary care management"/>
       <min value="1"/>
       <max value="1"/>
       <patternCodeableConcept>

diff --git a/input/resources/Profile/dh-healthcareservice-core-1.xml b/input/resources/Profile/dh-healthcareservice-core-1.xml
@@ -3,7 +3,7 @@
   <id value="dh-healthcareservice-core-1"/>
   <url
     value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-healthcareservice-core-1"/>
-  <version value="1.0.0"/>
+  <version value="1.0.1"/>
   <name value="ADHAHealthcareServiceCore"/>
   <title value="ADHA Core HealthcareService"/>
   <status value="active"/>
@@ -56,14 +56,14 @@
     </element>
     <element id="HealthcareService.identifier">
       <path value="HealthcareService.identifier"/>
-      <short value="External identifiers for this item"/>
       <slicing>
         <discriminator>
           <type value="pattern"/>
           <path value="type"/>
         </discriminator>
         <rules value="open"/>
       </slicing>
+      <short value="External identifiers for this item"/>
       <mustSupport value="true"/>
     </element>
     <element id="HealthcareService.identifier:hpio">

diff --git a/input/resources/Profile/dh-immunization-core-1.xml b/input/resources/Profile/dh-immunization-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-immunization-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-immunization-core-1"/>
-  <version value="1.0.0"/>
+  <version value="1.0.1"/>
   <name value="ADHAImmunizationCore"/>
   <title value="ADHA Core Immunization"/>
   <status value="active"/>
@@ -41,11 +41,11 @@
     <element id="Immunization.extension:vaccine-serial-number">
       <path value="Immunization.extension"/>
       <sliceName value="vaccine-serial-number"/>
+      <max value="1"/>
       <type>
         <code value="Extension"/>
         <profile value="http://hl7.org.au/fhir/StructureDefinition/vaccine-serial-number"/>
       </type>
-      <max value="1"/>
       <mustSupport value="true"/>
     </element>
     <element id="Immunization.identifier">

diff --git a/input/resources/Profile/dh-list-core-1.xml b/input/resources/Profile/dh-list-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-list-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-list-core-1"/>
-  <version value="0.0.6"/>
+  <version value="0.0.7"/>
   <name value="ADHAListCore"/>
   <title value="ADHA Core List"/>
   <status value="draft"/>
@@ -98,12 +98,12 @@
     </element>
     <element id="List.subject">
       <path value="List.subject"/>
+      <min value="1"/>
       <type>
         <code value="Reference"/>
         <targetProfile
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-patient-core-1"/>
       </type>
-      <min value="1"/>
       <condition value="inv-dh-lst-04"/>
       <constraint>
         <key value="inv-dh-lst-04"/>
@@ -126,6 +126,7 @@
     </element>
     <element id="List.date">
       <path value="List.date"/>
+      <min value="1"/>
       <condition value="inv-dh-lst-06"/>
       <constraint>
         <key value="inv-dh-lst-06"/>
@@ -135,7 +136,6 @@
         <xpath value="f:matches(effectiveDateTime,/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z)/)"/>
         <source value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-list-core-1"/>
       </constraint>
-      <min value="1"/>
       <mustSupport value="true"/>
     </element>
     <element id="List.source">

diff --git a/input/resources/Profile/dh-list-medication-pdl-1.xml b/input/resources/Profile/dh-list-medication-pdl-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-list-medication-pdl-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-list-medication-pdl-1"/>
-  <version value="0.0.2"/>
+  <version value="0.0.3"/>
   <name value="ADHAListPrescriptionDispense"/>
   <title value="ADHA Prescription and or Dispense History List"/>
   <status value="draft" />
@@ -60,11 +60,11 @@
       <path value="List.entry.extension" />
       <sliceName value="changeDescription" />
       <short value="Description of the change to medicine item use" />
+      <max value="1" />
       <type>
         <code value="Extension"/>
         <profile value="http://hl7.org.au/fhir/StructureDefinition/change-description"/>
       </type>
-      <max value="1" />
     </element>
     <element id="List.entry.flag">
       <path value="List.entry.flag" />

diff --git a/input/resources/Profile/dh-list-medication-use-1.xml b/input/resources/Profile/dh-list-medication-use-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-list-medication-use-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-list-medication-use-1"/>
-  <version value="0.0.1"/>
+  <version value="0.0.2"/>
   <name value="ADHAListMedicationUse"/>
   <title value="ADHA Medication Use List"/>
   <status value="draft" />
@@ -43,11 +43,11 @@
       <path value="List.entry.extension" />
       <sliceName value="changeDescription" />
       <short value="Description of the change to medicine item use" />
+      <max value="1" />
       <type>
         <code value="Extension"/>
         <profile value="http://hl7.org.au/fhir/StructureDefinition/change-description"/>
       </type>
-      <max value="1" />
     </element>
     <element id="List.entry.flag">
       <path value="List.entry.flag" />

diff --git a/input/resources/Profile/dh-list-medication-use-pmr-1.xml b/input/resources/Profile/dh-list-medication-use-pmr-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-list-medication-use-pmr-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-list-medication-use-pmr-1"/>
-  <version value="0.0.1"/>
+  <version value="0.0.2"/>
   <name value="ADHAListPractitionerMedicineReview"/>
   <title value="ADHA Practitioner Medicine Review List"/>
   <status value="draft" />
@@ -48,20 +48,20 @@
     <element id="List.extension:sourceRelatedPerson">
       <path value="List.extension"/>
       <sliceName value="sourceRelatedPerson"/>
+      <max value="0" />
       <type>
         <code value="Extension"/>
         <profile value="http://hl7.org.au/fhir/StructureDefinition/author-related-person"/>
       </type>
-      <max value="0" />
     </element>
     <element id="List.extension:packed-in-daa">
       <path value="List.extension"/>
       <sliceName value="packed-in-daa"/>
+      <max value="1" />
       <type>
         <code value="Extension"/>
         <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-packed-in-daa-1"/>
       </type>
-      <max value="1" />
       <mustSupport value="true" />
     </element>
     <element id="List.title">
@@ -74,11 +74,11 @@
     </element>
     <element id="List.source">
       <path value="List.source"/>
+      <min value="1" />
       <type>
         <code value="Reference" />
         <targetProfile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-practitionerrole-author-1" />
       </type>
-      <min value="1" />
     </element>
     <element id="List.entry">
       <path value="List.entry" />

diff --git a/input/resources/Profile/dh-medication-core-1.xml b/input/resources/Profile/dh-medication-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-medication-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medication-core-1"/>
-  <version value="1.0.0"/>
+  <version value="1.0.1"/>
   <name value="ADHAMedicationCore"/>
   <title value="ADHA Core Medication"/>
   <status value="active"/>
@@ -130,7 +130,6 @@
     </element>
     <element id="Medication.ingredient.item[x]">
       <path value="Medication.ingredient.item[x]"/>
-      <mustSupport value="true"/>
       <type>
         <code value="CodeableConcept"/>
       </type>
@@ -142,6 +141,7 @@
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medication-core-1"/>
       </type>
       <condition value="inv-dh-med-02"/>
+      <mustSupport value="true"/>
     </element>
     <element id="Medication.ingredient.isActive">
       <path value="Medication.ingredient.isActive"/>

diff --git a/input/resources/Profile/dh-medicationdispense-core-1.xml b/input/resources/Profile/dh-medicationdispense-core-1.xml
@@ -3,7 +3,7 @@
   <id value="dh-medicationdispense-core-1"/>
   <url
     value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medicationdispense-core-1"/>
-  <version value="0.0.3"/>
+  <version value="0.0.4"/>
   <name value="ADHAMedicationDispenseCore"/>
   <title value="ADHA Core MedicationDispense"/>
   <status value="draft"/>
@@ -141,6 +141,7 @@
     </element>
     <element id="MedicationDispense.performer">
       <path value="MedicationDispense.performer"/>
+      <min value="1"/>
       <constraint>
         <key value="inv-dh-medisp-02"/>
         <severity value="error"/>
@@ -151,7 +152,6 @@
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medicationdispense-core-1"
         />
       </constraint>
-      <min value="1"/>
       <mustSupport value="true"/>
     </element>
     <element id="MedicationDispense.performer.function">