Merge pull request #49 from klsophie/proposed-changes-for-digipod

Proposed changes for digipod
CEOsys · Nov 28, 2024 · b0b4b0a · b0b4b0a
2 parents f589c05 + 1786f44
commit b0b4b0a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/input/fsh/examples/covid-dexamethason/recommendations/recommendation_05_intervention.fsh b/input/fsh/examples/covid-dexamethason/recommendations/recommendation_05_intervention.fsh
@@ -167,4 +167,9 @@ Description: "No Application of Dexamethasone"
 * productCodeableConcept
   * coding[atcde] = $atcde#C05AA09 "Dexamethason"
   * coding[sct] = $sct#372584003 "Dexamethasone (substance)"
+* dosage
+  * route = $sct#26643006 "Oral route"
+  * doseAndRate
+    * doseQuantity = 6 'mg' "mg"
+    * rateQuantity = 1 '/d' "/d"
 * doNotPerform = true
diff --git a/input/fsh/intervention/actions/p-drug-administration-action.fsh b/input/fsh/intervention/actions/p-drug-administration-action.fsh
@@ -25,11 +25,11 @@ Description: "Definition of a drug administration action as part of a recommende
   * insert code-system-pattern(atc, $atc)
   * insert code-system-pattern(rxnorm, $rxnorm)
   * insert code-system-pattern(atcde, $atcde)
-* dosage 0..*
+* dosage 1..*
   * extension contains DosageCondition named condition 0..1 MS
   * route MS
   * route from $vs-route-codes (required)
-  * timing 1..1
+  * timing 0..1
   * doseAndRate 1..*
 * quantity 0..0 // we don't use quantity, instead use dosage
 * timing[x] 0..0 // we don't use timing, instead use dosage.timing
@@ -46,6 +46,7 @@ Description: "A drug administration that should be performed."
 * experimental = true
 * publisher = "CPGonEBMonFHIR"
 * description = "A drug administration that should be performed."
+* kind = $cs-fhir-types#MedicationRequest "MedicationRequest"
 * productCodeableConcept
   * coding[atcde] = $atcde#C05AA09 "Dexamethason"
   * coding[sct] = $sct#372584003 "Dexamethasone (substance)"
@@ -82,4 +83,17 @@ Description: "A drug administration that should not be performed."
 * productCodeableConcept
   * coding[atcde] = $atcde#C05AA09 "Dexamethason"
   * coding[sct] = $sct#372584003 "Dexamethasone (substance)"
+* dosage
+  * route = $sct#26643006 "Oral route"
+  * timing
+    * repeat
+      * count = 10
+      * duration = 10
+      * durationUnit = $ucum#d "d"
+      * frequency = 1
+      * period = 1
+      * periodUnit = $ucum#d "d"
+  * doseAndRate
+    * doseQuantity = 6 'mg' "mg"
+    * rateQuantity = 1 '/d' "/d"
 * doNotPerform = true
diff --git a/input/fsh/intervention/actions/p-recommendation-action.fsh b/input/fsh/intervention/actions/p-recommendation-action.fsh
@@ -30,7 +30,6 @@ Description: "Definition of an activity that is part of an intervention in the c
 * timingTiming
   * insert timing-restrictions
   * extension contains RelativeTime named relativeTime 0..*
-* timingTiming.repeat 1..1 MS
 * product[x] MS
 * quantity MS
 * dosage MS