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

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-02-07 10:09:28 +07:00
parent e6556e5a90 dd81dbaa6f
commit c4388bd473
13 changed files with 144 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,6 +275,7 @@ class ClaimController extends Controller
'No',
'Code',
'Date Submission',
'Date Admission',
'Date Discharge',
'Provider',
'Member ID (BN)',
@@ -320,6 +321,7 @@ class ClaimController extends Controller
->select(
DB::raw('1 AS no'),
'request_logs.submission_date',
'request_logs.created_at',
'request_logs.discharge_date',
'request_logs.organization_id',
'request_logs.id',
@@ -328,10 +330,15 @@ class ClaimController extends Controller
'request_logs.code',
'request_logs.diagnosis',
'request_logs.keterangan',
'request_logs.catatan'
'request_logs.catatan',
DB::raw('
(Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits
WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill
')
)
->groupBy(
'request_logs.submission_date',
'request_logs.created_at',
'request_logs.discharge_date',
'request_logs.organization_id',
'request_logs.id',
@@ -340,7 +347,8 @@ class ClaimController extends Controller
'request_logs.code',
'request_logs.diagnosis',
'request_logs.keterangan',
'request_logs.catatan'
'request_logs.catatan',
'tot_bill'
)
->orderBy('request_logs.submission_date')
->get();
@@ -455,6 +463,7 @@ class ClaimController extends Controller
}
$total_billing = 0;
$lastIndex = count($dataClaimLog) - 1;
$firtIndex = 0;
if (isset($dataClaimLog) && count($dataClaimLog) > 0)
{
foreach ($dataClaimLog as $index => $item_benefit)
@@ -463,6 +472,7 @@ class ClaimController extends Controller
$rowData = [
$check_first_id != $item->id ? $no : $no,
!empty($item->code) ? $item->code : '',
!empty($item->created_at) ? $item->created_at : '',
!empty($item->submission_date) ? $item->submission_date : '',
!empty($item->discharge_date) ? $item->discharge_date : '',
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
@@ -473,7 +483,7 @@ class ClaimController extends Controller
'LinkSehat',
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
($lastIndex == $index ? $total_billing : ''),
($firtIndex == $index ? $item->tot_bill : ''),
!empty($item_benefit->code) ? $item_benefit->code : '',
!empty($item_benefit->benfit) ? $item_benefit->benfit : '',
!empty($item_benefit->amount_incurred) ? $item_benefit->amount_incurred : '',
@@ -495,6 +505,7 @@ class ClaimController extends Controller
$rowData = [
$check_first_id != $item->id ? $no : '',
!empty($item->code) ? $item->code : '',
!empty($item->created_at) ? $item->created_at : '',
!empty($item->submission_date) ? $item->submission_date : '',
!empty($item->discharge_date) ? $item->discharge_date : '',
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
@@ -531,9 +542,9 @@ class ClaimController extends Controller
->build();
$grand_total_billing = 0;
foreach ($dataRow as $rowData) {
if (is_numeric($rowData[12])) {
if (is_numeric($rowData[13])) {
// Jumlahkan nilai angka ke total
$grand_total_billing += $rowData[12];
$grand_total_billing += $rowData[13];
}
$row = WriterEntityFactory::createRowFromArray($rowData, $style);
$writer->addRow($row);
@@ -552,6 +563,7 @@ class ClaimController extends Controller
'',
'',
'',
'',
$grand_total_billing,
'',
'',

7
Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
View File

@@ -39,6 +39,13 @@ class DataServiceMonitoring extends JsonResource
'diagnosis' => $filesFinalLogDiagnosis,
'kondisi' => $filesFinalLogKondisi,
];
} else {
$files = [
'result' => [],
'diagnosis' => [],
'kondisi' => [],
];
}

2
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -224,6 +224,7 @@ class DailyMonitoringController extends Controller
$validator = Validator::make($request->all(),[
'request_code' => 'required|exists:request_logs,code',
'subject' => 'required',
'submission_date' => 'required',
'body_temperature' => 'required|numeric',
'sistole' => 'required|numeric',
'diastole' => 'required|numeric',
@@ -251,6 +252,7 @@ class DailyMonitoringController extends Controller
// insert claim daily monitoring
$db_response = RequestDailyMonitoring::create([
'request_log_id' => $request_log->id,
'submission_date' => $request->submission_date,
'subject' => $request->subject,
'sistole' => $request->sistole,
'diastole' => $request->diastole,