Merge branch 'AMPATH:master' into POC-544-v2

AMPATH · Feb 15, 2024 · 75b2286 · 75b2286
2 parents b6679c2 + 5e6fc83
commit 75b2286
Show file tree

Hide file tree

Showing 4 changed files with 313 additions and 167 deletions.
diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json
@@ -657,6 +657,21 @@
       "alias": "latest_vl",
       "column": "fh.vl_1"
     },
+    {
+      "type": "simple_column",
+      "alias": "weight",
+      "column": "fh.weight"
+    },
+    {
+      "type": "simple_column",
+      "alias": "cd4_1",
+      "column": "fh.cd4_1"
+    },
+    {
+      "type": "simple_column",
+      "alias": "cd4_1_date",
+      "column": "date_format(fh.cd4_1_date, '%Y-%m-%d')"
+    },
     {
       "type": "derived_column",
       "alias": "vl_category",

diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-patient-list-cols.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-patient-list-cols.json
@@ -28,6 +28,11 @@
       "field": "age",
       "width": 100
     },
+    {
+      "headerName": "Weight",
+      "field": "weight",
+      "width": 100
+    },
     {
       "headerName": "Identifiers",
       "field": "identifiers",
@@ -48,6 +53,16 @@
       "field": "latest_rtc_date",
       "width": 100
     },
+    {
+      "headerName": "CD4",
+      "field": "cd4_1",
+      "width": 100
+    },
+    {
+      "headerName": "CD4 Date",
+      "field": "cd4_1_date",
+      "width": 100
+    },
     {
       "headerName": "Latest VL",
       "field": "latest_vl",