First round of QA

WorldHealthOrganization · Jun 6, 2024 · f48d943 · f48d943
1 parent cd0ec0f
commit f48d943
Show file tree

Hide file tree

Showing 83 changed files with 224 additions and 91 deletions.
diff --git a/input/cql/IMMZD2DTMeaslesDose0Logic.cql b/input/cql/IMMZD2DTMeaslesDose0Logic.cql
@@ -53,10 +53,16 @@ define "MCV0 Status":
   else
     'Complete'
 
+define "MCV0 Schedule Date":
+  Patient.birthDate + 6 months
+
+define "MCV0 Expiration Date":
+  Patient.birthDate + 9 months
+
 define "MCV0 Due Date":
   if "MCV0 Status" = 'Needed' then
     WC.LatestOf({
-        Patient.birthDate + 6 months,
+        "MCV0 Schedule Date",
         Logic."Date Last Live Vaccine Administered" + 4 weeks,
         Today
     })

diff --git a/input/cql/IMMZD2DTMeaslesLTLogic.cql b/input/cql/IMMZD2DTMeaslesLTLogic.cql
@@ -64,6 +64,9 @@ define "MCV1 Status":
 define "MCV1 Schedule Date":
   Patient.birthDate + 12 months
 
+define "MCV1 Expiration Date":
+  Patient.birthDate + 15 months
+
 define "MCV1 Due Date":
   if "MCV1 Status" = 'Needed' then
     WC.LatestOf({
@@ -83,6 +86,9 @@ define "MCV2 Status":
 define "MCV2 Schedule Date":
   Patient.birthDate + 15 months
 
+define "MCV2 Expiration Date":
+  null as Date
+
 define "MCV2 Due Date":
   if "MCV2 Status" = 'Needed' then
     WC.LatestOf({
@@ -92,3 +98,4 @@ define "MCV2 Due Date":
     })
   else
     null
+
diff --git a/input/cql/IMMZD2DTMeaslesLogic.cql b/input/cql/IMMZD2DTMeaslesLogic.cql
@@ -47,3 +47,5 @@ define "Measles Routine Immunization Schedule Incomplete":
 define "Number Of Supplementary Doses Administered":
   Count(Elements."MCV Supplementary Dose")
 
+define "Draft Medication Request ID for MCV dose":
+  Elements."Most Recent MCV Immunization Proposal".id
diff --git a/input/cql/IMMZD2DTMeaslesOTLogic.cql b/input/cql/IMMZD2DTMeaslesOTLogic.cql
@@ -63,6 +63,9 @@ define "MCV1 Status":
 define "MCV1 Schedule Date":
   Patient.birthDate + 9 months
 
+define "MCV1 Expiration Date":
+  Patient.birthDate + 15 months
+
 define "MCV1 Due Date":
   if "MCV1 Status" = 'Needed' then
     WC.LatestOf({
@@ -82,6 +85,9 @@ define "MCV2 Status":
 define "MCV2 Schedule Date":
   Patient.birthDate + 15 months
 
+define "MCV2 Expiration Date":
+  null as Date
+
 define "MCV2 Due Date":
   if "MCV2 Status" = 'Needed' then
     WC.LatestOf({

diff --git a/input/cql/IMMZD2DTMeaslesSupplementaryLogic.cql b/input/cql/IMMZD2DTMeaslesSupplementaryLogic.cql
@@ -52,6 +52,12 @@ define "MCV Supplementary Dose Status":
   else
     'Complete'
 
+define "MCV Supplementary Schedule Date":
+  null as Date
+
+define "MCV Supplementary Expiration Date":
+  null as Date
+
 define "MCV Supplementary Dose Due Date":
   if "MCV Supplementary Dose Status" = 'Eligible' then
     WC.LatestOf({

diff --git a/input/cql/IMMZElements.cql b/input/cql/IMMZElements.cql
@@ -43,6 +43,10 @@ define "MCV Dose 0 Dose":
         where Protocol.series = 'dose 0'
     )
 
+define "MCV Immunization Proposal":
+  [MedicationRequest: medication in Concepts."MCV Vaccine"] MCV
+    where MCV.intent = 'proposal'
+
 //TODO: Check patient is alive
 
 // Givens:

diff --git a/input/cql/IMMZEncounterElements.cql b/input/cql/IMMZEncounterElements.cql
@@ -36,6 +36,13 @@ define "MCV Dose 0 Dose":
   Elements."MCV Dose 0 Dose" MCV
     where MCV.occurrence.toInterval() on or before Today
 
+define "MCV Immunization Proposal":
+  Elements."MCV Immunization Proposal" MCV
+    where MCV.authoredOn on or before Today
+
+define "Most Recent MCV Immunization Proposal":
+  "MCV Immunization Proposal".mostRecent()
+
 /*
  * Contraindications
  */

diff --git a/input/cql/IMMZVaccineLibrary.cql b/input/cql/IMMZVaccineLibrary.cql
@@ -1,10 +1,12 @@
 library IMMZVaccineLibrary
+
 using FHIR version '4.0.1'
 
+include FHIRHelpers version '4.0.1'
+include fhir.cqf.common.FHIRCommon called FC
+
 include WHOCommon called WCom
 include WHOConcepts called Wcon
-include FHIRHelpers version '4.0.1'
-include FHIRCommon called FC
 include IMMZConcepts called IMMZc
 include IMMZCommon called IMMZcom
 

diff --git a/input/cql/WHOCommon.cql b/input/cql/WHOCommon.cql
@@ -97,6 +97,12 @@ define fluent function mostRecent(immunizations List<Immunization>):
       sort by start of occurrence.toInterval()
   )
 
+define fluent function mostRecent(medicationRequests List<MedicationRequest>):
+  Last(
+    medicationRequests MR
+      sort by authoredOn
+  )
+
 define fluent function lowest(observations List<Observation>):
   First(
     observations O

diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesCIMR.fsh
@@ -4,13 +4,13 @@ Title: "IMMZ.D2.DT.Measles.Contraindication"
 Description: "Provide measles immunization"
 Usage: #definition
 
-* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeasles"
+* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
   * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesContraindication"
 * status = #draft
-* experimental = false
+* experimental = true
 * date = 2023-10-03
 * publisher = "World Health Organization (WHO)"
 * contact[+]

diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesEval.fsh
@@ -4,13 +4,13 @@ Title: "IMMZ.D2.DT.Measles.Eval"
 Description: "Provide measles immunization"
 Usage: #definition
 
-* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeasles"
+* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
   * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesContraindicationEvaluation"
 * status = #draft
-* experimental = false
+* experimental = true
 * date = 2023-10-03
 * publisher = "World Health Organization (WHO)"
 * contact[+]

diff --git a/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh b/input/fsh/activitydefinitions/IMMZD2DTMeaslesMR.fsh
@@ -4,13 +4,13 @@ Title: "IMMZ.D2.DT.Measles.MR"
 Description: "Provide measles immunization"
 Usage: #definition
 
-* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeasles"
+* library = "http://smart.who.int/immunizations-measles/Library/IMMZD2DTMeaslesLogic"
 * extension[+]
   * url = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability"
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesMedicationRequest"
 * status = #draft
-* experimental = false
+* experimental = true
 * date = 2023-10-03
 * publisher = "World Health Organization (WHO)"
 * contact[+]
@@ -31,15 +31,3 @@ Usage: #definition
   * expression
     * language = #text/cql
     * expression = "'proposal'"
-* dynamicValue[+]
-  * path = "dispenseRequest.validityPeriod.start"
-  * expression
-    * description = "Due date of the dose"
-    * language = #text/cql-identifier
-    * expression = "Schedule Due Date for MCV dose"
-* dynamicValue[+]
-  * path = "dispenseRequest.validityPeriod.end"
-  * expression
-    * description = "Expiration date for MCV dose"
-    * language = #text/cql-identifier
-    * expression = "Expiration Date for MCV dose"
diff --git a/input/fsh/actors/CommunityHealthWorker.fsh b/input/fsh/actors/CommunityHealthWorker.fsh
@@ -7,5 +7,5 @@ Usage: #example
 * identifier.value = "CommunityHealthWorker"
 * name = "CommunityHealthWorker"
 * title = "Community Health Worker"
-* experimental = false
+* experimental = true
 * description = "Community health workers provide health education, referral and follow-up; case management and basic preventive health care; and home visiting services to specific communities. They provide support and assistance to clients by reminding clients to take their vaccinations, responding to emergencies, and reporting births."
diff --git a/input/fsh/actors/EPIManager.fsh b/input/fsh/actors/EPIManager.fsh
@@ -7,5 +7,5 @@ Usage: #example
 * identifier.value = "EPIM"
 * name = "EPIManager"
 * title = "Expanded Programme on Immunization (EPI) Manager"
-* experimental = false
+* experimental = true
 * description = "Responsible for: developing annual and multi-annual plans; immunization communication and mobilization; management of logistics, the cold chain, and vaccines; monitoring, supervision and evaluation of immunization services; and coordination of EPI activities at the national and subnational levels."
diff --git a/input/fsh/actors/HealthWorker.fsh b/input/fsh/actors/HealthWorker.fsh
@@ -7,5 +7,5 @@ Usage: #example
 * identifier.value = "HW"
 * name = "HealthcareWorker"
 * title = "Healthcare Worker"
-* experimental = false
+* experimental = true
 * description = "Health workers facilitate education sessions, administers immunizations, provide counselling when needed, record stock movements, and compiles/generates reports."
diff --git a/input/fsh/codesystems/ICD11.fsh b/input/fsh/codesystems/ICD11.fsh
@@ -4,7 +4,7 @@ Description: "ICD-11."
 * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablecodesystem"
 * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablecodesystem"
 * ^url = $ICD11
-//* ^hierarchyMeaning = #is-a
+* ^hierarchyMeaning = #is-a
 * ^experimental = true
 * ^caseSensitive = true
 

diff --git a/input/fsh/codesystems/IMMZConcepts.fsh b/input/fsh/codesystems/IMMZConcepts.fsh
@@ -3,7 +3,7 @@ Title: "Immunizations Concepts CodeSystem"
 Description: "This code system defines concepts used in SMART Immunizations"
 * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablecodesystem"
 * ^meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablecodesystem"
-* ^experimental = false
+* ^experimental = true
 * ^caseSensitive = false
 * #C.DE1 "Unique identifier" "Unique identifier for the client, according to the policies applicable to each country. There can be more than one unique identifier used to link records (e.g. national ID, health ID, immunization information system ID, medical record ID)."
 * #C.DE2 "Name" "The full name of the client"

diff --git a/input/fsh/conceptmaps/IMMZConceptsToAdministrativeGender.fsh b/input/fsh/conceptmaps/IMMZConceptsToAdministrativeGender.fsh
@@ -8,21 +8,21 @@ Usage:        #definition
 * name = "IMMZConceptsToAdministrativeGender"
 * title = "ConceptMap to and from Immunization Concepts to administrative gender"
 * status = #active
-* experimental = false
+* experimental = true
 
 * group[+]
   * source = Canonical(IMMZConcepts)
   * target = $GENDER
-  * insert ElementMap(DE6, male, equivalent)
-  * insert ElementMap(DE7, female, equivalent)
-  * insert ElementMap(DE8, unknown, equivalent)
-  * insert ElementMap(DE9, other, wider)
+  * insert ElementMap(C.DE6, male, equivalent)
+  * insert ElementMap(C.DE7, female, equivalent)
+  * insert ElementMap(C.DE8, unknown, equivalent)
+  * insert ElementMap(C.DE9, other, wider)
 
 * group[+]
   * source = $GENDER
   * target = Canonical(IMMZConcepts)
-  * insert ElementMap(male, DE6, equivalent)
-  * insert ElementMap(female, DE7, equivalent)
-  * insert ElementMap(unknown, DE8, equivalent)
-  * insert ElementMap(other, DE9, narrower)
+  * insert ElementMap(male, C.DE6, equivalent)
+  * insert ElementMap(female, C.DE7, equivalent)
+  * insert ElementMap(unknown, C.DE8, equivalent)
+  * insert ElementMap(other, C.DE9, narrower)
   * element[=].target[=].comment = "The source concept is more specific than the target"
diff --git a/input/fsh/conceptmaps/IMMZConceptsToICD11.fsh b/input/fsh/conceptmaps/IMMZConceptsToICD11.fsh
@@ -8,7 +8,7 @@ Usage:        #definition
 * name = "IMMZConceptsToICD11"
 * title = "ConceptMap to and from ICD-11"
 * status = #active
-* experimental = false
+* experimental = true
 
 * group[+]
   * source = Canonical(IMMZConcepts)

diff --git a/input/fsh/conceptmaps/IMMZConceptsToLOINC.fsh b/input/fsh/conceptmaps/IMMZConceptsToLOINC.fsh
@@ -8,7 +8,7 @@ Usage:        #definition
 * name = "IMMZConceptsToLOINC"
 * title = "ConceptMap to and from LOINC"
 * status = #active
-* experimental = false
+* experimental = true
 
 * group[+]
   * source = Canonical(IMMZConcepts)

diff --git a/input/fsh/conceptmaps/IMMZConceptsToSNOMED.fsh b/input/fsh/conceptmaps/IMMZConceptsToSNOMED.fsh
@@ -8,7 +8,7 @@ Usage:        #definition
 * name = "IMMZConceptsToSNOMED"
 * title = "ConceptMap to and from SNOMED"
 * status = #active
-* experimental = false
+* experimental = true
 
 * group[+]
   * source = Canonical(IMMZConcepts)

diff --git a/input/fsh/extensions/SGIMMAdministeredProduct.fsh b/input/fsh/extensions/SGIMMAdministeredProduct.fsh
@@ -2,4 +2,5 @@ Extension: SGIMMAdministeredProduct
 Id: sg-ext-administeredProduct
 Title: "SGAdministeredProduct"
 Description: "The product administered"
+* ^experimental = true
 * value[x] only Reference(SGVaccineProduct) or CodeableConcept
diff --git a/input/fsh/extensions/SGMedicationClassification.fsh b/input/fsh/extensions/SGMedicationClassification.fsh
@@ -1,6 +1,6 @@
 Extension: SGMedicationClassification
 Description: "Medication Classification."
 Context: Medication
-
+* ^experimental = true
 * value[x] only CodeableConcept
 * value[x] from VaccineTypes (required)
diff --git a/input/fsh/libraries/IMMZCommon.fsh b/input/fsh/libraries/IMMZCommon.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZCommon"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZCommon.cql"
diff --git a/input/fsh/libraries/IMMZConcepts.fsh b/input/fsh/libraries/IMMZConcepts.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZConcepts"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZConcepts.cql"
diff --git a/input/fsh/libraries/IMMZConfig.fsh b/input/fsh/libraries/IMMZConfig.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZConfig"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZConfig.cql"
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesDose0Logic.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesDose0Logic"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZD2DTMeaslesDose0Logic.cql"
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesLTLogic.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesLTLogic"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZD2DTMeaslesLTLogic.cql"
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesLogic.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesLogic"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZD2DTMeaslesLogic.cql"
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesOTLogic.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesOTLogic"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZD2DTMeaslesOTLogic.cql"
diff --git a/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh b/input/fsh/libraries/IMMZD2DTMeaslesSupplementaryLogic.fsh
@@ -13,7 +13,7 @@ Usage: #definition
   * valueCode = #computable
 * name = "IMMZD2DTMeaslesSupplementaryLogic"
 * status = #draft
-* experimental = false
+* experimental = true
 * publisher = "World Health Organization (WHO)"
 * type = $library-type#logic-library
 * content.id = "ig-loader-IMMZD2DTMeaslesSupplementaryLogic.cql"