rm MS-Flag (#132)

* rm MS-Flag * update releasenotes * Commit from GitHub Actions (CI (FHIR Validation)) --------- Co-authored-by: f-peverali <[email protected]>
gematik · Jul 3, 2024 · 820c01c · 820c01c
1 parent 7b45e07
commit 820c01c
Show file tree

Hide file tree

Showing 10 changed files with 681 additions and 692 deletions.
diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md
@@ -9,7 +9,9 @@ Version: 2.0.3
 
 Datum: tbd
 
+- Entfernen von MS von MedicationStatement.partOf (Analog in Stufe 4.0.0-rc2) https://github.com/gematik/spec-ISiK-Medikation/pull/132
 - Korrektur des Beispiels: ExampleISiKMedikationsListe.encounter, verweist jetzt korrekt auf einen Abteilungskontakt-Encounter https://github.com/gematik/spec-ISiK-Medikation/pull/128
+
 ----
 Version: 2.0.2
 

diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json
@@ -8,6 +8,15 @@
   },
   "ingredient": [
     {
+      "extension": [
+        {
+          "valueCoding": {
+            "system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
+            "code": "IN"
+          },
+          "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp"
+        }
+      ],
       "strength": {
         "numerator": {
           "system": "http://unitsofmeasure.org",
@@ -22,15 +31,6 @@
           "code": "mL"
         }
       },
-      "extension": [
-        {
-          "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/wirkstofftyp",
-          "valueCoding": {
-            "system": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/CodeSystem/wirkstofftyp",
-            "code": "IN"
-          }
-        }
-      ],
       "itemCodeableConcept": {
         "coding": [
           {

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json
@@ -1,6 +1,16 @@
 {
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikament",
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
+      "valueString": "Clinical.Medications"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
+      "valueCode": "business"
+    }
+  ],
   "url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikament",
   "version": "2.0.2",
   "name": "ISiKMedikament",
@@ -10,6 +20,28 @@
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
+  "mapping": [
+    {
+      "identity": "script10.6",
+      "uri": "http://ncpdp.org/SCRIPT10_6",
+      "name": "Mapping to NCPDP SCRIPT 10.6"
+    },
+    {
+      "identity": "rim",
+      "uri": "http://hl7.org/v3",
+      "name": "RIM Mapping"
+    },
+    {
+      "identity": "w5",
+      "uri": "http://hl7.org/fhir/fivews",
+      "name": "FiveWs Pattern Mapping"
+    },
+    {
+      "identity": "v2",
+      "uri": "http://hl7.org/v2",
+      "name": "HL7 v2 Mapping"
+    }
+  ],
   "kind": "resource",
   "abstract": false,
   "type": "Medication",
@@ -313,23 +345,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]",
-        "path": "Medication.ingredient.item[x]",
-        "slicing": {
-          "discriminator": [
-            {
-              "type": "type",
-              "path": "$this"
-            }
-          ],
-          "ordered": false,
-          "rules": "open"
-        }
-      },
-      {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept",
-        "path": "Medication.ingredient.item[x]",
-        "sliceName": "itemCodeableConcept",
+        "id": "Medication.ingredient.itemCodeableConcept",
+        "path": "Medication.ingredient.itemCodeableConcept",
         "short": "Bestandteil in codierter Form oder ggf. als Freitext",
         "min": 0,
         "max": "1",
@@ -341,8 +358,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding",
-        "path": "Medication.ingredient.item[x].coding",
+        "id": "Medication.ingredient.itemCodeableConcept.coding",
+        "path": "Medication.ingredient.itemCodeableConcept.coding",
         "slicing": {
           "discriminator": [
             {
@@ -355,8 +372,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK",
-        "path": "Medication.ingredient.item[x].coding",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK",
+        "path": "Medication.ingredient.itemCodeableConcept.coding",
         "sliceName": "ASK",
         "min": 0,
         "max": "1",
@@ -366,25 +383,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.system",
-        "path": "Medication.ingredient.item[x].coding.system",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.system",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.code",
-        "path": "Medication.ingredient.item[x].coding.code",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.code",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ASK.display",
-        "path": "Medication.ingredient.item[x].coding.display",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ASK.display",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE",
-        "path": "Medication.ingredient.item[x].coding",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE",
+        "path": "Medication.ingredient.itemCodeableConcept.coding",
         "sliceName": "ATC-DE",
         "min": 0,
         "max": "1",
@@ -394,25 +411,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.system",
-        "path": "Medication.ingredient.item[x].coding.system",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.system",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.code",
-        "path": "Medication.ingredient.item[x].coding.code",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.code",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:ATC-DE.display",
-        "path": "Medication.ingredient.item[x].coding.display",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:ATC-DE.display",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN",
-        "path": "Medication.ingredient.item[x].coding",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN",
+        "path": "Medication.ingredient.itemCodeableConcept.coding",
         "sliceName": "PZN",
         "min": 0,
         "max": "1",
@@ -422,25 +439,25 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.system",
-        "path": "Medication.ingredient.item[x].coding.system",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.system",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.code",
-        "path": "Medication.ingredient.item[x].coding.code",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.code",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:PZN.display",
-        "path": "Medication.ingredient.item[x].coding.display",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:PZN.display",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14",
-        "path": "Medication.ingredient.item[x].coding",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14",
+        "path": "Medication.ingredient.itemCodeableConcept.coding",
         "sliceName": "WG14",
         "min": 0,
         "max": "1",
@@ -450,31 +467,30 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.system",
-        "path": "Medication.ingredient.item[x].coding.system",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.system",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.system",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.code",
-        "path": "Medication.ingredient.item[x].coding.code",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.code",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.code",
         "min": 1,
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14.display",
-        "path": "Medication.ingredient.item[x].coding.display",
+        "id": "Medication.ingredient.itemCodeableConcept.coding:WG14.display",
+        "path": "Medication.ingredient.itemCodeableConcept.coding.display",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemCodeableConcept.text",
-        "path": "Medication.ingredient.item[x].text",
+        "id": "Medication.ingredient.itemCodeableConcept.text",
+        "path": "Medication.ingredient.itemCodeableConcept.text",
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemReference",
-        "path": "Medication.ingredient.item[x]",
-        "sliceName": "itemReference",
+        "id": "Medication.ingredient.itemReference",
+        "path": "Medication.ingredient.itemReference",
         "short": "Bestandteil (Referenz auf ein anderes Medikament)",
         "min": 0,
         "max": "1",
@@ -490,8 +506,8 @@
         "mustSupport": true
       },
       {
-        "id": "Medication.ingredient.item[x]:itemReference.reference",
-        "path": "Medication.ingredient.item[x].reference",
+        "id": "Medication.ingredient.itemReference.reference",
+        "path": "Medication.ingredient.itemReference.reference",
         "min": 1,
         "mustSupport": true
       },

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json
@@ -1,6 +1,16 @@
 {
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransaction",
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
+      "valueString": "Foundation.Other"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
+      "valueCode": "not-classified"
+    }
+  ],
   "url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationTransaction",
   "version": "2.0.2",
   "name": "ISiKMedikationTransaction",
@@ -10,6 +20,28 @@
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",
+  "mapping": [
+    {
+      "identity": "v2",
+      "uri": "http://hl7.org/v2",
+      "name": "HL7 v2 Mapping"
+    },
+    {
+      "identity": "rim",
+      "uri": "http://hl7.org/v3",
+      "name": "RIM Mapping"
+    },
+    {
+      "identity": "cda",
+      "uri": "http://hl7.org/v3/cda",
+      "name": "CDA (R2)"
+    },
+    {
+      "identity": "w5",
+      "uri": "http://hl7.org/fhir/fivews",
+      "name": "FiveWs Pattern Mapping"
+    }
+  ],
   "kind": "resource",
   "abstract": false,
   "type": "Bundle",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json
@@ -1,6 +1,16 @@
 {
   "resourceType": "StructureDefinition",
   "id": "ISiKMedikationTransactionResponse",
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
+      "valueString": "Foundation.Other"
+    },
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
+      "valueCode": "not-classified"
+    }
+  ],
   "url": "https://gematik.de/fhir/isik/v2/Medikation/StructureDefinition/ISiKMedikationTransactionResponse",
   "version": "2.0.2",
   "name": "ISiKMedikationTransactionResponse",
@@ -10,6 +20,28 @@
   "publisher": "gematik GmbH",
   "description": "Dieses Profil definiert die Server-Antwort auf Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.",
   "fhirVersion": "4.0.1",
+  "mapping": [
+    {
+      "identity": "v2",
+      "uri": "http://hl7.org/v2",
+      "name": "HL7 v2 Mapping"
+    },
+    {
+      "identity": "rim",
+      "uri": "http://hl7.org/v3",
+      "name": "RIM Mapping"
+    },
+    {
+      "identity": "cda",
+      "uri": "http://hl7.org/v3/cda",
+      "name": "CDA (R2)"
+    },
+    {
+      "identity": "w5",
+      "uri": "http://hl7.org/fhir/fivews",
+      "name": "FiveWs Pattern Mapping"
+    }
+  ],
   "kind": "resource",
   "abstract": false,
   "type": "Bundle",