Merge pull request #77 from medizininformatik-initiative/dev/v2024

Updated and fixed several errors in search params
medizininformatik-initiative · Jun 28, 2024 · ffb36e3 · ffb36e3
2 parents 34c5000 + 65a7ecc
commit ffb36e3
Show file tree

Hide file tree

Showing 31 changed files with 437 additions and 1,036 deletions.
diff --git a/fsh-generated/resources/CapabilityStatement-mii-cps-medikation-capabilitystatement-2x.json b/fsh-generated/resources/CapabilityStatement-mii-cps-medikation-capabilitystatement-2x.json
diff --git a/...ion-medicationstatement-dosequantity.json → ...ii-sp-medikation-dosage-dosequantity.json b/...ion-medicationstatement-dosequantity.json → ...ii-sp-medikation-dosage-dosequantity.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-dosequantity",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseQuantity",
+  "id": "mii-sp-medikation-dosage-dosequantity",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseQuantity",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,19 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_DoseQuantity",
+  "name": "MII_SP_Medikation_Dosage_DoseQuantity",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseQuantity",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseQuantity | MedicationRequest.dosageInstruction.doseAndRate.doseQuantity | MedicationAdministration.dosage.dose",
   "code": "dose-quantity",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest",
+    "MedicationAdministration"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Quantity)",
+  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Quantity) | MedicationRequest.dosageInstruction.doseAndRate.dose.ofType(Quantity) | MedicationAdministration.dosage.dose",
   "comparator": [
     "eq",
     "gt",

diff --git a/...n-medicationstatement-doserange-high.json → ...-sp-medikation-dosage-doserange-high.json b/...n-medicationstatement-doserange-high.json → ...-sp-medikation-dosage-doserange-high.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-doserange-high",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseRangeHigh",
+  "id": "mii-sp-medikation-dosage-doserange-high",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseRangeHigh",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,18 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_DoseRangeHigh",
+  "name": "MII_SP_Medikation_Dosage_DoseRangeHigh",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange.high",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange.high | MedicationRequest.dosageInstruction.doseAndRate.doseRange.high",
   "code": "doserange-high",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range).high",
+  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range).high | MedicationRequest.dosageInstruction.doseAndRate.dose.ofType(Range).high",
   "comparator": [
     "eq",
     "gt",

diff --git a/...on-medicationstatement-doserange-low.json → ...i-sp-medikation-dosage-doserange-low.json b/...on-medicationstatement-doserange-low.json → ...i-sp-medikation-dosage-doserange-low.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-doserange-low",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseRangeLow",
+  "id": "mii-sp-medikation-dosage-doserange-low",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseRangeLow",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,18 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_DoseRangeLow",
+  "name": "MII_SP_Medikation_Dosage_DoseRangeLow",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange.low",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange.low | MedicationRequest.dosageInstruction.doseAndRate.doseRange.low",
   "code": "doserange-low",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range).low",
+  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range).low | MedicationRequest.dosageInstruction.doseAndRate.dose.ofType(Range).low",
   "comparator": [
     "eq",
     "gt",

diff --git a/...kation-medicationstatement-doserange.json → ...r-mii-sp-medikation-dosage-doserange.json b/...kation-medicationstatement-doserange.json → ...r-mii-sp-medikation-dosage-doserange.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-doserange",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseRange",
+  "id": "mii-sp-medikation-dosage-doserange",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseRange",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,24 +14,25 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_DoseRange",
+  "name": "MII_SP_Medikation_Dosage_DoseRange",
   "status": "active",
   "experimental": false,
-  "date": "2022-09-22",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.doseRange | MedicationRequest.dosageInstruction.doseAndRate.doseRange",
   "code": "doserange",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "composite",
-  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range)",
+  "expression": "MedicationStatement.dosage.doseAndRate.dose.ofType(Range) | MedicationRequest.dosageInstruction.doseAndRate.dose.ofType(Range)",
   "component": [
     {
-      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseRangeLow",
+      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseRangeLow",
       "expression": "low"
     },
     {
-      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-DoseRangeHigh",
+      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-DoseRangeHigh",
       "expression": "high"
     }
   ]

diff --git a/...ion-medicationstatement-ratequantity.json → ...ii-sp-medikation-dosage-ratequantity.json b/...ion-medicationstatement-ratequantity.json → ...ii-sp-medikation-dosage-ratequantity.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-ratequantity",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateQuantity",
+  "id": "mii-sp-medikation-dosage-ratequantity",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateQuantity",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,19 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_RateQuantity",
+  "name": "MII_SP_Medikation_Dosage_RateQuantity",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateQuantity",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateQuantity | MedicationAdministration.dosage.rateQuantity | MedicationRequest.dosageInstruction.doseAndRate.rateQuantity",
   "code": "ratequantity",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationAdministration",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Quantity)",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Quantity) | MedicationAdministration.dosage.rate.ofType(Quantity) | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Quantity)",
   "comparator": [
     "eq",
     "gt",

diff --git a/...n-medicationstatement-raterange-high.json → ...-sp-medikation-dosage-raterange-high.json b/...n-medicationstatement-raterange-high.json → ...-sp-medikation-dosage-raterange-high.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-raterange-high",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRangeHigh",
+  "id": "mii-sp-medikation-dosage-raterange-high",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRangeHigh",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,18 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_RateRangeHigh",
+  "name": "MII_SP_Medikation_Dosage_RateRangeHigh",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange.high",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange.high | MedicationRequest.dosageInstruction.doseAndRate.rateRange.high",
   "code": "raterange-high",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range).high",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range).high | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Range).high",
   "comparator": [
     "eq",
     "gt",

diff --git a/...on-medicationstatement-raterange-low.json → ...i-sp-medikation-dosage-raterange-low.json b/...on-medicationstatement-raterange-low.json → ...i-sp-medikation-dosage-raterange-low.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-raterange-low",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRangeLow",
+  "id": "mii-sp-medikation-dosage-raterange-low",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRangeLow",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,18 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_RateRangeLow",
+  "name": "MII_SP_Medikation_Dosage_RateRangeLow",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange.low",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange.low | MedicationRequest.dosageInstruction.doseAndRate.rateRange.low",
   "code": "raterange-low",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range).low",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range).low | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Range).low",
   "comparator": [
     "eq",
     "gt",

diff --git a/...kation-medicationstatement-raterange.json → ...r-mii-sp-medikation-dosage-raterange.json b/...kation-medicationstatement-raterange.json → ...r-mii-sp-medikation-dosage-raterange.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-raterange",
+  "id": "mii-sp-medikation-dosage-raterange",
   "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRange",
   "publisher": "Medizininformatik Initiative",
   "contact": [
@@ -14,24 +14,25 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_RateRange",
+  "name": "MII_SP_Medikation_Dosage_RateRange",
   "status": "active",
   "experimental": false,
-  "date": "2022-09-22",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange",
+  "date": "2024-06-28",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRange | MedicationRequest.dosageInstruction.doseAndRate.rateRange",
   "code": "raterange",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationRequest"
   ],
   "type": "composite",
-  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range)",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Range) | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Range)",
   "component": [
     {
-      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRangeLow",
+      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRangeLow",
       "expression": "low"
     },
     {
-      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRangeHigh",
+      "definition": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRangeHigh",
       "expression": "high"
     }
   ]

diff --git a/fsh-generated/resources/SearchParameter-mii-sp-medikation-dosage-rateratio-denominator.json b/fsh-generated/resources/SearchParameter-mii-sp-medikation-dosage-rateratio-denominator.json
@@ -0,0 +1,37 @@
+{
+  "resourceType": "SearchParameter",
+  "id": "mii-sp-medikation-dosage-rateratio-denominator",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRatioDenominator",
+  "publisher": "Medizininformatik Initiative",
+  "contact": [
+    {
+      "telecom": [
+        {
+          "system": "url",
+          "value": "https://www.medizininformatik-initiative.de"
+        }
+      ]
+    }
+  ],
+  "version": "2024.0.0",
+  "name": "MII_SP_Medikation_Dosage_RateRatioDenominator",
+  "status": "active",
+  "experimental": false,
+  "date": "2024-06-27",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRatio.denominator | MedicationAdministration.dosage.rate.ofType(Ratio).denominator | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Ratio).denominator",
+  "code": "rateratio-denominator",
+  "base": [
+    "MedicationStatement",
+    "MedicationAdministration",
+    "MedicationRequest"
+  ],
+  "type": "quantity",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Ratio).denominator | MedicationAdministration.dosage.rate.ofType(Ratio).denominator | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Ratio).denominator",
+  "comparator": [
+    "eq",
+    "gt",
+    "lt",
+    "ge",
+    "le"
+  ]
+}
diff --git a/...icationstatement-rateratio-numerator.json → ...edikation-dosage-rateratio-numerator.json b/...icationstatement-rateratio-numerator.json → ...edikation-dosage-rateratio-numerator.json
@@ -1,7 +1,7 @@
 {
   "resourceType": "SearchParameter",
-  "id": "mii-sp-medikation-medicationstatement-rateratio-numerator",
-  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/MedicationStatement-RateRatioNumerator",
+  "id": "mii-sp-medikation-dosage-rateratio-numerator",
+  "url": "https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/SearchParameter/Dosage-RateRatioNumerator",
   "publisher": "Medizininformatik Initiative",
   "contact": [
     {
@@ -14,17 +14,19 @@
     }
   ],
   "version": "2024.0.0",
-  "name": "MII_SP_Medikation_MedicationStatement_RateRatioNumerator",
+  "name": "MII_SP_Medikation_Dosage_RateRatioNumerator",
   "status": "active",
   "experimental": false,
-  "date": "2022-06-28",
-  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRatio.numerator",
+  "date": "2024-06-27",
+  "description": "Suchparameter für MedicationStatement.dosage.doseAndRate.rateRatio.numerator | MedicationAdministration.dosage.rate.ofType(Ratio).numerator | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Ratio).numerator",
   "code": "rateratio-numerator",
   "base": [
-    "MedicationStatement"
+    "MedicationStatement",
+    "MedicationAdministration",
+    "MedicationRequest"
   ],
   "type": "quantity",
-  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Ratio).numerator",
+  "expression": "MedicationStatement.dosage.doseAndRate.rate.ofType(Ratio).numerator | MedicationAdministration.dosage.rate.ofType(Ratio).numerator | MedicationRequest.dosageInstruction.doseAndRate.rate.ofType(Ratio).numerator",
   "comparator": [
     "eq",
     "gt",