Surge/rri daily report implementation post commit (AMPATH#1165)

jecihjoy · Apr 7, 2022 · 7e4f02f · 7e4f02f
1 parent beb0f5a
commit 7e4f02f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/app/reporting-framework/json-reports/surge-daily-report-base.json b/app/reporting-framework/json-reports/surge-daily-report-base.json
@@ -205,6 +205,11 @@
       "alias": "arv_first_regimen_names",
       "column": "sdr.arv_first_regimen_names"
     },
+    {
+      "type": "simple_column",
+      "alias": "arv_first_regimen",
+      "column": "sdr.arv_first_regimen"
+    },
     {
       "type": "derived_column",
       "alias": "arv_first_regimen_start_date",

diff --git a/service/surge-reports/surge-daily-report-service.js b/service/surge-reports/surge-daily-report-service.js
@@ -51,15 +51,10 @@ export class SurgeDailyReportService {
         };
         delete results['result'];
 
-        _.each(results.results, (element) => {
-          if (element.arv_first_regimen_names) {
+        _.each(results.results.results.results, (element) => {
+          if (element.arv_first_regimen) {
             element.arv_first_regimen_names = helpers.getARVNames(
-              element.arv_first_regimen_names
-            );
-          }
-          if (element.cur_arv_meds_names) {
-            element.cur_arv_meds_names = helpers.getARVNames(
-              element.cur_arv_meds_names
+              element.arv_first_regimen
             );
           }
           if (element.cur_meds) {

diff --git a/service/surge-reports/surge-daily-report.json b/service/surge-reports/surge-daily-report.json
@@ -126,16 +126,16 @@
         "description": "Those defaulted their medication refill date for more than 28 days",
         "indicator": "is_med_ltfu_after_sep19_unresolved"
       },
-      {
-        "label": "Missed appointments (0 - 28 days)",
-        "description": "Missed appointments (0 - 28 days)",
-        "indicator": "missed_appnts_total_today"
-      },
       {
         "label": "Graduated to LTFUs today",
         "description": "Those defaulted their clinical tca for more than 28 days today",
         "indicator": "newly_ltfu_today"
       },
+      {
+        "label": "Missed appointments (0 - 28 days)",
+        "description": "Missed appointments (0 - 28 days)",
+        "indicator": "missed_appnts_total_today"
+      },
       {
         "label": "Missed appointments outcomes today (BTC)",
         "description": "Missed appointments outcomes today brought back",

diff --git a/service/surge-reports/surge-report.service.js b/service/surge-reports/surge-report.service.js
@@ -90,19 +90,14 @@ export class SurgeService extends SurgeMultiDatasetPatientlistReport {
         };
         delete results['result'];
 
-        _.each(results.results, (element) => {
-          if (element.arv_first_regimen_names) {
+        _.each(results.results.results.results, (element) => {
+          if (element.arv_first_regimen) {
             element.arv_first_regimen_names = helpers.getARVNames(
-              element.arv_first_regimen_names
+              element.arv_first_regimen
             );
           }
-          if (element.cur_arv_meds_names) {
-            element.cur_arv_meds_names = helpers.getARVNames(
-              element.cur_arv_meds_names
-            );
-          }
-          if (element.cur_meds) {
-            element.cur_meds = helpers.getARVNames(element.cur_meds);
+          if (element.cur_arv_meds) {
+            element.cur_meds = helpers.getARVNames(element.cur_arv_meds);
           }
         });
         resolve(results);