Rolled back change to activitydefs that tried to remove the measles d…

…ependency. Each antigen will need its own activitydef. Added in yellow fever CQL/libraries and test examples.
WorldHealthOrganization · Jan 24, 2024 · 0203d94 · 0203d94
1 parent 14cf98d
commit 0203d94
Show file tree

Hide file tree

Showing 82 changed files with 653 additions and 145 deletions.
diff --git a/input/cql/IMMZD2DTMeaslesDose0.cql b/input/cql/IMMZD2DTMeaslesDose0.cql
@@ -17,12 +17,6 @@ include IMMZD2DTMeaslesInput called input
 // End Skeleton CQL
 context Patient
 
-/*
-@dynamicValue: Due date of the dose
-*/
-define "Due date of the dose":
-	Now()
-
 /*
 @dynamicValue: Guidance
 */

diff --git a/input/cql/IMMZD2DTMeaslesHighTx.cql b/input/cql/IMMZD2DTMeaslesHighTx.cql
@@ -21,7 +21,9 @@ context Patient
 @dynamicValue: Due date of the dose
 */
 define "Due date of the dose":
-	Now()
+	if "Client is due for MCV1" then Patient.birthDate + 9 months
+	else if "Client is due for MCV2" then Patient.birthDate + 15 months
+	else null
 
 /*
 @dynamicValue: Guidance

diff --git a/input/cql/IMMZD2DTMeaslesLowTx.cql b/input/cql/IMMZD2DTMeaslesLowTx.cql
@@ -21,7 +21,9 @@ context Patient
 @dynamicValue: Due date of the dose
 */
 define "Due date of the dose":
-	Now()
+	if "Client is due for MCV1" then Patient.birthDate + 12 months
+	else if "Client is due for MCV2" then Patient.birthDate + 15 months
+	else null
 
 /*
 @dynamicValue: Guidance

diff --git a/input/cql/IMMZD2DTMeaslesSupp.cql b/input/cql/IMMZD2DTMeaslesSupp.cql
@@ -17,12 +17,6 @@ include IMMZD2DTMeaslesInput called input
 // End Skeleton CQL
 context Patient
 
-/*
-@dynamicValue: Due date of the dose
-*/
-define "Due date of the dose":
-	Now()
-
 /*
 @dynamicValue: Guidance
 */

diff --git a/input/cql/IMMZD5DTMeaslesCI.cql → input/cql/IMMZD5DTMeasles.cql b/input/cql/IMMZD5DTMeaslesCI.cql → input/cql/IMMZD5DTMeasles.cql
@@ -1,9 +1,9 @@
 /*
- * Library: IMMZD5DTMeaslesCI (IMMZ.D5.DT.Measles.CI)
+ * Library: IMMZD5DTMeasles (IMMZ.D5.DT.Measles)
  * Rule: Check for contraindications before administering the vaccine(s) due	 	 	  
  * Trigger: IMMZ.D5 Determine vaccine(s) to be administered based on contraindications
  */
-library IMMZD5DTMeaslesCI
+library IMMZD5DTMeasles
 // Start Skeleton CQL
 using FHIR version '4.0.1'
 include FHIRHelpers version '4.0.1'

diff --git a/input/cql/IMMZD5DTYellowFeverCI.cql → input/cql/IMMZD5DTYellowFever.cql b/input/cql/IMMZD5DTYellowFeverCI.cql → input/cql/IMMZD5DTYellowFever.cql
@@ -1,9 +1,9 @@
 /*
- * Library: IMMZD5DTYellowFeverCI (IMMZ.D5.DT.YellowFever.CI)
+ * Library: IMMZD5DTYellowFever (IMMZ.D5.DT.YellowFever)
  * Rule: Check for contraindications before administering the vaccine(s) due	 	 	  
  * Trigger: IMMZ.D5 Determine vaccine(s) to be administered based on contraindications
  */
-library IMMZD5DTYellowFeverCI
+library IMMZD5DTYellowFever
 // Start Skeleton CQL
 using FHIR version '4.0.1'
 include FHIRHelpers version '4.0.1'

diff --git a/...activitydefinitions/IMMZD2DTMeaslesCR.fsh → input/fsh/activitydefinitions/IMMZD2DTCR.fsh b/...activitydefinitions/IMMZD2DTMeaslesCR.fsh → input/fsh/activitydefinitions/IMMZD2DTCR.fsh
@@ -1,14 +1,14 @@
-Instance: IMMZD2DTMeaslesCR
+Instance: IMMZD2DTCR
 InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-communicationactivity
-Title: "IMMZ.D2.DT.Measles.CR"
+Title: "IMMZ.D2.DT.CR"
 Description: "Provide measles immunization communication"
 Usage: #definition
 
 * extension[+]
   * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
-* name = "IMMZD2DTMeaslesCommunicationRequest"
+* name = "IMMZD2DTCommunicationRequest"
 * status = #draft
 * experimental = false
 * date = 2023-12-03

diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh
diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh
@@ -1,7 +1,7 @@
 Instance: IMMZD2DTMeaslesMR
 InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-immunizationactivity
 Title: "IMMZ.D2.DT.Measles.MR"
-Description: "Provide measles immunization"
+Description: "Provide immunization"
 Usage: #definition
 
 * extension[+]
@@ -20,4 +20,4 @@ Usage: #definition
 * kind = #MedicationRequest
 * intent = #proposal
 * doNotPerform = false
-* productCodeableConcept = $ICD11#XM28X5 "Measles vaccines"
+* productCodeableConcept = $ICD11#XM61M7 "Measles vaccines"
diff --git a/...tivitydefinitions/IMMZD5DTMeaslesCIMR.fsh → ...activitydefinitions/IMMZD5DTMeaslesMR.fsh b/...tivitydefinitions/IMMZD5DTMeaslesCIMR.fsh → ...activitydefinitions/IMMZD5DTMeaslesMR.fsh
@@ -1,7 +1,7 @@
-Instance: IMMZD5DTMeaslesCIMR
+Instance: IMMZD5DTMeaslesMR
 InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-immunizationactivity
-Title: "IMMZ.D5.DT.Measles.Contraindication"
-Description: "Provide measles immunization"
+Title: "IMMZ.D5.DT.Measles.MR"
+Description: "Immunization Contraindication"
 Usage: #definition
 
 * extension[+]

diff --git a/input/fsh/plandefinitions/IMMZD18SMeaslesDose0HighTx.fsh b/input/fsh/plandefinitions/IMMZD18SMeaslesDose0HighTx.fsh
@@ -28,7 +28,7 @@ Usage: #definition
       * description = "Measles MCV0 dose"
       * language = #text/cql-identifier
       * expression = "Measles MCV0 dose"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD18SMeaslesDose0LowTx.fsh b/input/fsh/plandefinitions/IMMZD18SMeaslesDose0LowTx.fsh
@@ -28,7 +28,7 @@ Usage: #definition
       * description = "Measles MCV0 dose"
       * language = #text/cql-identifier
       * expression = "Measles MCV0 dose"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD18SMeaslesHighTx.fsh b/input/fsh/plandefinitions/IMMZD18SMeaslesHighTx.fsh
@@ -28,7 +28,7 @@ Usage: #definition
       * description = "Measles dose 1"
       * language = #text/cql-identifier
       * expression = "Measles dose 1"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression
@@ -73,7 +73,7 @@ Usage: #definition
       * description = "Measles dose 2"
       * language = #text/cql-identifier
       * expression = "Measles dose 2"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD18SMeaslesLowTx.fsh b/input/fsh/plandefinitions/IMMZD18SMeaslesLowTx.fsh
@@ -28,7 +28,7 @@ Usage: #definition
       * description = "Measles dose 1"
       * language = #text/cql-identifier
       * expression = "Measles dose 1"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression
@@ -73,7 +73,7 @@ Usage: #definition
       * description = "Measles dose 2"
       * language = #text/cql-identifier
       * expression = "Measles dose 2"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD18SMeaslesSupp.fsh b/input/fsh/plandefinitions/IMMZD18SMeaslesSupp.fsh
@@ -28,7 +28,7 @@ Usage: #definition
       * description = "Measles supplementary dose"
       * language = #text/cql-identifier
       * expression = "Measles supplementary dose"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD2DTMeasles.fsh b/input/fsh/plandefinitions/IMMZD2DTMeasles.fsh
diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesDose0.fsh
@@ -27,7 +27,7 @@ Usage: #definition
       * description = "Guidance"
       * language = #text/cql-identifier
       * expression = "Guidance"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesHighTx.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesHighTx.fsh
@@ -85,7 +85,7 @@ Usage: #definition
       * description = "Guidance"
       * language = #text/cql-identifier
       * expression = "Guidance"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesLowTx.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesLowTx.fsh
@@ -85,7 +85,7 @@ Usage: #definition
       * description = "Guidance"
       * language = #text/cql-identifier
       * expression = "Guidance"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/input/fsh/plandefinitions/IMMZD2DTMeaslesSupp.fsh b/input/fsh/plandefinitions/IMMZD2DTMeaslesSupp.fsh
@@ -27,7 +27,7 @@ Usage: #definition
       * description = "Guidance"
       * language = #text/cql-identifier
       * expression = "Guidance"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression

diff --git a/...fsh/plandefinitions/IMMZD2DTMeaslesCI.fsh → ...t/fsh/plandefinitions/IMMZD5DTMeasles.fsh b/...fsh/plandefinitions/IMMZD2DTMeaslesCI.fsh → ...t/fsh/plandefinitions/IMMZD5DTMeasles.fsh
@@ -1,6 +1,6 @@
-Instance: IMMZD5DTMeaslesCI
+Instance: IMMZD5DTMeasles
 InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-recommendationdefinition
-Title: "IMMZ.D5.DT.Measles.Contraindication"
+Title: "IMMZ.D5.DT.Measles"
 Description: "Check contraindications for Measles vaccine"
 Usage: #definition
 
@@ -9,7 +9,7 @@ Usage: #definition
   * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
   * valueCode = #computable
 * version = "0.1.0"
-* name = "IMMZD5DTMeaslesContraindication"
+* name = "IMMZD5DTMeasles"
 * status = #draft
 * experimental = false
 * publisher = "World Health Organization (WHO)"
@@ -23,7 +23,7 @@ Usage: #definition
       * description = "Measles vaccination contraindicated"
       * language = #text/cql-identifier
       * expression = "Measles vaccination contraindicated"
-  * definitionCanonical = Canonical(IMMZD5DTMeaslesCIMR)
+  * definitionCanonical = Canonical(IMMZD5DTMeaslesMR)
   * dynamicValue[+]
     * path = "id"
     * expression
@@ -53,7 +53,7 @@ Usage: #definition
       * description = "Guidance"
       * language = #text/cql-identifier
       * expression = "Guidance"
-  * definitionCanonical = Canonical(IMMZD2DTMeaslesCR)
+  * definitionCanonical = Canonical(IMMZD2DTCR)
   * dynamicValue[+]
     * path = "status"
     * expression