From 023d3bd99c87215dc4fe85bf03f0faed67ac1cf2 Mon Sep 17 00:00:00 2001
From: "DIGITALHEALTH\\Samuel.Turner" <samuel.turner@digitalhealth.gov.au>
Date: Thu, 14 Mar 2024 16:23:02 +1000
Subject: [PATCH 1/2] Derive organisation profile from HL7 AU core instead of
 AU base.

---
 input/dh-ig-1.xml                             |  2 +-
 .../Profile/dh-organization-core-1.xml        | 68 +------------------
 2 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/input/dh-ig-1.xml b/input/dh-ig-1.xml
index 186b4952d..3b3e4dab9 100644
--- a/input/dh-ig-1.xml
+++ b/input/dh-ig-1.xml
@@ -24,7 +24,7 @@
         </coding>
     </jurisdiction>
     <copyright
-        value="Copyright © 2023 Australian Digital Health Agency - All rights reserved. This content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/."/>
+        value="Copyright © 2024 Australian Digital Health Agency - All rights reserved. This content is licensed under a Creative Commons Attribution 4.0 International License. See https://creativecommons.org/licenses/by/4.0/."/>
     <packageId value="au.digitalhealth.r4"/>
     <license value="Apache-2.0"/>
     <fhirVersion value="4.0.1"/>
diff --git a/input/resources/Profile/dh-organization-core-1.xml b/input/resources/Profile/dh-organization-core-1.xml
index e6a555a71..67bcd42ea 100644
--- a/input/resources/Profile/dh-organization-core-1.xml
+++ b/input/resources/Profile/dh-organization-core-1.xml
@@ -22,7 +22,7 @@
   <kind value="resource"/>
   <abstract value="false"/>
   <type value="Organization"/>
-  <baseDefinition value="http://hl7.org.au/fhir/StructureDefinition/au-organization"/>
+  <baseDefinition value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-organization"/>
   <derivation value="constraint"/>
   <differential>
     <element id="Organization">
@@ -40,50 +40,6 @@
         />
       </constraint>
     </element>
-    <element id="Organization.identifier">
-      <path value="Organization.identifier"/>
-      <slicing>
-        <discriminator>
-          <type value="pattern"/>
-          <path value="system"/>
-        </discriminator>
-        <ordered value="false"/>
-        <rules value="open"/>
-      </slicing>
-      <definition
-        value="Identifier for the organization that is used to identify the organization across multiple disparate systems."/>
-      <condition value="inv-dh-org-02"/>
-      <constraint>
-        <key value="inv-dh-org-02"/>
-        <severity value="error"/>
-        <human value="A National Organisation Identifier (type=NOI) shall be an HPI-O or PAI-O"/>
-        <expression
-          value="where(type.coding.code = 'NOI').exists() implies (system='http://ns.electronichealth.net.au/id/hi/hpio/1.0') or (system='http://ns.electronichealth.net.au/id/pcehr/paio/1.0')"/>
-        <source
-          value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-organization-core-1"
-        />
-      </constraint>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.identifier:hpio">
-      <path value="Organization.identifier"/>
-      <sliceName value="hpio"/>
-      <max value="1"/>
-      <type>
-        <code value="Identifier"/>
-        <profile value="http://hl7.org.au/fhir/StructureDefinition/au-hpio"/>
-      </type>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.identifier:abn">
-      <path value="Organization.identifier"/>
-      <sliceName value="abn"/>
-      <type>
-        <code value="Identifier"/>
-        <profile value="http://hl7.org.au/fhir/StructureDefinition/au-australianbusinessnumber"/>
-      </type>
-      <mustSupport value="true"/>
-    </element>
     <element id="Organization.identifier:paio">
       <path value="Organization.identifier"/>
       <sliceName value="paio"/>
@@ -98,28 +54,6 @@
       <path value="Organization.active"/>
       <fixedBoolean value="true"/>
     </element>
-    <element id="Organization.type">
-      <path value="Organization.type"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.name">
-      <path value="Organization.name"/>
-      <min value="1"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.alias">
-      <path value="Organization.alias"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.telecom">
-      <path value="Organization.telecom"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="Organization.address">
-      <path value="Organization.address"/>
-      <definition value="An address for the organization."/>
-      <mustSupport value="true"/>
-    </element>
     <element id="Organization.partOf">
       <path value="Organization.partOf"/>
       <type>

From d0e740f774615f56c6fe850d7db7b27d4708b745 Mon Sep 17 00:00:00 2001
From: "DIGITALHEALTH\\Samuel.Turner" <samuel.turner@digitalhealth.gov.au>
Date: Fri, 22 Mar 2024 11:21:56 +1000
Subject: [PATCH 2/2] Change in versioning as per feedback 1.0.1 to 1.0.2

---
 input/resources/Profile/dh-organization-core-1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/input/resources/Profile/dh-organization-core-1.xml b/input/resources/Profile/dh-organization-core-1.xml
index 67bcd42ea..d36e85aec 100644
--- a/input/resources/Profile/dh-organization-core-1.xml
+++ b/input/resources/Profile/dh-organization-core-1.xml
@@ -2,7 +2,7 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="dh-organization-core-1"/>
   <url value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-organization-core-1"/>
-  <version value="1.0.1"/>
+  <version value="1.0.2"/>
   <name value="ADHAOrganizationCore"/>
   <title value="ADHA Core Organization"/>
   <status value="active"/>