From 99f7f49a018538abb69fa3101991b36810ab49fe Mon Sep 17 00:00:00 2001
From: "DIGITALHEALTH\\charlie.chen" <charlie.chen@digitalhealth.gov.au>
Date: Mon, 15 Apr 2024 15:37:23 +1000
Subject: [PATCH 1/3] CIFMM-4157 Derive ADHA core MedicationRequest from AU
 core - references changed to au core resources where appropriate as per group
 discussion

---
 .../Profile/dh-medicationrequest-core-1.xml   | 111 ++----------------
 1 file changed, 7 insertions(+), 104 deletions(-)

diff --git a/input/resources/Profile/dh-medicationrequest-core-1.xml b/input/resources/Profile/dh-medicationrequest-core-1.xml
index 81f85aad8..e300e5b29 100644
--- a/input/resources/Profile/dh-medicationrequest-core-1.xml
+++ b/input/resources/Profile/dh-medicationrequest-core-1.xml
@@ -23,32 +23,13 @@
   <kind value="resource"/>
   <abstract value="false"/>
   <type value="MedicationRequest"/>
-  <baseDefinition value="http://hl7.org.au/fhir/StructureDefinition/au-medicationrequest"/>
+  <baseDefinition value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-medicationrequest"/>
   <derivation value="constraint"/>
   <differential>
     <element id="MedicationRequest">
       <path value="MedicationRequest"/>
     </element>
-    <element id="MedicationRequest.identifier">
-      <path value="MedicationRequest.identifier"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.status">
-      <path value="MedicationRequest.status"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.intent">
-      <path value="MedicationRequest.intent"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.category">
-      <path value="MedicationRequest.category"/>
-      <mustSupport value="true"/>
-      <binding>
-        <strength value="extensible"/>
-        <valueSet value="http://hl7.org/fhir/ValueSet/medicationrequest-category"/>
-      </binding>
-    </element>
+    
     <element id="MedicationRequest.medication[x]">
       <path value="MedicationRequest.medication[x]"/>
       <slicing>
@@ -60,39 +41,12 @@
       </slicing>
       <mustSupport value="true"/>
     </element>
-    <element id="MedicationRequest.medication[x]:medicationCodeableConcept">
-      <path value="MedicationRequest.medication[x]"/>
-      <sliceName value="medicationCodeableConcept"/>
-      <type>
-        <code value="CodeableConcept"/>
-      </type>
-    </element>
-    <element id="MedicationRequest.medication[x]:medicationCodeableConcept.coding">
-      <path value="MedicationRequest.medication[x].coding"/>
-      <slicing>
-        <discriminator>
-          <type value="value"/>
-          <path value="system"/>
-        </discriminator>
-        <rules value="open"/>
-      </slicing>
-    </element>
-    <element id="MedicationRequest.medication[x]:medicationCodeableConcept.coding:pbs">
-      <path value="MedicationRequest.medication[x].coding"/>
-      <sliceName value="pbs"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.medication[x]:medicationCodeableConcept.coding:amt">
-      <path value="MedicationRequest.medication[x].coding"/>
-      <sliceName value="amt"/>
-      <mustSupport value="true"/>
-    </element>
     <element id="MedicationRequest.medication[x]:medicationReference">
       <path value="MedicationRequest.medication[x]"/>
       <sliceName value="medicationReference"/>
       <type>
         <code value="Reference"/>
-        <targetProfile value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medication-core-1"/>
+        <targetProfile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-medication"/>
       </type>
     </element>
     <element id="MedicationRequest.subject">
@@ -100,7 +54,7 @@
       <type>
         <code value="Reference"/>
         <targetProfile
-          value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-patient-core-1"/>
+          value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient"/>
       </type>
       <condition value="inv-dh-medreq-01"/>
       <constraint>
@@ -118,24 +72,10 @@
       <type>
         <code value="Reference"/>
         <targetProfile
-          value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-encounter-core-1"/>
+          value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-encounter"/>
       </type>
       <mustSupport value="true"/>
     </element>
-    <element id="MedicationRequest.authoredOn">
-      <path value="MedicationRequest.authoredOn"/>
-      <min value="1"/>
-      <condition value="inv-dh-medreq-03"/>
-      <constraint>
-        <key value="inv-dh-medreq-03"/>
-        <severity value="error"/>
-        <human value="Date shall be at least to day"/>
-        <expression value="toString().length() &gt;= 10"/>
-        <xpath value="f:effectiveDateTime[matches(@value, '^\d{4}-\d{2}-\d{2}')]"/>
-        <source value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-medicationrequest-core-1"/>
-      </constraint>
-      <mustSupport value="true"/>
-    </element>
     <element id="MedicationRequest.requester">
       <path value="MedicationRequest.requester"/>
       <min value="1"/>
@@ -144,9 +84,9 @@
         <targetProfile
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-practitionerrole-author-1"/>
         <targetProfile
-          value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-organization-core-1"/>
+          value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-organization"/>
         <targetProfile
-          value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-patient-core-1"/>
+          value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-patient"/>
         <targetProfile
           value="http://ns.electronichealth.net.au/fhir/StructureDefinition/dh-relatedperson-author-1"
         />
@@ -161,42 +101,5 @@
       </constraint>
       <mustSupport value="true"/>
     </element>
-    <element id="MedicationRequest.reasonCode">
-      <path value="MedicationRequest.reasonCode"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.note">
-      <path value="MedicationRequest.note"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.dosageInstruction">
-      <path value="MedicationRequest.dosageInstruction"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.dispenseRequest">
-      <path value="MedicationRequest.dispenseRequest"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.dispenseRequest.validityPeriod">
-      <path value="MedicationRequest.dispenseRequest.validityPeriod"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.dispenseRequest.numberOfRepeatsAllowed">
-      <path value="MedicationRequest.dispenseRequest.numberOfRepeatsAllowed"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.dispenseRequest.quantity">
-      <path value="MedicationRequest.dispenseRequest.quantity"/>
-      <mustSupport value="true"/>
-    </element>
-    
-    <element id="MedicationRequest.substitution">
-      <path value="MedicationRequest.substitution"/>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.substitution.allowed[x]">
-      <path value="MedicationRequest.substitution.allowed[x]"/>
-      <mustSupport value="true"/>
-    </element>
   </differential>
 </StructureDefinition>

From 11584586afa0b9e6d00a42a26e4370ee39e365ee Mon Sep 17 00:00:00 2001
From: "DIGITALHEALTH\\charlie.chen" <charlie.chen@digitalhealth.gov.au>
Date: Wed, 17 Apr 2024 14:52:08 +1000
Subject: [PATCH 2/3] CIFMM-4157 remove duplicated information in intro

---
 .../StructureDefinition-dh-medicationrequest-core-1-intro.md  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/input/intro-notes/StructureDefinition-dh-medicationrequest-core-1-intro.md b/input/intro-notes/StructureDefinition-dh-medicationrequest-core-1-intro.md
index a3365ec93..24cadc69a 100644
--- a/input/intro-notes/StructureDefinition-dh-medicationrequest-core-1-intro.md
+++ b/input/intro-notes/StructureDefinition-dh-medicationrequest-core-1-intro.md
@@ -2,10 +2,6 @@ This profile identifies the additional constraints, extensions, and value sets t
 
 Where a more specific MedicationRequest profile is applicable, e.g. prescription, an implementation **SHALL** ensure the resource conforms to that specific profile.
 
-This profile is designed to set a core MedicationRequest standard for:
-* Query medication orders or prescriptions for a patient (current and historical)
-* Record or update medication orders or prescriptions for a patient
-
 This profile may be referred to by APIs, which will be listed here when available.
 
 

From e6ba486560e81f71edf1fc7643a7accc4143d1e4 Mon Sep 17 00:00:00 2001
From: "DIGITALHEALTH\\charlie.chen" <charlie.chen@digitalhealth.gov.au>
Date: Wed, 17 Apr 2024 16:26:03 +1000
Subject: [PATCH 3/3] CIFMM-4157 removing medicationReference element and
 slicing as reviewed by Uday

---
 .../Profile/dh-medicationrequest-core-1.xml   | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/input/resources/Profile/dh-medicationrequest-core-1.xml b/input/resources/Profile/dh-medicationrequest-core-1.xml
index e300e5b29..e3e17901c 100644
--- a/input/resources/Profile/dh-medicationrequest-core-1.xml
+++ b/input/resources/Profile/dh-medicationrequest-core-1.xml
@@ -29,26 +29,6 @@
     <element id="MedicationRequest">
       <path value="MedicationRequest"/>
     </element>
-    
-    <element id="MedicationRequest.medication[x]">
-      <path value="MedicationRequest.medication[x]"/>
-      <slicing>
-        <discriminator>
-          <type value="type"/>
-          <path value="$this"/>
-        </discriminator>
-        <rules value="closed"/>
-      </slicing>
-      <mustSupport value="true"/>
-    </element>
-    <element id="MedicationRequest.medication[x]:medicationReference">
-      <path value="MedicationRequest.medication[x]"/>
-      <sliceName value="medicationReference"/>
-      <type>
-        <code value="Reference"/>
-        <targetProfile value="http://hl7.org.au/fhir/core/StructureDefinition/au-core-medication"/>
-      </type>
-    </element>
     <element id="MedicationRequest.subject">
       <path value="MedicationRequest.subject"/>
       <type>