khantey/nrml_dashboard
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Khantey Long
2026-07-06 16:38:24 +07:00
parent 5d2c055912
commit 8182a8d4d5
5 changed files with 52 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dashboard/app/Services/DashboardService.php
View File

@@ -307,11 +307,11 @@ class DashboardService
->whereRaw(
"(year_data < ?
OR (
year_data = ?
AND week_data <= ?
)
)",
OR (
year_data = ?
AND week_data <= ?
)
)",
[
$endYear,
$endYear,
@@ -386,11 +386,11 @@ class DashboardService
$q->whereRaw(
"(year_data > ?
OR (
year_data = ?
AND week_data >= ?
)
)",
OR (
year_data = ?
AND week_data >= ?
)
)",
[
$startYear,
$startYear,
@@ -400,11 +400,11 @@ class DashboardService
->whereRaw(
"(year_data < ?
OR (
year_data = ?
AND week_data <= ?
)
)",
OR (
year_data = ?
AND week_data <= ?
)
)",
[
$endYear,
$endYear,
@@ -1063,7 +1063,7 @@ class DashboardService
->whereRaw('case_lab_results.is_positive = 1 and surveillance_cases.surveillance_id=6 and case_lab_results.indicator="Covid-19" and case_lab_results.pathogen_name not in("","unable to align","N/A","NA")')
->selectRaw("
case_lab_results.pathogen_name as lineage,
concat(surveillance_cases.year_data,'-',surveillance_cases.week_data) as week,
concat(surveillance_cases.year_data,'-W',surveillance_cases.week_data) as week,
COUNT(DISTINCT surveillance_cases.lab_code) as total
")
->groupBy(
@@ -1091,7 +1091,7 @@ class DashboardService
->whereRaw('case_lab_results.is_positive = 1 and surveillance_cases.surveillance_id not in(6) and case_lab_results.indicator="Influenza"')
->selectRaw("
case_lab_results.subtype as lineage,
concat(surveillance_cases.year_data,'-',surveillance_cases.week_data) as week,
concat(surveillance_cases.year_data,'-W',surveillance_cases.week_data) as week,
COUNT(DISTINCT surveillance_cases.lab_code) as total
")
->groupBy(