POC-341: Patients requiring VL

Alfred-Mutai · Alfred-Mutai · commit bafcf05785f6 · 2023-08-10T15:44:21.000+03:00
diff --git a/app/reporting-framework/json-reports/clinical-reminder-report.json b/app/reporting-framework/json-reports/clinical-reminder-report.json
@@ -126,7 +126,7 @@
       "alias": "needs_vl_coded",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "CASE WHEN (ls.cur_arv_meds IS NULL) THEN 0 WHEN (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) > 3) AND ls.vl_1 > 1000 AND ls.arv_start_date < ls.vl_1_date THEN 1 WHEN ls.vl_1 > 200 AND (TIMESTAMPDIFF(MONTH,ls.vl_1_date,DATE('{referenceDate}')) > 3) THEN 2 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') >= 12) AND (ls.vl_2 IS NULL) THEN 3 WHEN (ls.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 6) THEN 4 WHEN (t1.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND ls.vl_1 >= 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 3) THEN 5 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') = 3) AND (ls.vl_1_date IS NULL) THEN 6 WHEN (ls.cur_arv_meds <> ls.prev_arv_meds) AND ls.prev_arv_meds IS NOT NULL THEN 7 WHEN ls.vl_1 < 200  AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) >= 12) THEN 8 ELSE 0 END"
+        "expression": "CASE WHEN (ls.cur_arv_meds IS NULL) THEN 0 WHEN (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) > 3) AND ls.vl_1 > 1000 AND ls.arv_start_date < ls.vl_1_date THEN 1 WHEN ls.vl_1 > 200 AND (TIMESTAMPDIFF(MONTH,ls.vl_1_date,DATE('{referenceDate}')) > 3) THEN 2 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') >= 12) AND (ls.vl_2 IS NULL) THEN 3 WHEN (ls.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 6) THEN 4 WHEN (t1.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND ls.vl_1 >= 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 3) THEN 5 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') = 3) AND (ls.vl_1_date IS NULL) THEN 6 WHEN (ls.cur_arv_meds <> ls.prev_arv_meds) AND ls.prev_arv_meds IS NOT NULL AND TIMESTAMPDIFF(MONTH, ls.encounter_datetime, DATE('{referenceDate}')) >= 3 THEN 7 WHEN ls.vl_1 < 200  AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) >= 12) THEN 8 ELSE 0 END"
       }
     },
     {
diff --git a/app/reporting-framework/json-reports/labs-report-base.json b/app/reporting-framework/json-reports/labs-report-base.json
@@ -7,70 +7,46 @@
   "sources": [
     {
       "table": "etl.flat_hiv_summary_v15b",
-      "alias": "t2"
+      "alias": "fhs"
     },
     {
-      "table": "etl.flat_patient_identifiers_v1",
-      "alias": "flat_identifiers",
-      "join": {
-        "type": "LEFT",
-        "joinCondition": "t2.person_id = flat_identifiers.patient_id"
-      }
-    },
-    {
-      "table": "amrs.location",
-      "alias": "l",
+      "table": "(SELECT a.person_id, MAX(encounter_id) AS max_encounter_id FROM etl.flat_hiv_summary_v15b a LEFT JOIN amrs.person p ON p.person_id = a.person_id WHERE p.dead = 0 and p.birthdate is not null GROUP BY a.person_id)",
+      "alias": "max_encounters",
       "join": {
         "type": "INNER",
-        "joinCondition": "t2.location_uuid = l.uuid"
+        "joinCondition": "fhs.person_id = max_encounters.person_id AND fhs.encounter_id = max_encounters.max_encounter_id"
       }
     },
     {
       "table": "amrs.person",
-      "alias": "t3",
+      "alias": "p",
       "join": {
         "type": "INNER",
-        "joinCondition": "t3.person_id = t2.person_id"
-      }
-    },
-    {
-      "table": "amrs.person_attribute",
-      "alias": "contacts",
-      "join": {
-        "type": "LEFT",
-        "joinCondition": "t2.person_id = contacts.person_id AND (contacts.voided IS NULL || contacts.voided = 0) AND contacts.person_attribute_type_id in (10, 48)"
+        "joinCondition": "p.person_id = fhs.person_id"
       }
     },
     {
-      "table": "amrs.encounter_type",
-      "alias": "et",
+      "table": "etl.flat_patient_identifiers_v1",
+      "alias": "flat_identifiers",
       "join": {
         "type": "LEFT",
-        "joinCondition": "t2.encounter_type = et.encounter_type_id"
+        "joinCondition": "fhs.person_id = flat_identifiers.patient_id"
       }
     },
     {
-      "table": "amrs.person_address",
-      "alias": "pa",
+      "table": "amrs.location",
+      "alias": "l",
       "join": {
-        "type": "LEFT",
-        "joinCondition": "t2.person_id = pa.person_id"
+        "type": "INNER",
+        "joinCondition": "fhs.location_uuid = l.uuid"
       }
     }
   ],
   "columns": [
     {
       "type": "simple_column",
       "alias": "person_id",
-      "column": "t2.person_id"
-    },
-    {
-      "type": "derived_column",
-      "alias": "needs_vl_in_period",
-      "expressionType": "simple_expression",
-      "expressionOptions": {
-        "expression": "if(case when (t2.cur_arv_meds is not null and t2.vl_1 > 1000) and (timestampdiff(day,t2.vl_1_date, '{reportMonth}') >= 90) then true when (timestampdiff(month,t2.arv_start_date, '{reportMonth}') <= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{reportMonth}') >= 6)  and (timestampdiff(month,t2.arv_start_date, '{reportMonth}')>=6) then true when (timestampdiff(month,t2.arv_start_date, '{reportMonth}') >= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{reportMonth}') >= 12) then true else false end,1,0)"
-      }
+      "column": "fhs.person_id"
     },
     {
       "type": "simple_column",
@@ -89,80 +65,62 @@
     },
     {
       "type": "simple_column",
-      "alias": "location",
-      "column": "l.name"
+      "alias": "location_id",
+      "column": "fhs.location_id"
     },
     {
       "type": "simple_column",
-      "alias": "location_id",
-      "column": "t2.location_id"
+      "alias": "location",
+      "column": "l.name"
     },
     {
       "type": "simple_column",
       "alias": "location_uuid",
-      "column": "t2.location_uuid"
+      "column": "fhs.location_uuid"
     },
     {
       "type": "simple_column",
       "alias": "encounter_datetime",
-      "column": "t2.encounter_datetime"
+      "column": "fhs.encounter_datetime"
     },
     {
       "type": "simple_column",
       "alias": "month",
-      "column": "MONTH(t2.encounter_datetime)"
+      "column": "MONTH(fhs.encounter_datetime)"
     },
     {
       "type": "simple_column",
       "alias": "reporting_month",
-      "column": "date_format(t2.encounter_datetime, '%m/%Y')"
+      "column": "date_format(fhs.encounter_datetime, '%m/%Y')"
     },
     {
       "type": "simple_column",
       "alias": "year",
-      "column": "YEAR(t2.encounter_datetime)"
-    },
-    {
-      "type": "derived_column",
-      "alias": "phone_number",
-      "expressionType": "simple_expression",
-      "expressionOptions": {
-        "expression": " GROUP_CONCAT(DISTINCT contacts.value SEPARATOR ', ')"
-      }
+      "column": "YEAR(fhs.encounter_datetime)"
     },
     {
       "type": "simple_column",
       "alias": "latest_rtc_date",
-      "column": "date_format(t2.rtc_date, '%Y-%m-%d')"
-    },
-    {
-      "type": "simple_column",
-      "alias": "last_appointment",
-      "column": "CONCAT(COALESCE(DATE_FORMAT(t2.encounter_datetime, '%Y-%m-%d'),''),' ',COALESCE(et.name, ''))"
+      "column": "date_format(fhs.rtc_date, '%Y-%m-%d')"
     },
     {
       "type": "simple_column",
       "alias": "cur_meds",
-      "column": "t2.cur_arv_meds"
+      "column": "fhs.cur_arv_meds"
     }
   ],
   "filters": {
     "conditionJoinOperator": "and",
     "conditions": [
       {
         "filterType": "tableColumns",
-        "conditionExpression": "(t2.next_clinical_datetime_hiv is null or date(t2.next_clinical_datetime_hiv) > ?)",
-        "parameterName": "reportMonth"
-      },
-      {
-        "filterType": "tableColumns",
-        "conditionExpression": "t2.location_uuid in ?",
+        "conditionExpression": "fhs.location_uuid in ? AND fhs.transfer_out is null AND fhs.out_of_care is null",
         "parameterName": "locationUuids"
       },
       {
         "filterType": "tableColumns",
-        "conditionExpression": "coalesce(t2.death_date, t2.out_of_care) is null",
-        "parameterName": ""
+        "conditionExpression": "(TIMESTAMPDIFF(YEAR, p.birthdate, DATE('{reportMonth}')) BETWEEN 0 AND 24 AND ((TIMESTAMPDIFF(MONTH, fhs.arv_start_date, DATE('{reportMonth}')) >= 3 AND fhs.vl_1 IS NULL AND fhs.arv_start_date) OR (TIMESTAMPDIFF(MONTH, fhs.vl_1_date, '{reportMonth}') >= 6 AND fhs.vl_1 IS NOT NULL AND fhs.vl_1_date IS NOT NULL))) OR (TIMESTAMPDIFF(YEAR, p.birthdate, DATE('{reportMonth}')) >= 25 AND ((TIMESTAMPDIFF(MONTH, fhs.arv_start_date, DATE('{reportMonth}')) >= 3 AND fhs.arv_start_date IS NOT NULL AND fhs.vl_1 IS NULL) OR (TIMESTAMPDIFF(MONTH, fhs.arv_start_date, DATE('{reportMonth}')) >= 12 AND fhs.arv_start_date IS NOT NULL AND fhs.vl_1 IS NOT NULL AND fhs.vl_2 IS NULL) OR (TIMESTAMPDIFF(MONTH, fhs.vl_1_date, DATE('{reportMonth}')) >= 12 AND fhs.vl_1 IS NOT NULL AND fhs.vl_2 IS NOT NULL AND fhs.vl_1_date IS NOT NULL AND fhs.vl_1 < 200) OR (TIMESTAMPDIFF(MONTH, fhs.vl_1_date, DATE('{reportMonth}')) >= 3 AND fhs.vl_1 IS NOT NULL AND fhs.vl_2 IS NOT NULL AND fhs.vl_1_date IS NOT NULL AND fhs.vl_1 >= 200) OR ((fhs.is_pregnant = 1 OR fhs.is_mother_breastfeeding = 1) AND TIMESTAMPDIFF(MONTH, fhs.vl_1_date, DATE('{reportMonth}')) >= 6 AND fhs.vl_1_date IS NOT NULL))) OR (fhs.prev_arv_meds <> fhs.cur_arv_meds AND TIMESTAMPDIFF(MONTH, fhs.encounter_datetime, DATE('{reportMonth}')) >= 3)",
+        "parameterName": "reportMonth"
       }
     ]
   }
diff --git a/app/reporting-framework/json-reports/patients-requiring-viral-load-template.json b/app/reporting-framework/json-reports/patients-requiring-viral-load-template.json
@@ -12,7 +12,7 @@
       "table": "amrs.person_name",
       "alias": "person_name",
       "join": {
-        "type": "INNER",
+        "type": "LEFT",
         "joinCondition": "t1.person_id = person_name.person_id AND (person_name.voided IS NULL || person_name.voided = 0) AND person_name.preferred = 1"
       }
     },
@@ -32,20 +32,12 @@
         "joinCondition": "t1.person_id = contact.person_id AND (contact.voided IS NULL || contact.voided = 0) AND contact.person_attribute_type_id in (10, 48)"
       }
     },
-    {
-      "table": "etl.flat_hiv_summary_v15b",
-      "alias": "fhsh",
-      "join": {
-        "type": "LEFT",
-        "joinCondition": "t1.person_id = fhsh.person_id AND fhsh.next_clinical_location_id IS NULL AND fhsh.encounter_type NOT IN (99999) "
-      }
-    },
     {
       "table": "amrs.encounter_type",
       "alias": "ety",
       "join": {
         "type": "LEFT",
-        "joinCondition": "fhsh.encounter_type = ety.encounter_type_id"
+        "joinCondition": "fhs.encounter_type = ety.encounter_type_id"
       }
     },
     {
@@ -107,39 +99,39 @@
       "alias": "has_pending_vl_test",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "case when (timestampdiff(day,t2.vl_order_date,now()) between 0 and 14) and (t2.vl_1_date is null or t2.vl_order_date > t2.vl_1_date) then true else false end"
+        "expression": "case when (timestampdiff(day,fhs.vl_order_date,now()) between 0 and 14) and (fhs.vl_1_date is null or fhs.vl_order_date > fhs.vl_1_date) then true else false end"
       }
     },
     {
       "type": "derived_column",
       "alias": "current_vl",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "t2.vl_1 "
+        "expression": "fhs.vl_1 "
       }
     },
     {
       "type": "derived_column",
       "alias": "current_vl_date",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "date_format(t2.vl_1_date,'%d-%m-%Y')"
+        "expression": "date_format(fhs.vl_1_date,'%d-%m-%Y')"
       }
     },
     {
       "type": "derived_column",
       "alias": "last_vl_order_date",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "date_format(t2.vl_order_date,'%d-%m-%Y')"
+        "expression": "date_format(fhs.vl_order_date,'%d-%m-%Y')"
       }
     },
     {
       "type": "derived_column",
       "alias": "days_since_last_order",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "timestampdiff(day, t2.vl_order_date, now())"
+        "expression": "timestampdiff(day, fhs.vl_order_date, now())"
       }
     },
     {
@@ -153,12 +145,12 @@
     {
       "type": "simple_column",
       "alias": "latest_rtc_date",
-      "column": "date_format(fhsh.rtc_date, '%Y-%m-%d')"
+      "column": "date_format(fhs.rtc_date, '%Y-%m-%d')"
     },
     {
       "type": "simple_column",
       "alias": "latest_vl",
-      "column": "fhsh.vl_1"
+      "column": "fhs.vl_1"
     },
     {
       "type": "derived_column",
@@ -167,19 +159,19 @@
       "expressionOptions": {
         "caseOptions": [
           {
-            "condition": "fhsh.vl_1 < 50",
+            "condition": "fhs.vl_1 < 50",
             "value": "LDL"
           },
           {
-            "condition": "(fhsh.vl_1 >= 50 and fhsh.vl_1 < 200)",
+            "condition": "(fhs.vl_1 >= 50 and fhs.vl_1 < 200)",
             "value": "Low Risk Low Level Viremia"
           },
           {
-            "condition": "(fhsh.vl_1 >= 200 and fhsh.vl_1 < 1000)",
+            "condition": "(fhs.vl_1 >= 200 and fhs.vl_1 < 1000)",
             "value": "High Risk Low Level Viremia"
           },
           {
-            "condition": "(fhsh.vl_1 > 1000)",
+            "condition": "(fhs.vl_1 > 1000)",
             "value": "Suspected Treatment Failure"
           }
         ]
@@ -188,27 +180,27 @@
     {
       "type": "simple_column",
       "alias": "latest_vl_date",
-      "column": "date_format(fhsh.vl_1_date, '%Y-%m-%d')"
+      "column": "date_format(fhs.vl_1_date, '%Y-%m-%d')"
     },
     {
       "type": "simple_column",
       "alias": "last_appointment",
-      "column": "CONCAT(COALESCE(DATE_FORMAT(fhsh.encounter_datetime, '%Y-%m-%d'),''),' ',COALESCE(ety.name, ''))"
+      "column": "CONCAT(COALESCE(DATE_FORMAT(fhs.encounter_datetime, '%Y-%m-%d'),''),' ',COALESCE(ety.name, ''))"
     },
     {
       "type": "simple_column",
       "alias": "cur_meds",
-      "column": "fhsh.cur_arv_meds"
+      "column": "fhs.cur_arv_meds"
     },
     {
       "type": "simple_column",
       "alias": "previous_vl",
-      "column": "fhsh.vl_2"
+      "column": "fhs.vl_2"
     },
     {
       "type": "simple_column",
       "alias": "previous_vl_date",
-      "column": "date_format(fhsh.vl_2_date, '%Y-%m-%d')"
+      "column": "date_format(fhs.vl_2_date, '%Y-%m-%d')"
     },
     {
       "type": "simple_column",

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@`
`126`	`126`	`"alias": "needs_vl_coded",`
`127`	`127`	`"expressionType": "simple_expression",`
`128`	`128`	`"expressionOptions": {`
`129`		- "expression": "CASE WHEN (ls.cur_arv_meds IS NULL) THEN 0 WHEN (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) > 3) AND ls.vl_1 > 1000 AND ls.arv_start_date < ls.vl_1_date THEN 1 WHEN ls.vl_1 > 200 AND (TIMESTAMPDIFF(MONTH,ls.vl_1_date,DATE('{referenceDate}')) > 3) THEN 2 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') >= 12) AND (ls.vl_2 IS NULL) THEN 3 WHEN (ls.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 6) THEN 4 WHEN (t1.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND ls.vl_1 >= 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 3) THEN 5 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') = 3) AND (ls.vl_1_date IS NULL) THEN 6 WHEN (ls.cur_arv_meds <> ls.prev_arv_meds) AND ls.prev_arv_meds IS NOT NULL THEN 7 WHEN ls.vl_1 < 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) >= 12) THEN 8 ELSE 0 END"
	`129`	+ "expression": "CASE WHEN (ls.cur_arv_meds IS NULL) THEN 0 WHEN (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) > 3) AND ls.vl_1 > 1000 AND ls.arv_start_date < ls.vl_1_date THEN 1 WHEN ls.vl_1 > 200 AND (TIMESTAMPDIFF(MONTH,ls.vl_1_date,DATE('{referenceDate}')) > 3) THEN 2 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') >= 12) AND (ls.vl_2 IS NULL) THEN 3 WHEN (ls.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 6) THEN 4 WHEN (t1.is_pregnant OR (t6.relationship = 2 AND TIMESTAMPDIFF(MONTH, t6.date_created, '{referenceDate}') BETWEEN 0 AND 24)) AND ls.vl_1 >= 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, '{referenceDate}') >= 3) THEN 5 WHEN (TIMESTAMPDIFF(MONTH, ls.arv_start_date, '{referenceDate}') = 3) AND (ls.vl_1_date IS NULL) THEN 6 WHEN (ls.cur_arv_meds <> ls.prev_arv_meds) AND ls.prev_arv_meds IS NOT NULL AND TIMESTAMPDIFF(MONTH, ls.encounter_datetime, DATE('{referenceDate}')) >= 3 THEN 7 WHEN ls.vl_1 < 200 AND (TIMESTAMPDIFF(MONTH, ls.vl_1_date, DATE('{referenceDate}')) >= 12) THEN 8 ELSE 0 END"
`130`	`130`	`}`
`131`	`131`	`},`
`132`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"table": "amrs.person_name",`
`13`	`13`	`"alias": "person_name",`
`14`	`14`	`"join": {`
`15`		`- "type": "INNER",`
	`15`	`+ "type": "LEFT",`
`16`	`16`	`"joinCondition": "t1.person_id = person_name.person_id AND (person_name.voided IS NULL \|\| person_name.voided = 0) AND person_name.preferred = 1"`
`17`	`17`	`}`
`18`	`18`	`},`
`@@ -32,20 +32,12 @@`
`32`	`32`	`"joinCondition": "t1.person_id = contact.person_id AND (contact.voided IS NULL \|\| contact.voided = 0) AND contact.person_attribute_type_id in (10, 48)"`
`33`	`33`	`}`
`34`	`34`	`},`
`35`		`- {`
`36`		`- "table": "etl.flat_hiv_summary_v15b",`
`37`		`- "alias": "fhsh",`
`38`		`- "join": {`
`39`		`- "type": "LEFT",`
`40`		`- "joinCondition": "t1.person_id = fhsh.person_id AND fhsh.next_clinical_location_id IS NULL AND fhsh.encounter_type NOT IN (99999) "`
`41`		`- }`
`42`		`- },`
`43`	`35`	`{`
`44`	`36`	`"table": "amrs.encounter_type",`
`45`	`37`	`"alias": "ety",`
`46`	`38`	`"join": {`
`47`	`39`	`"type": "LEFT",`
`48`		`- "joinCondition": "fhsh.encounter_type = ety.encounter_type_id"`
	`40`	`+ "joinCondition": "fhs.encounter_type = ety.encounter_type_id"`
`49`	`41`	`}`
`50`	`42`	`},`
`51`	`43`	`{`
`@@ -107,39 +99,39 @@`
`107`	`99`	`"alias": "has_pending_vl_test",`
`108`	`100`	`"expressionType": "simple_expression",`
`109`	`101`	`"expressionOptions": {`
`110`		`- "expression": "case when (timestampdiff(day,t2.vl_order_date,now()) between 0 and 14) and (t2.vl_1_date is null or t2.vl_order_date > t2.vl_1_date) then true else false end"`
	`102`	`+ "expression": "case when (timestampdiff(day,fhs.vl_order_date,now()) between 0 and 14) and (fhs.vl_1_date is null or fhs.vl_order_date > fhs.vl_1_date) then true else false end"`
`111`	`103`	`}`
`112`	`104`	`},`
`113`	`105`	`{`
`114`	`106`	`"type": "derived_column",`
`115`	`107`	`"alias": "current_vl",`
`116`	`108`	`"expressionType": "simple_expression",`
`117`	`109`	`"expressionOptions": {`
`118`		`- "expression": "t2.vl_1 "`
	`110`	`+ "expression": "fhs.vl_1 "`
`119`	`111`	`}`
`120`	`112`	`},`
`121`	`113`	`{`
`122`	`114`	`"type": "derived_column",`
`123`	`115`	`"alias": "current_vl_date",`
`124`	`116`	`"expressionType": "simple_expression",`
`125`	`117`	`"expressionOptions": {`
`126`		`- "expression": "date_format(t2.vl_1_date,'%d-%m-%Y')"`
	`118`	`+ "expression": "date_format(fhs.vl_1_date,'%d-%m-%Y')"`
`127`	`119`	`}`
`128`	`120`	`},`
`129`	`121`	`{`
`130`	`122`	`"type": "derived_column",`
`131`	`123`	`"alias": "last_vl_order_date",`
`132`	`124`	`"expressionType": "simple_expression",`
`133`	`125`	`"expressionOptions": {`
`134`		`- "expression": "date_format(t2.vl_order_date,'%d-%m-%Y')"`
	`126`	`+ "expression": "date_format(fhs.vl_order_date,'%d-%m-%Y')"`
`135`	`127`	`}`
`136`	`128`	`},`
`137`	`129`	`{`
`138`	`130`	`"type": "derived_column",`
`139`	`131`	`"alias": "days_since_last_order",`
`140`	`132`	`"expressionType": "simple_expression",`
`141`	`133`	`"expressionOptions": {`
`142`		`- "expression": "timestampdiff(day, t2.vl_order_date, now())"`
	`134`	`+ "expression": "timestampdiff(day, fhs.vl_order_date, now())"`
`143`	`135`	`}`
`144`	`136`	`},`
`145`	`137`	`{`
`@@ -153,12 +145,12 @@`
`153`	`145`	`{`
`154`	`146`	`"type": "simple_column",`
`155`	`147`	`"alias": "latest_rtc_date",`
`156`		`- "column": "date_format(fhsh.rtc_date, '%Y-%m-%d')"`
	`148`	`+ "column": "date_format(fhs.rtc_date, '%Y-%m-%d')"`
`157`	`149`	`},`
`158`	`150`	`{`
`159`	`151`	`"type": "simple_column",`
`160`	`152`	`"alias": "latest_vl",`
`161`		`- "column": "fhsh.vl_1"`
	`153`	`+ "column": "fhs.vl_1"`
`162`	`154`	`},`
`163`	`155`	`{`
`164`	`156`	`"type": "derived_column",`
`@@ -167,19 +159,19 @@`
`167`	`159`	`"expressionOptions": {`
`168`	`160`	`"caseOptions": [`
`169`	`161`	`{`
`170`		`- "condition": "fhsh.vl_1 < 50",`
	`162`	`+ "condition": "fhs.vl_1 < 50",`
`171`	`163`	`"value": "LDL"`
`172`	`164`	`},`
`173`	`165`	`{`
`174`		`- "condition": "(fhsh.vl_1 >= 50 and fhsh.vl_1 < 200)",`
	`166`	`+ "condition": "(fhs.vl_1 >= 50 and fhs.vl_1 < 200)",`
`175`	`167`	`"value": "Low Risk Low Level Viremia"`
`176`	`168`	`},`
`177`	`169`	`{`
`178`		`- "condition": "(fhsh.vl_1 >= 200 and fhsh.vl_1 < 1000)",`
	`170`	`+ "condition": "(fhs.vl_1 >= 200 and fhs.vl_1 < 1000)",`
`179`	`171`	`"value": "High Risk Low Level Viremia"`
`180`	`172`	`},`
`181`	`173`	`{`
`182`		`- "condition": "(fhsh.vl_1 > 1000)",`
	`174`	`+ "condition": "(fhs.vl_1 > 1000)",`
`183`	`175`	`"value": "Suspected Treatment Failure"`
`184`	`176`	`}`
`185`	`177`	`]`
`@@ -188,27 +180,27 @@`
`188`	`180`	`{`
`189`	`181`	`"type": "simple_column",`
`190`	`182`	`"alias": "latest_vl_date",`
`191`		`- "column": "date_format(fhsh.vl_1_date, '%Y-%m-%d')"`
	`183`	`+ "column": "date_format(fhs.vl_1_date, '%Y-%m-%d')"`
`192`	`184`	`},`
`193`	`185`	`{`
`194`	`186`	`"type": "simple_column",`
`195`	`187`	`"alias": "last_appointment",`
`196`		`- "column": "CONCAT(COALESCE(DATE_FORMAT(fhsh.encounter_datetime, '%Y-%m-%d'),''),' ',COALESCE(ety.name, ''))"`
	`188`	`+ "column": "CONCAT(COALESCE(DATE_FORMAT(fhs.encounter_datetime, '%Y-%m-%d'),''),' ',COALESCE(ety.name, ''))"`
`197`	`189`	`},`
`198`	`190`	`{`
`199`	`191`	`"type": "simple_column",`
`200`	`192`	`"alias": "cur_meds",`
`201`		`- "column": "fhsh.cur_arv_meds"`
	`193`	`+ "column": "fhs.cur_arv_meds"`
`202`	`194`	`},`
`203`	`195`	`{`
`204`	`196`	`"type": "simple_column",`
`205`	`197`	`"alias": "previous_vl",`
`206`		`- "column": "fhsh.vl_2"`
	`198`	`+ "column": "fhs.vl_2"`
`207`	`199`	`},`
`208`	`200`	`{`
`209`	`201`	`"type": "simple_column",`
`210`	`202`	`"alias": "previous_vl_date",`
`211`		`- "column": "date_format(fhsh.vl_2_date, '%Y-%m-%d')"`
	`203`	`+ "column": "date_format(fhs.vl_2_date, '%Y-%m-%d')"`
`212`	`204`	`},`
`213`	`205`	`{`
`214`	`206`	`"type": "simple_column",`