fix bug in kemr bundle

PATH-Global-Health · Aug 16, 2023 · 634871d · 634871d
1 parent 92feb2e
commit 634871d
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 25 deletions.
diff --git a/Library-FHIR-ModelInfo.json b/Library-FHIR-ModelInfo.json
diff --git a/input/cql/KenyaEMRTXCURR.cql b/input/cql/KenyaEMRTXCURR.cql
@@ -272,4 +272,4 @@ define "Stratification":
   Stratifiers."Age Group/Sex/Location TXCURR"
 
 
-// define "Stratifiers": "Stratification"
+define "Stratifier": "Stratification"
diff --git a/input/fsh/kemr-bundle.fsh b/input/fsh/kemr-bundle.fsh
@@ -17,8 +17,8 @@ Description: "KEMRBundle"
 * insert conformance-bundle
 
 * entry[+].fullUrl = "https://path-global-health.github.io/MERindicators/CodeSystem/OpenHIE"
-* entry[=].request.url = "Patient/PatientCIEL"
-* entry[=].resource = PatientCIEL
+* entry[=].request.url = "CodeSystem/OpenHIE"
+* entry[=].resource = OpenHIE
 * insert conformance-bundle
 
 // value sets
@@ -82,11 +82,6 @@ Description: "KEMRBundle"
 * entry[=].resource = KenyaEMRTXCURR
 * insert conformance-bundle
 
-* entry[+].fullUrl = "https://path-global-health.github.io/MERindicators/Library/"
-* entry[=].request.url = "Library/"
-* entry[=].resource = EnrollmentMethodsforHIVProgram
-* insert conformance-bundle
-
 
 // measures
 

diff --git a/input/fsh/kemr-measure.fsh b/input/fsh/kemr-measure.fsh
@@ -82,13 +82,13 @@ Description: "KEMRTXCURR"
     * code = $measure-population#measure-population-exclusion
     * criteria.language = #text/cql
     * criteria.expression = "Measure Population Exclusion"
-  * population[+]
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-observation"
-    * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
-    * description = "Measure Observation"
-    * code = $measure-population#measure-observation
-    * criteria.language = #text/cql
-    * criteria.expression = "Measure Observation"
+  // * population[+]
+  //   * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-criteriaReference].valueString = "measure-observation"
+  //   * extension[http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-aggregateMethod].valueCode = #count
+  //   * description = "Measure Observation"
+  //   * code = $measure-population#measure-observation
+  //   * criteria.language = #text/cql
+  //   * criteria.expression = "Measure Observation"
   * stratifier[+]
     * criteria.language = #text/cql
     * criteria.expression = "Stratification"

diff --git a/input/fsh/kemr-terminology.fsh b/input/fsh/kemr-terminology.fsh
@@ -81,7 +81,7 @@ Description: "Columbia International eHealth Laboratory (CIEL)"
 
 // https://fhir.staging.openconceptlab.org/orgs/Kenya_SMART_Guidelines/CodeSystem/enrollment_methods/
 
-Alias: $0203 = http://hl7.org/fhir/v2/0203
+// Alias: $0203 = http://hl7.org/fhir/v2/0203
 
 CodeSystem: EnrollmentMethods
 Id: EnrollmentMethods
@@ -105,10 +105,10 @@ Description: "1"
 // * ^property[=].type = #coding
 * ^meta.lastUpdated = "2023-07-20T15:56:38.013277Z"
 * ^version = "1"
-* ^identifier.system = "https://api.staging.openconceptlab.org"
-* ^identifier.value = "/orgs/Kenya_SMART_Guidelines/CodeSystem/enrollment_methods/"
-* ^identifier.type.text = "Accession ID"
-* ^identifier.type = $0203#ACSN "Accession ID"
+// * ^identifier.system = "https://api.staging.openconceptlab.org"
+// * ^identifier.value = "/orgs/Kenya_SMART_Guidelines/CodeSystem/enrollment_methods/"
+// * ^identifier.type.text = "Accession ID"
+// * ^identifier.type = $0203#ACSN "Accession ID"
 * #159938AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "HBTC"
 * #160539AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "VCT Site" // Voluntary counseling and testing program
 * #159937AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "MCH"
@@ -332,7 +332,7 @@ Description: "CIELHIVMedications"
 
 // https://fhir.staging.openconceptlab.org/orgs/Kenya_SMART_Guidelines/ValueSet/enrollment_methods/
 // Alias: $enrollment_methods = https://kenyaemr.ke/MERindicators/CodeSystem/enrollment_methods
-Alias: $0203 = http://hl7.org/fhir/v2/0203
+// Alias: $0203 = http://hl7.org/fhir/v2/0203
 
 ValueSet: EnrollmentMethodsforHIVProgram
 Id: EnrollmentMethodsforHIVProgram
@@ -343,8 +343,8 @@ Description: "1"
 * ^url = $EnrollmentMethodsforHIVProgram
 * ^status = #draft
 * ^meta.lastUpdated = "2023-07-20T15:51:47.328070Z"
-* ^identifier.system = "https://api.staging.openconceptlab.org"
-* ^identifier.value = "/orgs/Kenya_SMART_Guidelines/ValueSet/enrollment_methods/"
-* ^identifier.type.text = "Accession ID"
-* ^identifier.type = $0203#ACSN "Accession ID"
+// * ^identifier.system = "https://api.staging.openconceptlab.org"
+// * ^identifier.value = "/orgs/Kenya_SMART_Guidelines/ValueSet/enrollment_methods/"
+// * ^identifier.type.text = "Accession ID"
+// * ^identifier.type = $0203#ACSN "Accession ID"
 * include codes from system $EnrollmentMethods