Updated FSH

I-TECH-UW · Aug 18, 2024 · c467dfd · c467dfd
1 parent 3bc797a
commit c467dfd
Show file tree

Hide file tree

Showing 97 changed files with 215 additions and 116 deletions.
diff --git a/input/fsh/libraries/HIVB2DTLogic.fsh b/input/fsh/libraries/HIVB2DTLogic.fsh
@@ -1,7 +1,7 @@
 Instance: HIVB2DTLogic
 InstanceOf: Library
 Title: "HIV.B2.DT Logic"
-Description: "HIV.B2.DT Signs of Serious Illness Logic"
+Description: "HIV.B2.DT Logic"
 Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"

diff --git a/input/fsh/libraries/HIVB9DTLogic.fsh b/input/fsh/libraries/HIVB9DTLogic.fsh
@@ -1,7 +1,7 @@
 Instance: HIVB9DTLogic
 InstanceOf: Library
 Title: "HIV.B9.DT Logic"
-Description: "HIV.B9.DT Re-test Recommendations Logic"
+Description: "HIV.B9.DT Logic"
 Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"

diff --git a/input/fsh/libraries/HIVConfig.fsh b/input/fsh/libraries/HIVConfig.fsh
@@ -0,0 +1,19 @@
+Instance: HIVConfig
+InstanceOf: Library
+Title: "HIVConfig"
+Description: "Description not yet available for HIVConfig."
+Usage: #definition
+* meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-shareablelibrary"
+* meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
+* meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
+* meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
+* url = "http://smart.who.int/hiv/Library/HIVConfig"
+* extension[+]
+  * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
+  * valueCode = #computable
+* name = "HIVConfig"
+* status = #draft
+* experimental = true
+* publisher = "World Health Organization (WHO)"
+* type = $library-type#logic-library
+* content.id = "ig-loader-HIVConfig.cql"
diff --git a/input/fsh/libraries/WHOCommon.fsh b/input/fsh/libraries/WHOCommon.fsh
@@ -7,7 +7,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
-* url = "http://smart.who.int/base-clinical/Library/WHOCommon"
+* url = "http://smart.who.int/hiv/Library/WHOCommon"
 * extension[+]
   * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable

diff --git a/input/fsh/libraries/WHOConcepts.fsh b/input/fsh/libraries/WHOConcepts.fsh
@@ -7,7 +7,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
-* url = "http://smart.who.int/base-clinical/Library/WHOConcepts"
+* url = "http://smart.who.int/hiv/Library/WHOConcepts"
 * extension[+]
   * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable

diff --git a/input/fsh/libraries/WHOElements.fsh b/input/fsh/libraries/WHOElements.fsh
@@ -7,7 +7,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
-* url = "http://smart.who.int/base-clinical/Library/WHOElements"
+* url = "http://smart.who.int/hiv/Library/WHOElements"
 * extension[+]
   * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable

diff --git a/input/fsh/libraries/WHOEncounterElements.fsh b/input/fsh/libraries/WHOEncounterElements.fsh
@@ -7,7 +7,7 @@ Usage: #definition
 * meta.profile[+] = "http://hl7.org/fhir/uv/crmi/StructureDefinition/crmi-publishablelibrary"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-library"
 * meta.profile[+] = "http://hl7.org/fhir/uv/cql/StructureDefinition/cql-module"
-* url = "http://smart.who.int/WHO/Library/WHOEncounterElements"
+* url = "http://smart.who.int/hiv/Library/WHOEncounterElements"
 * extension[+]
   * url = "http://hl7.org/fhir/StructureDefinition/cqf-knowledgeCapability"
   * valueCode = #computable

diff --git a/input/fsh/measures/HIVIND11.fsh b/input/fsh/measures/HIVIND11.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.11 OAMT coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND11"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND11"
 * title = "HIV.IND.11 OAMT coverage"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND12.fsh b/input/fsh/measures/HIVIND12.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.12 Total person-years on OAMT"
 * url = "http://smart.who.int/hiv/Measure/HIVIND12"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND12"
 * title = "HIV.IND.12 Total person-years on OAMT"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND13.fsh b/input/fsh/measures/HIVIND13.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.13 OAMT minimum duration"
 * url = "http://smart.who.int/hiv/Measure/HIVIND13"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND13"
 * title = "HIV.IND.13 OAMT minimum duration"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND14.fsh b/input/fsh/measures/HIVIND14.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.14 OAMT minimum dose"
 * url = "http://smart.who.int/hiv/Measure/HIVIND14"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND14"
 * title = "HIV.IND.14 OAMT minimum dose"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND15.fsh b/input/fsh/measures/HIVIND15.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.15 VMMC scale-up"
 * url = "http://smart.who.int/hiv/Measure/HIVIND15"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND15"
 * title = "HIV.IND.15 VMMC scale-up"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND16.fsh b/input/fsh/measures/HIVIND16.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.16 VMMC adverse events"
 * url = "http://smart.who.int/hiv/Measure/HIVIND16"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND16"
 * title = "HIV.IND.16 VMMC adverse events"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND18.fsh b/input/fsh/measures/HIVIND18.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.18 People living with HIV who know their HIV status (first 95)"
 * url = "http://smart.who.int/hiv/Measure/HIVIND18"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND18"
 * title = "HIV.IND.18 People living with HIV who know their HIV status (first 95)"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND19.fsh b/input/fsh/measures/HIVIND19.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.19 HTS test volume and positivity"
 * url = "http://smart.who.int/hiv/Measure/HIVIND19"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND19"
 * title = "HIV.IND.19 HTS test volume and positivity"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND2.fsh b/input/fsh/measures/HIVIND2.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.2 Total PrEP recipients"
 * url = "http://smart.who.int/hiv/Measure/HIVIND2"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND2"
 * title = "HIV.IND.2 Total PrEP recipients"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND20.fsh b/input/fsh/measures/HIVIND20.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.20 Individuals testing positive for HIV"
 * url = "http://smart.who.int/hiv/Measure/HIVIND20"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND20"
 * title = "HIV.IND.20 Individuals testing positive for HIV"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND21.fsh b/input/fsh/measures/HIVIND21.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.21 Linkage to ART"
 * url = "http://smart.who.int/hiv/Measure/HIVIND21"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND21"
 * title = "HIV.IND.21 Linkage to ART"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND22.fsh b/input/fsh/measures/HIVIND22.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.22 HTS partner services"
 * url = "http://smart.who.int/hiv/Measure/HIVIND22"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND22"
 * title = "HIV.IND.22 HTS partner services"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND24.fsh b/input/fsh/measures/HIVIND24.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.24 HTS linkage to prevention"
 * url = "http://smart.who.int/hiv/Measure/HIVIND24"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND24"
 * title = "HIV.IND.24 HTS linkage to prevention"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND25.fsh b/input/fsh/measures/HIVIND25.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.25 HIV retesting coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND25"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND25"
 * title = "HIV.IND.25 HIV retesting coverage"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND27.fsh b/input/fsh/measures/HIVIND27.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.27 People living with HIV on ART"
 * url = "http://smart.who.int/hiv/Measure/HIVIND27"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND27"
 * title = "HIV.IND.27 People living with HIV on ART"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND28.fsh b/input/fsh/measures/HIVIND28.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.28 Total attrition from ART"
 * url = "http://smart.who.int/hiv/Measure/HIVIND28"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND28"
 * title = "HIV.IND.28 Total attrition from ART"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND29.fsh b/input/fsh/measures/HIVIND29.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.29 People living with HIV on ART who have suppressed viral load"
 * url = "http://smart.who.int/hiv/Measure/HIVIND29"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND29"
 * title = "HIV.IND.29 People living with HIV on ART who have suppressed viral load"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND3.fsh b/input/fsh/measures/HIVIND3.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.3 PrEP coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND3"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND3"
 * title = "HIV.IND.3 PrEP coverage"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND30.fsh b/input/fsh/measures/HIVIND30.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.30 New ART patients"
 * url = "http://smart.who.int/hiv/Measure/HIVIND30"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND30"
 * title = "HIV.IND.30 New ART patients"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND31.fsh b/input/fsh/measures/HIVIND31.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.31 Late ART initiation"
 * url = "http://smart.who.int/hiv/Measure/HIVIND31"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND31"
 * title = "HIV.IND.31 Late ART initiation"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND32.fsh b/input/fsh/measures/HIVIND32.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.32 Viral load testing coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND32"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND32"
 * title = "HIV.IND.32 Viral load testing coverage"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND33.fsh b/input/fsh/measures/HIVIND33.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.33 Early viral load testing (at six months)"
 * url = "http://smart.who.int/hiv/Measure/HIVIND33"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND33"
 * title = "HIV.IND.33 Early viral load testing (at six months)"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND34.fsh b/input/fsh/measures/HIVIND34.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.34 Appropriate second viral load test after adherence counsellin
 * url = "http://smart.who.int/hiv/Measure/HIVIND34"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND34"
 * title = "HIV.IND.34 Appropriate second viral load test after adherence counselling"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND35.fsh b/input/fsh/measures/HIVIND35.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.35 ARV toxicity prevalence"
 * url = "http://smart.who.int/hiv/Measure/HIVIND35"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND35"
 * title = "HIV.IND.35 ARV toxicity prevalence"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND37.fsh b/input/fsh/measures/HIVIND37.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.37 Viral suppression at labour and delivery"
 * url = "http://smart.who.int/hiv/Measure/HIVIND37"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND37"
 * title = "HIV.IND.37 Viral suppression at labour and delivery"
 * publisher = "World Health Organization (WHO)"
@@ -32,4 +32,8 @@ Title: "HIV.IND.37 Viral suppression at labour and delivery"
     * description = "Number of HIV-positive pregnant women on ART during pregnancy and delivering at a facility during the reporting period who were virally suppressed (<1000 copies/mL) at delivery"
     * code = $measure-population#numerator "Numerator"
     * criteria.language = #text/cql-identifier
-    * criteria.expression = "Numerator"
+    * criteria.expression = "Numerator"
+  * stratifier[+]
+    * id = "HIV.IND.37.S"
+    * criteria.language = #text/cql-identifier
+    * criteria.expression = "Stratification"
diff --git a/input/fsh/measures/HIVIND38.fsh b/input/fsh/measures/HIVIND38.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.38 Early infant diagnosis (EID) coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND38"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND38"
 * title = "HIV.IND.38 Early infant diagnosis (EID) coverage"
 * publisher = "World Health Organization (WHO)"
@@ -32,4 +32,8 @@ Title: "HIV.IND.38 Early infant diagnosis (EID) coverage"
     * description = "Number of HIV-exposed infants born during the reporting period who received a virological HIV test within two months (and 12 months) of birth"
     * code = $measure-population#numerator "Numerator"
     * criteria.language = #text/cql-identifier
-    * criteria.expression = "Numerator"
+    * criteria.expression = "Numerator"
+  * stratifier[+]
+    * id = "HIV.IND.38.S.GR"
+    * criteria.language = #text/cql-identifier
+    * criteria.expression = "Geographic Region Stratifier"
diff --git a/input/fsh/measures/HIVIND39.fsh b/input/fsh/measures/HIVIND39.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.39 Infant ARV prophylaxis coverage"
 * url = "http://smart.who.int/hiv/Measure/HIVIND39"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND39"
 * title = "HIV.IND.39 Infant ARV prophylaxis coverage"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND4.fsh b/input/fsh/measures/HIVIND4.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.4 Volume of PrEP prescribed"
 * url = "http://smart.who.int/hiv/Measure/HIVIND4"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND4"
 * title = "HIV.IND.4 Volume of PrEP prescribed"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND40.fsh b/input/fsh/measures/HIVIND40.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.40 ART coverage in pregnant women"
 * url = "http://smart.who.int/hiv/Measure/HIVIND40"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND40"
 * title = "HIV.IND.40 ART coverage in pregnant women"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND41.fsh b/input/fsh/measures/HIVIND41.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.41 ART coverage in breastfeeding mothers"
 * url = "http://smart.who.int/hiv/Measure/HIVIND41"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND41"
 * title = "HIV.IND.41 ART coverage in breastfeeding mothers"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND42.fsh b/input/fsh/measures/HIVIND42.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.42 Final outcome of PMTCT"
 * url = "http://smart.who.int/hiv/Measure/HIVIND42"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND42"
 * title = "HIV.IND.42 Final outcome of PMTCT"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND43.fsh b/input/fsh/measures/HIVIND43.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.43 HIV prevalence among women attending ANC"
 * url = "http://smart.who.int/hiv/Measure/HIVIND43"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND43"
 * title = "HIV.IND.43 HIV prevalence among women attending ANC"
 * publisher = "World Health Organization (WHO)"

diff --git a/input/fsh/measures/HIVIND44.fsh b/input/fsh/measures/HIVIND44.fsh
@@ -8,7 +8,7 @@ Title: "HIV.IND.44 TPT initiation"
 * url = "http://smart.who.int/hiv/Measure/HIVIND44"
 * status = #draft
 * experimental = true
-* date = "2024-08-05"
+* date = "2024-08-18"
 * name = "HIVIND44"
 * title = "HIV.IND.44 TPT initiation"
 * publisher = "World Health Organization (WHO)"