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

bugs fixi di production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-03-05 13:20:35 +07:00
parent c1b1270972
commit 3fbc4c2cd1
6 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder; use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Common\Entity\Style\CellAlignment; use Box\Spout\Common\Entity\Style\CellAlignment;
use Box\Spout\Common\Entity\Style\Color; use Box\Spout\Common\Entity\Style\Color;
use Carbon\Carbon;
class ClaimController extends Controller class ClaimController extends Controller
{ {
@@ -316,7 +317,7 @@ class ClaimController extends Controller
->where('request_logs.deleted_at', '=', null) ->where('request_logs.deleted_at', '=', null)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) { ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start) $query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', $end); ->where('request_logs.submission_date', '<=', Carbon::parse($end)->addDay());
}) })
->select( ->select(
DB::raw('1 AS no'), DB::raw('1 AS no'),
@@ -455,6 +456,7 @@ class ClaimController extends Controller
//Data Benefit //Data Benefit
$dataClaimLog = DB::table('request_log_benefits') $dataClaimLog = DB::table('request_log_benefits')
->where('request_log_benefits.request_log_id', '=', $item->id) ->where('request_log_benefits.request_log_id', '=', $item->id)
->where('request_log_benefits.deleted_at', null)
->select( ->select(
'*', '*',
DB::raw(' DB::raw('

1
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -699,6 +699,7 @@ class RequestLogController extends Controller
$dataClaimLog = DB::table('request_log_benefits') $dataClaimLog = DB::table('request_log_benefits')
->where('request_log_benefits.request_log_id', '=', $request_log_id) ->where('request_log_benefits.request_log_id', '=', $request_log_id)
->where('request_log_benefits.deleted_at', null)
->select( ->select(
'*', '*',
DB::raw(' DB::raw('

6
Modules/Internal/Http/Controllers/Api/RequestLogBenefitController.php
View File

@@ -74,7 +74,7 @@ class RequestLogBenefitController extends Controller
'excess_paid' => $value['excess_paid'], 'excess_paid' => $value['excess_paid'],
'keterangan' => $value['keterangan'], 'keterangan' => $value['keterangan'],
'created_by' => auth()->user()->id, 'created_by' => auth()->user()->id,
'reason' => $value['reason'] ? $value['reason'] : null , // 'reason' => $value['reason'] ? $value['reason'] : null ,
]; ];
// Insert Data // Insert Data
@@ -92,8 +92,8 @@ class RequestLogBenefitController extends Controller
} }
$requestLogBenefit = RequestLogBenefit::insert($data); // $requestLogBenefit = RequestLogBenefit::insert($data);
return $requestLogBenefit; // return $requestLogBenefit;
} }
/** /**

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

@@ -401,9 +401,9 @@ class RequestLogController extends Controller
// Update Request LOG untuk lanjut ke Final LOG // Update Request LOG untuk lanjut ke Final LOG
if (!empty($request->catatan)) { // if (!empty($request->catatan)) {
$requestLog->catatan = $request->catatan; $requestLog->catatan = $request->catatan;
} // }
if ($request->discharge_date) { if ($request->discharge_date) {
$requestLog->discharge_date = $request->discharge_date; $requestLog->discharge_date = $request->discharge_date;
} }

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

@@ -278,7 +278,7 @@ Route::prefix('internal')->group(function () {
// insert benefit // insert benefit
Route::post('customer-service/request/insert-benefit', [RequestLogBenefitController::class, 'store']); Route::post('customer-service/request/insert-benefit', [RequestLogBenefitController::class, 'store']);
Route::post('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'destroy']); Route::delete('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'destroy']);
Route::put('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'update']); Route::put('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'update']);
// insert medicine // insert medicine

40
Modules/Internal/Services/RequestLogService.php
View File

@@ -237,7 +237,7 @@ class RequestLogService
$final_log = 1; $final_log = 1;
} }
if ($row['diagnosis']){ if ($row['total_billing']){ // header
$data = [ $data = [
'code' => $code, 'code' => $code,
'member_id' => $member->id, 'member_id' => $member->id,
@@ -258,26 +258,26 @@ class RequestLogService
'service_code' => $serviceCode, 'service_code' => $serviceCode,
'approved_final_log_at' => $row['approved_final_log_at'], 'approved_final_log_at' => $row['approved_final_log_at'],
]; ];
} else { } else { // item
$data = [ $data = [
'code' => $code, // 'code' => $code,
'member_id' => $member->id, // 'member_id' => $member->id,
'submission_date' => $row['submission_date'], // 'submission_date' => $row['submission_date'],
'discharge_date' => $row['discharge_date'], // 'discharge_date' => $row['discharge_date'],
'payment_type' => 'cashless', // 'payment_type' => 'cashless',
'status' => $status, // 'status' => $status,
'status_final_log' => $statusFinalLog, // 'status_final_log' => $statusFinalLog,
'final_log' =>$final_log, // 'final_log' =>$final_log,
'import_system' =>TRUE, // 'import_system' =>TRUE,
'catatan' => $row['catatan'], // 'catatan' => $row['catatan'],
'type_of_member' => $row['type_of_member'], // 'type_of_member' => $row['type_of_member'],
'total_cob' => $row['total_cob'], // 'total_cob' => $row['total_cob'],
'diagnosis' => $row['diagnosis'], // 'diagnosis' => $row['diagnosis'],
'keterangan' => $row['keterangan'], // 'keterangan' => $row['keterangan'],
'policy_id' => $member->currentPolicy->id ?? null, // 'policy_id' => $member->currentPolicy->id ?? null,
'organization_id' => $organization_id, // 'organization_id' => $organization_id,
'service_code' => $serviceCode, // 'service_code' => $serviceCode,
'approved_final_log_at' => $row['approved_final_log_at'], // 'approved_final_log_at' => $row['approved_final_log_at'],
]; ];
} }