modified Sequencing Page

dashboard/app/Services/DashboardService.php

@@ -1020,7 +1020,7 @@ class DashboardService
             })
 
             ->selectRaw("
-                surveillance_cases.week_data as period,
+                concat(surveillance_cases.year_data,'-',surveillance_cases.week_data) as period,
                 subtype,
                 COUNT(DISTINCT surveillance_cases.lab_code) as total
             ")
@@ -1029,4 +1029,34 @@ class DashboardService
             ->orderBy('period')
             ->get();
     }
+
+
+    public function influenzaRelativeOverTimeSequencing($startYear, $startWeek, $endYear, $endWeek)
+    {
+        return SurveillanceCase::join('case_lab_results', function ($join) {
+            $join->on('surveillance_cases.lab_code', '=', 'case_lab_results.lab_code')
+                ->on('surveillance_cases.surveillance_id', '=', 'case_lab_results.surveillance_id');
+        })
+            ->where(function ($q) use ($startYear, $startWeek, $endYear, $endWeek) {
+                $q->whereRaw(
+                    "(surveillance_cases.year_data * 100 + surveillance_cases.week_data) BETWEEN ? AND ?",
+                    [
+                        $startYear * 100 + $startWeek,
+                        $endYear * 100 + $endWeek
+                    ]
+                );
+            })
+            ->whereRaw('case_lab_results.is_positive = 1 and surveillance_cases.surveillance_id in(6) and case_lab_results.indicator="Influenza"')
+            ->selectRaw("
+                case_lab_results.pathogen_name as lineage,
+                concat(surveillance_cases.year_data,'-',surveillance_cases.week_data) as week,
+                COUNT(DISTINCT surveillance_cases.lab_code) as total
+            ")
+            ->groupBy(
+                'case_lab_results.pathogen_name',
+                'week'
+            )
+            ->get();
+    }
+
 }