visits

d-tree-org · Jul 17, 2024 · 4b4df81 · 4b4df81
1 parent d4462c3
commit 4b4df81
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/src/app/(dashboard)/stats/actions.ts b/src/app/(dashboard)/stats/actions.ts
@@ -102,6 +102,42 @@ export async function fetchData(formData: FormData) {
     createPatientFilters(["newly-diagnosed-client"], null, baseFilter, true),
     createPatientFilters(["client-already-on-art"], null, baseFilter, true),
     createPatientFilters(["exposed-infant"], null, baseFilter, true),
+    createQuestionnaireResponseFilters(
+      "patient-finish-visit",
+      rawDate,
+      baseFilter,
+      true,
+      [
+        {
+          "subject:Patient._tag":
+            "https://d-tree.org/fhir/patient-meta-tag|newly-diagnosed-client",
+        },
+      ]
+    ),
+    createQuestionnaireResponseFilters(
+      "patient-finish-visit",
+      rawDate,
+      baseFilter,
+      true,
+      [
+        {
+          "subject:Patient._tag":
+            "https://d-tree.org/fhir/patient-meta-tag|client-already-on-art",
+        },
+      ]
+    ),
+    createQuestionnaireResponseFilters(
+      "patient-finish-visit",
+      rawDate,
+      baseFilter,
+      true,
+      [
+        {
+          "subject:Patient._tag":
+            "https://d-tree.org/fhir/patient-meta-tag|exposed-infant",
+        },
+      ]
+    ),
   ]);
   const summary: string[] = [
     "Total visits",
@@ -113,6 +149,9 @@ export async function fetchData(formData: FormData) {
     "Newly diagnosed clients (all)",
     "Already on Art (all)",
     "Exposed infant (all)",
+    "Newly diagnosed clients (visits)",
+    "Already on Art (visits)",
+    "Exposed infant (visits)",
   ];
 
   return {

diff --git a/src/app/(dashboard)/stats/filters.ts b/src/app/(dashboard)/stats/filters.ts
@@ -11,7 +11,8 @@ export const createQuestionnaireResponseFilters = (
   questionnaire: string,
   date: string | string[] | null,
   baseFilter: Record<string, string>[],
-  hasCount = true
+  hasCount = true,
+  extras: Record<string, string>[] = []
 ) => {
   const query = new QueryParam({
     questionnaire: questionnaire,
@@ -39,6 +40,9 @@ export const createQuestionnaireResponseFilters = (
         .join(",")
     );
   }
+
+  query.fromArray(extras);
+
   return query.toUrl("/QuestionnaireResponse");
 };