Wsg 99 fixed

input/cql/HIVB2DTLogic.cql

@@ -24,7 +24,7 @@ include HIVCommon version '0.0.1' called HIC
 include HIVConcepts called HCx
 include HIVEncounterElements called Elements
 include FHIRHelpers version '4.0.1'
-include FHIRCommon called FC
+
 include WHOCommon called WCom
 
 context Patient

input/cql/HIVB7DTLogic.cql

@@ -32,7 +32,7 @@ valueset "Non-reactive": 'http://fhir.org/guides/who/hiv-dak/ValueSet/hiv-b-de10
 
 include FHIRHelpers version '4.0.1'
 include WHOCommon called WCom
-include FHIRCommon called FC
+
 
 //code "Assay 1 Reactive": 'HIV.B.DE95' from "TestresultofHIVassay1Codes" display 'Assay 1 reactive'
 //code "Reactive": 'HIV.B.DE103' from "HIV_DAK_Codes" display 'Reactive'

input/cql/HIVB9DTLogic.cql

@@ -27,7 +27,7 @@ include HIVConcepts called HCx
 include HIVConfig called Config
 include HIVEncounterElements called Elements
 include FHIRHelpers version '4.0.1'
-include FHIRCommon called FC
+
 include WHOCommon called WCom
 // Included for PlanDefinition
 include WHOConcepts called WCx

input/cql/HIVCommon.cql

@@ -4,7 +4,7 @@ using FHIR version '4.0.1'
 
 include FHIRHelpers version '4.0.1'
 include WHOCommon called WCom
-//include FHIRCommon called FC
+//
 include HIVConcepts called HC
 include HIVConceptsCustom called HCC
 include HIVElements called HE
@@ -45,7 +45,7 @@ define "Elevated Viral load test during Measurement Period":
   HE."Viral load test result D.DE387" VL
     with "viral load sample collection" P 
     such that VL.partOf.references(P) and P.performed.toInterval() during "Measurement Period"
-    where VL.value > 1000 'copies/ml'
+    where VL.value > 1000 
     sort by start of effective.toInterval()
 
 
@@ -137,24 +137,6 @@ define "By Age Stratifier 3":
  * By state stratifier
  */
 
-define "By Geographic Region Stratifier":
-    First(Patient.address A where A.use in { 'home' }).state
-
-/*
- * By Administrative Gender of Patient Stratifier
- * Need to expand codes
- */
-
-define "By Administrative Gender Stratifier":
-    case 
-        when Patient.gender = 'male' then HC."Male"
-        when Patient.gender = 'female' then HC."Female"
-        when Patient.gender = 'transgender female' then HC."Transgender female"
-        when Patient.gender = 'transgender male' then HC."Transgender male"
-        else HC."Other - HIV.A.DE23"
-    end
-
-
   define "HIV status of partner or contact":
     case 
         when HIE."Already knew positive" then HC."Already knew positive"
@@ -919,6 +901,3 @@ define "VMMC_adverse_event_Postoperative":
   where P.status = 'completed'
   and P.code ~ HC."STI testing and treatment services"
 
-
-
-

input/cql/HIVConceptsCustom.cql

@@ -59,4 +59,4 @@ code "needle-syringe": 'needle syringe' from "missing concepts"
 code "methadone": 'methadone' from "missing concepts"
 code "buprenorphine": 'buprenorphine' from "missing concepts"
 code "viral load test": 'viral load test' from "missing concepts"
-
+code "delivery": 'delivery' from "missing concepts"

input/cql/HIVConfig.cql

@@ -0,0 +1,10 @@
+library HIVConfig
+
+using FHIR version '4.0.1'
+
+/* 
+ * HIV burden of setting
+ */
+define "HIV burden of setting":
+    'High HIV burden setting'
+