in middle of HIV 7

input/cql/HIVIND6Logic.cql

@@ -138,5 +138,3 @@ define "Stratification":
 + ':' + HIC."By Geographic Region Stratifier"
 //Need to discuss how to add list
 //+ ':' +HIC."patientGroups"
-
-//Need exposure type

input/cql/HIVIND7Logic.cql

@@ -87,3 +87,64 @@ include WHOCommon called WCom
 include FHIRCommon called FC
 
 // Indicator Definition
+
+parameter "Measurement Period" Interval<Date> default Interval[@2020-01-01, @2020-01-31]
+
+context Patient
+
+/*
+ * As defined by Member State
+ */
+define "Initial Population":
+  true
+
+
+define "numerator":
+    exists(HIC."HIV Test After PEP Prescribed during Measurement Period" O
+	where (O.issued before end of "Measurement Period"
+	and O.issued after start of "Measurement Period")
+   ) 
+
+
+define "denominator":
+    exists(HIC."PEP Prescribed during Measurement Period and Completed" MS
+	where not (MS.effective ends after end of "Measurement Period")
+   ) 
+
+
+
+
+
+/*
+ * Disaggregators
+ */
+
+define "Administrative Gender Stratifier":
+	HIC."By Administrative Gender Stratifier"
+
+define "Age Stratifier":
+	HIC."By Age Stratifier 3"
+
+define "Geographic Region Stratifier":
+	HIC."By Geographic Region Stratifier"
+
+define "patientGroups Stratifier":
+	HIC."patientGroups"
+
+define "prep product":
+    HIC."prep_product"
+
+define "Setting":
+    HIC."setting"
+
+define "hiv_exposure_type":
+    HIC."hiv_exposure_type"
+
+//provider type not provided?
+
+define "Stratification":
+ HIC."By Administrative Gender Stratifier".code 
+  + ':' + HIC."By Age Stratifier"
++ ':' + HIC."By Geographic Region Stratifier"
+//Need to discuss how to add list
+//+ ':' +HIC."patientGroups"

input/cql/HIVIndicatorCommon.cql

@@ -101,6 +101,19 @@ define "PEP Prescribed during Measurement Period and Completed":
   where (MS.status = 'recorded'
   and exists(MS.reasonCode C where C ~ HC."PrEP for HIV prevention")
   )
+
+define "HIV Test After PEP Prescribed during Measurement Period":
+  [Observation: HC."HIV test result - HIV.B.DE111"] O
+    with [MedicationRequest] MR
+      such that O.basedOn.references(MR) and MR.status = 'completed'
+        and MR.intent = 'order'
+        and MR.medication ~ HC."PEP for HIV prevention"
+        and MR.authoredOn after start of "Measurement Period"
+        and MR.authoredOn before end of "Measurement Period"
+  where ( O.status in {'final', 'amended'}
+    and O.value ~ HC."HIV-positive - HIV.B.DE112"
+  )
+  Return {MR.authoredOn,O.issued}
 
 
 define "Patient Deceased before end of Measurement Period":