fix: relative time

umg-minai · Aug 12, 2024 · 15c2d84 · 15c2d84
1 parent 751f3ee
commit 15c2d84
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 34 deletions.
diff --git a/input/fsh/QI7-Ernaehrung/QI7_intervention.fsh b/input/fsh/QI7-Ernaehrung/QI7_intervention.fsh
@@ -24,7 +24,7 @@ Description: "All Intensive Care Patients for which a sufficient oral nutrition
 
 // Recommended Action
 Instance: FirstEnteralFeedingWithin24hours
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "First Enteral Feeding Within 24 hours"
 Description: "First Enteral Feeding occurs within 24 hours after Admission to Intensive Care."
@@ -33,15 +33,13 @@ Description: "First Enteral Feeding occurs within 24 hours after Admission to In
 * insert publisher-experimental-version(7.0)
 * status = #active
 * code = $sct#229912004 "Enteral Feeding"
-* timingTiming
-  * repeat
-    * frequency = 1
-    * period = 1
-    * periodUnit = $ucum#d "day" // TODO: innerhalb von 24h nach Aufnahme ! -> extension (relative time) ?
-/*     * timeFromEvent
-      * eventCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
-      * range 
-        * high = 24 'hours' "hours" */
+* kind = $cs-fhir-types#NutritionOrder "NutritionOrder"
+* extension[relativeTime]
+  * extension[contextCode].valueCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
+  * extension[offset].valueRange
+    * low = 0 'h' "hours"
+    * high = 24 'h' "hours"
+
 
 
 Instance: SufficientFeeding
@@ -70,7 +68,7 @@ Description: "Every day, all Non-Adipose Intensive Care Patients should receive
 
 // Recommended Action
 Instance: DailySufficientFeeding
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "The daily calorie intake is sufficient"
 Description: "The daily amount of calories matches the individual requirements."
@@ -80,6 +78,7 @@ Description: "The daily amount of calories matches the individual requirements."
 * status = #active
 * code = $sct#787787004 "Calorie Intake" // + $sct#769397007 "Sufficient Amount" // TODO: "is sufficient" is missing
 // TODO: es gibt ein kalorienziel -> kann man das als variable verwenden? zb input in PlanDefinition?
+* kind = $cs-fhir-types#NutritionOrder "NutritionOrder"
 * timingTiming
   * repeat
     * frequency = 1

diff --git a/input/fsh/QI8-Kommunikation/QI8_intervention.fsh b/input/fsh/QI8-Kommunikation/QI8_intervention.fsh
@@ -24,7 +24,7 @@ Description: "For all Intensive Care Patients, an initial structured communicati
 
 // Recommended Action
 Instance: FirstCommunicationPatientsRelativesWithin72hours
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "First Communication with Patients and/or their Relatives within 72 hours"
 Description: "An initial structured communication with the Patients and/or their Relatives occurs within 72 hours of Admission to Intensive Care."
@@ -33,16 +33,12 @@ Description: "An initial structured communication with the Patients and/or their
 * insert publisher-experimental-version(7.0)
 * status = #active
 * code = $sct#225330006 "Client Participation"
-* timingTiming
-  * repeat
-    * frequency = 1
-    * period = 7
-    * periodUnit = $ucum#d "day" // TODO: innerhalb von 72h nach Aufnahme ! -> extension (relative time)?
-/*     * timeFromEvent
-      * eventCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
-      * range 
-        * high = 72 'hours' "hours" */
-
+* kind = $cs-fhir-types#Task "Task"
+* extension[relativeTime]
+  * extension[contextCode].valueCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
+  * extension[offset].valueRange
+    * low = 0 'h' "hours"
+    * high = 72 'h' "hours"
 
 
 Instance: PeriodicCommunicationPatientsRelatives
@@ -71,7 +67,7 @@ Description: "For all Intensive Care Patients, at least one structured communica
 
 // Recommended Action
 Instance: WeeklyCommunicationPatientsRelatives
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "Weekly Communication with Patients and Relatives"
 Description: "At least one structured communication with the Patients and/or their Relatives takes place every week."
@@ -80,6 +76,7 @@ Description: "At least one structured communication with the Patients and/or the
 * insert publisher-experimental-version(7.0)
 * status = #active
 * code = $sct#225330006 "Client Participation"
+* kind = $cs-fhir-types#Task "Task"
 * timingTiming
   * repeat
     * frequency = 1

diff --git a/input/fsh/QI9-Mobilisierung/QI9_intervention.fsh b/input/fsh/QI9-Mobilisierung/QI9_intervention.fsh
@@ -24,7 +24,7 @@ Description: "All Intensive Care Patients should be mobilized within 24 hours af
 
 // Recommended Action
 Instance: FirstMobilizationWithin24hours
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "First Mobilization within 24 hours"
 Description: "First Mobilization occurs within 24 hours after Admission to Intensive Care."
@@ -33,15 +33,13 @@ Description: "First Mobilization occurs within 24 hours after Admission to Inten
 * insert publisher-experimental-version(7.0)
 * status = #active
 * code = $sct#74923002 "Mobilization"
-* timingTiming
-  * repeat
-    * frequency = 1
-    * period = 1
-    * periodUnit = $ucum#d "day" // TODO: innerhalb von 24h nach Aufnahme ! -> extension (relative time) ?
-/*     * timeFromEvent
-      * eventCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
-      * range 
-        * high = 24 'hours' "hours" */
+* kind = $cs-fhir-types#ServiceRequest "ServiceRequest"
+* extension[relativeTime]
+  * extension[contextCode].valueCodeableConcept = $sct#305351004 "Admission to Intensive Care Unit"
+  * extension[offset].valueRange
+    * low = 0 'h' "hours"
+    * high = 24 'h' "hours"
+
 
 
 Instance: PeriodicMobilization
@@ -70,7 +68,7 @@ Description: "All Intensive Care Patients that don't have a no-mobilization orde
 
 // Recommended Action
 Instance: DailyMobilization
-InstanceOf: ActivityDefinition
+InstanceOf: RecommendationAction
 Usage: #definition
 Title: "Daily Mobilization"
 Description: "Mobilization that occurs at least once a day."
@@ -79,6 +77,7 @@ Description: "Mobilization that occurs at least once a day."
 * insert publisher-experimental-version(7.0)
 * status = #active
 * code = $sct#74923002 "Mobilization"
+* kind = $cs-fhir-types#ServiceRequest "ServiceRequest"
 * timingTiming
   * repeat
     * frequency = 1