Add logic for controlling dates check for data being aggregated

udsm-dhis2-lab · Dec 13, 2024 · 2b5f562 · 2b5f562
1 parent a07309c
commit 2b5f562
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/scripts/create-queries.js b/scripts/create-queries.js
@@ -156,7 +156,11 @@ async function processMappings(datastoreKeyData) {
       }
 
       query += `LEFT JOIN patient_flat pt ON pt.id = en.patient_id \n `;
-      query += `AND en.period_start >= '${startDate}' AND en.period_start <= '${endDate}' \n`;
+
+      query +=
+        loincOrderCodes.length > 0
+          ? `AND drep.effective_datetime >='${startDate}' AND drep.effective_datetime <='${endDate}' \n`
+          : `AND en.period_start >= '${startDate}' AND en.period_start <= '${endDate}' \n`;
 
       query += ` GROUP BY `;
       query += icdCodes && icdCodes.length > 0 ? `cond.code,` : "";