Update

src/app/(dashboard)/stats/actions.ts

@@ -99,14 +99,20 @@ export async function fetchData(formData: FormData) {
       baseFilter,
       false
     ),
+    createPatientFilters(["newly-diagnosed-client"], null, baseFilter, true),
+    createPatientFilters(["client-already-on-art"], null, baseFilter, true),
+    createPatientFilters(["exposed-infant"], null, baseFilter, true),
   ]);
   const summary: string[] = [
     "Total visits",
-    "Newly diagnosed clients (created)",
-    "Already on Art (created)",
-    "Exposed infant (created)",
+    "Newly diagnosed clients (new)",
+    "Already on Art (new)",
+    "Exposed infant (new)",
     "Milestone answered",
     "VL collected answered",
+    "Newly diagnosed clients (all)",
+    "Already on Art (all)",
+    "Exposed infant (all)",
   ];
 
   return {

src/app/(dashboard)/stats/filters.ts

@@ -11,7 +11,7 @@ export const createQuestionnaireResponseFilters = (
   questionnaire: string,
   date: string | string[] | null,
   baseFilter: Record<string, string>[],
-  hasCount = true,
+  hasCount = true
 ) => {
   const query = new QueryParam({
     questionnaire: questionnaire,
@@ -45,13 +45,16 @@ export const createQuestionnaireResponseFilters = (
 export const createPatientFilters = (
   types: PatientType[] | undefined = undefined,
   date: string | string[] | null,
-  baseFilter: Record<string, string>[]
+  baseFilter: Record<string, string>[],
+  onlyActive = false
 ) => {
   const query = new QueryParam({
     _summary: "count",
   });
   query.fromArray(baseFilter);
-
+  if (onlyActive) {
+    query.add("active", true);
+  }
   query.remove("date");
   query.remove("dateRange");
   if (date) {