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-01-24 09:38:51 +07:00
parent 6bbb0e7ad8 f027970987
commit fb87a39ff2
12 changed files with 531 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,6 +284,7 @@ class ClaimController extends Controller
'Payor ID',
'Corporate name',
'Policy Number',
'Total Billing',
'Benefit Code',
'Benefit Desc',
'Amt Incurred',
@@ -451,10 +452,13 @@ class ClaimController extends Controller
{
$no += $item->no;
}
$total_billing = 0;
$lastIndex = count($dataClaimLog) - 1;
if (isset($dataClaimLog) && count($dataClaimLog) > 0)
{
foreach ($dataClaimLog as $item_benefit)
foreach ($dataClaimLog as $index => $item_benefit)
{
$total_billing += !empty($item_benefit->amount_approved) ? $item_benefit->amount_approved : 0;
$rowData = [
$check_first_id != $item->id ? $no : '',
!empty($item->code) ? $item->code : '',
@@ -468,6 +472,7 @@ class ClaimController extends Controller
'LinkSehat',
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
($lastIndex == $index ? $total_billing : ''),
!empty($item_benefit->code) ? $item_benefit->code : '',
!empty($item_benefit->benfit) ? $item_benefit->benfit : '',
!empty($item_benefit->amount_incurred) ? $item_benefit->amount_incurred : '',
@@ -506,6 +511,9 @@ class ClaimController extends Controller
'',
'',
'',
'',
'',
'',
];
array_push($dataRow,$rowData);

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

@@ -20,7 +20,7 @@ class OptionController extends Controller
{
$request->validate([
'type' => 'required',
'search' => 'required'
// 'search' => 'required'
]);
switch ($request->type) {

43
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -5,6 +5,7 @@ namespace Modules\Internal\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Models\RequestLog;
use App\Models\Organization;
use App\Models\Icd;
use App\Services\ClaimService;
use App\Services\ImportService;
use Illuminate\Contracts\Support\Renderable;
@@ -193,6 +194,20 @@ class RequestLogController extends Controller
return Helper::responseJson(data: RequestLogShowResource::make($claimRequest));
}
public function diagnosis(){
$icds = Icd::query()
->get();
$manipulatedIcds = $icds->map(function ($icd) {
// Contoh manipulasi, tambahkan atau ubah properti sesuai kebutuhan
return [
'value' => $icd->code, // Ganti dengan properti yang sesuai dari model Icd
'label' => $icd->code . ' - ' .$icd->name, // Ganti dengan properti yang sesuai dari model Icd
];
});
return Helper::responseJson(data: $manipulatedIcds);
}
/**
* Show the form for editing the specified resource.
* @param int $id
@@ -366,14 +381,32 @@ class RequestLogController extends Controller
// Update Request LOG untuk lanjut ke Final LOG
$requestLog->catatan = $request->catatan;
if (!empty($request->catatan)) {
$requestLog->catatan = $request->catatan;
}
if ($request->discharge_date) {
$requestLog->discharge_date = $request->discharge_date;
}
if (!empty($request->icdCodes)) {
$diagnosis = implode(',', $request->icdCodes);
$requestLog->diagnosis = $diagnosis;
}
if (!empty($request->status)) {
$requestLog->status_final_log = $status;
}
if (!empty($request->reason)) {
$requestLog->reason_final = $request->reason;
}
$requestLog->final_log = 1;
$requestLog->status_final_log = $status;
$requestLog->approved_final_log_by = auth()->user()->id;
$requestLog->approved_final_log_at = Carbon::now();
if($requestLog->service_code != 'IP'){
$requestLog->discharge_date = Carbon::now();
}
// if($requestLog->service_code != 'IP'){
// $requestLog->discharge_date = Carbon::now();
// }
$requestLog->save();

5
Modules/Internal/Routes/api.php
View File

@@ -263,7 +263,10 @@ Route::prefix('internal')->group(function () {
Route::get('customer-service/request/data', [RequestLogController::class, 'generateDataRequestLogExcel']);
Route::post('customer-service/request/final-log', [RequestLogController::class, 'updateFinalLog']);
// search diagnosis
Route::get('diagnosis', [RequestLogController::class, 'diagnosis']);
// insert benefit
Route::post('customer-service/request/insert-benefit', [RequestLogBenefitController::class, 'store']);
Route::delete('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'destroy']);

13
Modules/Internal/Transformers/RequestLogShowResource.php
View File

@@ -82,11 +82,21 @@ class RequestLogShowResource extends JsonResource
->where('corporate_id', $corporateId)
->first();
// Diagnosis
$icd = [];
if($requestLog['diagnosis']){
$diagnosis = explode(',', $requestLog['diagnosis']);
$icd = Icd::query()
->whereIn('code', $diagnosis)
->select('code', 'name')
->get();
}
$data = [
'id' => $requestLog['id'],
'code' => $requestLog['code'],
'member_id' => $requestLog['member']['member_id'],
'corporate_id' => $corporateId,
'policy_number' =>$policyNumber->code ? $policyNumber->code : '-',
'name' => $requestLog['member']['name'],
'date_of_birth' => $requestLog['member']['birth_date'],
@@ -97,6 +107,7 @@ class RequestLogShowResource extends JsonResource
'principal_name' => $requestLog['member']['principal_id'] ? Helper::principalName($requestLog['member']['principal_id']) : '-',
'relation_with_principal' => Helper::relationWithPrincipal($requestLog['member']['relation_with_principal']),
'submission_date' => $requestLog['submission_date'],
'discharge_date' => $requestLog['discharge_date'],
'service_type' => Helper::serviceName($requestLog['service_code']),
'claim_method' => $requestLog['payment_type'],
'status' => $requestLog['status'],
@@ -114,7 +125,7 @@ class RequestLogShowResource extends JsonResource
'penempatan_kamar' => $requestLog['penempatan_kamar'],
'catatan' => $requestLog['catatan'],
'reason' => $requestLog['reason'],
'diagnosis' => $icd,
];