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

add sequencing tab

Browse Source
This commit is contained in:
Khantey Long
2026-03-30 11:04:03 +07:00
parent 34358e3ee7
commit f0a5079b15
12 changed files with 125979 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dashboard/app/Http/Controllers/Api/DashboardController.php
View File

@@ -155,19 +155,49 @@ class DashboardController extends Controller
// return response()->json(['error' => 'Missing epiweek range'], 400);
// }
return response()->json($data);
}
// return response()->json($data);
// }
public function fetchSourceData(){
try{
public function fetchSourceData()
{
try {
$this->dataRetrievalService->getSurveillanceData();
return response()->json(['message' => 'Data loaded successfully!'], 200);
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return response()->json(['error' => 'Data loaded unsuccessfully!'], 400);
}
}
/*
|--------------------------------------------------------------------------
| Sequencing Dashboard
|--------------------------------------------------------------------------
*/
public function sequencing(Request $request)
{
$surveillanceId = (int) $request->query('surveillance_id');
$range = $this->getEpiRange($request);
if (!$surveillanceId || !$range) {
return response()->json(['error' => 'Missing parameters'], 400);
}
return response()->json([
'trend' => $this->service->sequencingTrend(
$surveillanceId,
$range['startYear'],
$range['startWeek'],
$range['endYear'],
$range['endWeek']
),'distribution' => $this->service->subtypeDistribution(
$surveillanceId,
$range['startYear'],
$range['startWeek'],
$range['endYear'],
$range['endWeek']
)
]);
}
}

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

@@ -727,28 +727,20 @@ class DashboardService
$q->select('lab_code')
->from('surveillance_cases')
->where('surveillance_id', $surveillanceId)
->whereRaw(
"(year_data > ? OR (year_data = ? AND week_data >= ?))",
[$startYear, $startYear, $startWeek]
)
->whereRaw(
"(year_data < ? OR (year_data = ? AND week_data <= ?))",
[$endYear, $endYear, $endWeek]
);
->whereRaw("(year_data > ? OR (year_data = ? AND week_data >= ?))", [$startYear, $startYear, $startWeek])
->whereRaw("(year_data < ? OR (year_data = ? AND week_data <= ?))", [$endYear, $endYear, $endWeek]);
})
->where('case_lab_results.is_positive', 1)
->selectRaw("
case_lab_results.subtype,
COALESCE(NULLIF(case_lab_results.subtype, ''), 'Unsubtyped') as subtype,
COUNT(DISTINCT case_lab_results.lab_code) as total
")
->whereNotNull('case_lab_results.subtype')
->where('case_lab_results.subtype', '!=', '')
->where('case_lab_results.subtype', '!=', 'Positive')
->groupBy('case_lab_results.subtype')
->groupBy('subtype')
->orderByDesc('total')
->get();
@@ -846,5 +838,40 @@ class DashboardService
->get();
}
/*
|--------------------------------------------------------------------------
| sequencing trend
|--------------------------------------------------------------------------
*/
public function sequencingTrend($surveillanceId, $startYear, $startWeek, $endYear, $endWeek)
{
return CaseLabResult::join(
'surveillance_cases',
'case_lab_results.lab_code',
'=',
'surveillance_cases.lab_code'
)
->where('surveillance_cases.surveillance_id', $surveillanceId)
->where('case_lab_results.is_positive', 1)
->whereNotNull('subtype')
->where(function ($q) use ($startYear, $startWeek, $endYear, $endWeek) {
$q->whereRaw("(year_data > ? OR (year_data = ? AND week_data >= ?))", [$startYear, $startYear, $startWeek])
->whereRaw("(year_data < ? OR (year_data = ? AND week_data <= ?))", [$endYear, $endYear, $endWeek]);
})
->selectRaw("
surveillance_cases.week_data as period,
subtype,
COUNT(DISTINCT surveillance_cases.lab_code) as total
")
->groupBy('period', 'subtype')
->orderBy('period')
->get();
}
}