Corrected core profile references

#127
#9

Author: dtr-agency

resources/dh-bundle-core-1.xml

@@ -92,6 +92,17 @@
         <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-diagnosticreport-core-1" />
       </type>
     </element>
+    <element id="Bundle.entry:documentreference">
+      <path value="Bundle.entry" />
+      <sliceName value="documentreference" />
+    </element>
+    <element id="Bundle.entry.resource:documentreference">
+      <path value="Bundle.entry.resource" />
+      <type>
+        <code value="DocumentReference" />
+        <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-documentreference-core-1" />
+      </type>
+    </element>
     <element id="Bundle.entry:encounter">
       <path value="Bundle.entry" />
       <sliceName value="encounter" />
@@ -103,6 +114,17 @@
         <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-encounter-core-1" />
       </type>
     </element>
+    <element id="Bundle.entry:flag">
+      <path value="Bundle.entry" />
+      <sliceName value="flag" />
+    </element>
+    <element id="Bundle.entry.resource:flag">
+      <path value="Bundle.entry.resource" />
+      <type>
+        <code value="Flag" />
+        <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-flag-core-1" />
+      </type>
+    </element>
     <element id="Bundle.entry:healthcareservice">
       <path value="Bundle.entry" />
       <sliceName value="healthcareservice" />
@@ -279,5 +301,38 @@
         <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-relatedperson-core-1" />
       </type>
     </element>
+    <element id="Bundle.entry:servicerequest">
+      <path value="Bundle.entry" />
+      <sliceName value="servicerequest" />
+    </element>
+    <element id="Bundle.entry.resource:servicerequest">
+      <path value="Bundle.entry.resource" />
+      <type>
+        <code value="ServiceRequest" />
+        <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-servicerequest-core-1" />
+      </type>
+    </element>
+    <element id="Bundle.entry:specimen">
+      <path value="Bundle.entry" />
+      <sliceName value="specimen" />
+    </element>
+    <element id="Bundle.entry.resource:specimen">
+      <path value="Bundle.entry.resource" />
+      <type>
+        <code value="Specimen" />
+        <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-specimen-core-1" />
+      </type>
+    </element>
+    <element id="Bundle.entry:substance">
+      <path value="Bundle.entry" />
+      <sliceName value="substance" />
+    </element>
+    <element id="Bundle.entry.resource:substance">
+      <path value="Bundle.entry.resource" />
+      <type>
+        <code value="Substance" />
+        <profile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-substance-core-1" />
+      </type>
+    </element>
   </differential>
 </StructureDefinition>

resources/dh-explanationofbenefit-medicare-1.xml

@@ -137,7 +137,7 @@
       <path value="ExplanationOfBenefit.referral"/>
       <type>
         <code value="Reference"/>
-        <targetProfile value="http://hl7.org.au/fhir/StructureDefinition/dh-servicerequest-core-1"/>
+        <targetProfile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-servicerequest-core-1"/>
       </type>
       <mustSupport value="true"/>
     </element>

resources/dh-flag-core-1.xml

@@ -3,8 +3,8 @@
   <id value="dh-flag-core-1" />
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-flag-core-1" />
   <version value="0.0.1" />
-  <name value="FlagAIR" />
-  <title value="Australian Immunisation Register Notice" />
+  <name value="DHFlagCore" />
+  <title value="ADHA Core Flag" />
   <status value="draft" />
   <experimental value="false" />
   <publisher value="Australian Digital Health Agency" />

resources/dh-medicationstatement-core-1.xml

@@ -42,6 +42,12 @@
     </element>
     <element id="MedicationStatement.basedOn">
       <path value="MedicationStatement.basedOn"/>
+      <type>
+        <code value="Reference"/>
+        <targetProfile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medicationrequest-core-1" />
+        <targetProfile value="http://hl7.org/fhir/StructureDefinition/CarePlan" />
+        <targetProfile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-servicerequest-core-1"/>
+      </type>
       <mustSupport value="true"/>
     </element>
     <element id="MedicationStatement.status">

resources/dh-observation-ncspp-1.xml

@@ -27,8 +27,7 @@
   <kind value="resource"/>
   <abstract value="false"/>
   <type value="Observation"/>
-  <baseDefinition
-    value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-observation-programparticipation-1"/>
+  <baseDefinition value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-observation-programparticipation-1"/>
   <derivation value="constraint"/>
   <differential>
     <element id="Observation">