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-05-20 08:49:14 +07:00
parent 15cc88403f f83a7954aa
commit ffb7e0bc08
107 changed files with 9366 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,9 @@ class ClaimController extends Controller
'Excess Paid',
'Diagnosis',
'Keterangan',
'Catatan'
'Catatan',
'Invoice No',
'Billing No'
];
$style = (new StyleBuilder())
->setFontBold()
@@ -336,7 +338,9 @@ class ClaimController extends Controller
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 AND request_log_benefits.deleted_at IS NULL LIMIT 1) AS tot_bill
')
'),
'request_logs.invoice_no',
'request_logs.billing_no',
)
->groupBy(
'request_logs.submission_date',
@@ -509,6 +513,8 @@ class ClaimController extends Controller
!empty($item->diagnosis) ? $item->diagnosis : '',
!empty($item->keterangan) ? $item->keterangan : '',
!empty($item->catatan) ? $item->catatan : '',
!empty($item->invoice_no) ? $item->invoice_no : '',
!empty($item->billing_no) ? $item->billing_no : '',
];
array_push($dataRow,$rowData);
@@ -543,6 +549,8 @@ class ClaimController extends Controller
'',
'',
'',
!empty($item->invoice_no) ? $item->invoice_no : '',
!empty($item->billing_no) ? $item->billing_no : '',
];
array_push($dataRow,$rowData);

19
Modules/Client/Routes/api.php
View File

@@ -14,6 +14,10 @@ use Modules\Internal\Http\Controllers\ClaimEncounterController;
use Modules\Client\Http\Controllers\Api\ClaimReportController;
use Modules\Client\Http\Controllers\Api\ClaimRequestController;
use Modules\Client\Http\Controllers\Api\DataController;
use Modules\Internal\Http\Controllers\Api\FormulariumController;
use Modules\Internal\Http\Controllers\Api\FormulariumTemplateController;
use Modules\Internal\Http\Controllers\Api\AuditTrailController;
use Modules\Internal\Http\Controllers\Api\CorporateController;
/*
|--------------------------------------------------------------------------
@@ -71,5 +75,20 @@ Route::prefix('client')->group(function () {
Route::post('claim-requests', [ClaimRequestController::class, 'store'])->name('claim-requests.store');
Route::post('claim-requests/{id}', [ClaimRequestController::class, 'show'])->name('claim-requests.show');
Route::get('master/formulariums/{formulariums_template_id}', [FormulariumController::class, 'index']);
Route::post('master/formulariums/{formulariums_template_id}', [FormulariumController::class, 'store']);
Route::post('master/formulariums/{formulariums_template_id}/import', [FormulariumController::class, 'import']);
Route::get('master/formulariums/{formulariums_template_id}/list', [FormulariumController::class, 'generateFormulariumList']);
Route::get('master/formularium-template', [FormulariumTemplateController::class, 'index']);
Route::get('master/formularium-template/search', [FormulariumTemplateController::class, 'search']);
Route::post('master/formularium-template/store', [FormulariumTemplateController::class, 'store']);
Route::put('master/formularium-template/{id}/activation', [FormulariumTemplateController::class, 'activation']);
Route::get('master/formularium-template/{id}/edit', [FormulariumTemplateController::class, 'edit']);
Route::put('master/formularium-template/{id}/update', [FormulariumTemplateController::class, 'update']);
Route::get('audittrail/{corporate_id}', [AuditTrailController::class, 'index']);
Route::get('corporates/import-document-example/{document_type}', [CorporateController::class, 'importDocumentExample']);
});
});