tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-01-16 16:50:08 +07:00
parent 12ef4c167f 96381e4a82
commit 4ec126de89
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/Client/Http/Controllers/Api/ClaimController.php
View File

@@ -269,7 +269,8 @@ class ClaimController extends Controller
public function exportAlrmCenter($corporate_id, $start, $end) public function exportAlrmCenter($corporate_id, $start, $end)
{ {
$writer = WriterEntityFactory::createXLSXWriter(); $writer = WriterEntityFactory::createXLSXWriter();
$writer->openToFile(public_path('files/Claim-Data-Corporate-'. date('Y-m-d').'.xlsx')); $writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx'));
$header = [ $header = [
'No', 'No',
'Code', 'Code',
@@ -305,15 +306,18 @@ class ClaimController extends Controller
->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id') ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
->where('corporate_employees.corporate_id', '=', $corporate_id) ->where('corporate_employees.corporate_id', '=', $corporate_id)
->where('request_logs.submission_date', '>', $start) ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
->where('request_logs.submission_date', '<', $end) $query->where('request_logs.submission_date', '>', $start)
->where('request_logs.submission_date', '<', $end);
})
->select( ->select(
DB::raw('1 AS no'), DB::raw('1 AS no'),
'request_logs.organization_id', 'request_logs.organization_id',
'request_logs.id', 'request_logs.id',
'request_logs.member_id', 'request_logs.member_id',
'request_logs.service_code', 'request_logs.service_code',
'request_logs.code' 'request_logs.code',
'request_logs.diagnosis'
) )
->get(); ->get();
@@ -446,7 +450,7 @@ class ClaimController extends Controller
!empty($item_benefit->amount_approved) ? $item_benefit->amount_approved : '', !empty($item_benefit->amount_approved) ? $item_benefit->amount_approved : '',
!empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '', !empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '',
!empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '', !empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '',
!empty($item_benefit->keterangan) ? $item_benefit->keterangan : '', !empty($item->diagnosis) ? $item->diagnosis : '',
]; ];
array_push($dataRow,$rowData); array_push($dataRow,$rowData);
@@ -496,8 +500,8 @@ class ClaimController extends Controller
$writer->close(); $writer->close();
return Helper::responseJson([ return Helper::responseJson([
'file_name' => 'Claim-Data-Corporate-'. date('Y-m-d'), 'file_name' => 'Report-Data-Alarm-Center-'. $start.'-'.$end,
"file_url" => url('files/Claim-Data-Corporate-'. date('Y-m-d').'.xlsx') "file_url" => url('files/Report-Data-Alarm-Center-'. $start.'-'.$end.'.xlsx')
]); ]);
} }
} }

3
frontend/client-portal/src/pages/AlarmCenter/List.tsx
View File

@@ -192,10 +192,11 @@ export default function List() {
/* -------------------------------- handle export --------------------------- */ /* -------------------------------- handle export --------------------------- */
const handleExportReport = async () => { const handleExportReport = async () => {
var filter = Object.fromEntries([...searchParams.entries()]); var filter = Object.fromEntries([...searchParams.entries()]);
await axios await axios
.get(corporateValue + '/claims/exportAlrmCenter/'+startDateValue+'/'+endDateValue, { params: filter }) .get(corporateValue + '/claims/exportAlrmCenter/'+(startDateValue ? startDateValue : 'all')+'/'+(endDateValue ? endDateValue : 'all'), { params: filter })
.then((res) => { .then((res) => {
enqueueSnackbar('Data berhasil di Export', { enqueueSnackbar('Data berhasil di Export', {
variant: 'success', variant: 'success',