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

48
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
{ {
@@ -198,19 +199,19 @@ class ClaimController extends Controller
['value' => 'Amt Not Approved', 'cell' => 'J1', 'mergeCell' => false, 'mergeToCell' => ''], ['value' => 'Amt Not Approved', 'cell' => 'J1', 'mergeCell' => false, 'mergeToCell' => ''],
['value' => 'Excess Paid', 'cell' => 'K1', 'mergeCell' => false, 'mergeToCell' => ''], ['value' => 'Excess Paid', 'cell' => 'K1', 'mergeCell' => false, 'mergeToCell' => ''],
['value' => 'Diagnosis', 'cell' => 'L1', 'mergeCell' => false, 'mergeToCell' => 'J2'], ['value' => 'Diagnosis', 'cell' => 'L1', 'mergeCell' => false, 'mergeToCell' => 'J2'],
]; ];
$spreadsheet = new Spreadsheet(); $spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet(); $sheet = $spreadsheet->getActiveSheet();
foreach ($headers as $header) { foreach ($headers as $header) {
$sheet->setCellValue($header['cell'], $header['value']); $sheet->setCellValue($header['cell'], $header['value']);
if ($header['mergeCell'] === true) { if ($header['mergeCell'] === true) {
$sheet->mergeCells($header['cell'] . ':' . $header['mergeToCell']); $sheet->mergeCells($header['cell'] . ':' . $header['mergeToCell']);
} }
$sheet->getStyle($header['cell'])->getFont()->setBold(true); $sheet->getStyle($header['cell'])->getFont()->setBold(true);
$sheet->getStyle($header['cell'])->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER)->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER); $sheet->getStyle($header['cell'])->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER)->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
} }
@@ -230,7 +231,7 @@ class ClaimController extends Controller
$sheet->setCellValue('J' . $startFrom, $d['amount_not_approved'] ?? '-'); $sheet->setCellValue('J' . $startFrom, $d['amount_not_approved'] ?? '-');
$sheet->setCellValue('K' . $startFrom, $d['excess_paid'] ?? '-'); $sheet->setCellValue('K' . $startFrom, $d['excess_paid'] ?? '-');
$sheet->setCellValue('L' . $startFrom, $d['diganosis'] ?? '-'); $sheet->setCellValue('L' . $startFrom, $d['diganosis'] ?? '-');
$startFrom++; $startFrom++;
} }
@@ -248,18 +249,18 @@ class ClaimController extends Controller
$sheet->getDefaultRowDimension()->setRowHeight(-1); $sheet->getDefaultRowDimension()->setRowHeight(-1);
$sheet->setTitle('Alarm Center Report'); $sheet->setTitle('Alarm Center Report');
$writer = new Xlsx($spreadsheet); $writer = new Xlsx($spreadsheet);
ob_start(); ob_start();
$writer->save('php://output'); $writer->save('php://output');
$content = ob_get_contents(); $content = ob_get_contents();
ob_end_clean(); ob_end_clean();
$fileName = 'result-' . now()->getPreciseTimestamp(3) . '-alarm-center-report.xlsx'; $fileName = 'result-' . now()->getPreciseTimestamp(3) . '-alarm-center-report.xlsx';
Storage::disk('public')->put('temp/' . $fileName, $content); Storage::disk('public')->put('temp/' . $fileName, $content);
$fileUrl = url('storage/temp/' . $fileName); $fileUrl = url('storage/temp/' . $fileName);
return Helper::responseJson([ return Helper::responseJson([
"file_url" => $fileUrl "file_url" => $fileUrl
]); ]);
@@ -270,7 +271,7 @@ class ClaimController extends Controller
{ {
$writer = WriterEntityFactory::createXLSXWriter(); $writer = WriterEntityFactory::createXLSXWriter();
$writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx')); $writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx'));
$header = [ $header = [
'No', 'No',
'Code', 'Code',
@@ -307,7 +308,7 @@ class ClaimController extends Controller
$headerRow = WriterEntityFactory::createRowFromArray($header, $style); $headerRow = WriterEntityFactory::createRowFromArray($header, $style);
$writer->addRow($headerRow); $writer->addRow($headerRow);
$data = DB::table('request_logs') $data = DB::table('request_logs')
->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')
@@ -316,8 +317,8 @@ 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'),
'request_logs.submission_date', 'request_logs.submission_date',
@@ -353,7 +354,7 @@ class ClaimController extends Controller
->orderBy('request_logs.submission_date', 'desc') ->orderBy('request_logs.submission_date', 'desc')
->get(); ->get();
if (isset($data) && count($data) > 0) if (isset($data) && count($data) > 0)
{ {
$dataRow = array(); $dataRow = array();
$no = 0; $no = 0;
@@ -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('
@@ -476,7 +478,7 @@ class ClaimController extends Controller
$total_billing = 0; $total_billing = 0;
$lastIndex = count($dataClaimLog) - 1; $lastIndex = count($dataClaimLog) - 1;
$firtIndex = 0; $firtIndex = 0;
if (isset($dataClaimLog) && count($dataClaimLog) > 0) if (isset($dataClaimLog) && count($dataClaimLog) > 0)
{ {
foreach ($dataClaimLog as $index => $item_benefit) foreach ($dataClaimLog as $index => $item_benefit)
{ {
@@ -505,12 +507,12 @@ class ClaimController extends Controller
!empty($item->diagnosis) ? $item->diagnosis : '', !empty($item->diagnosis) ? $item->diagnosis : '',
!empty($item->keterangan) ? $item->keterangan : '', !empty($item->keterangan) ? $item->keterangan : '',
!empty($item->catatan) ? $item->catatan : '', !empty($item->catatan) ? $item->catatan : '',
]; ];
array_push($dataRow,$rowData); array_push($dataRow,$rowData);
$check_first_id = $item->id; $check_first_id = $item->id;
} }
} }
else else
{ {
@@ -538,11 +540,11 @@ class ClaimController extends Controller
'', '',
'', '',
'', '',
];
array_push($dataRow,$rowData);
} ];
array_push($dataRow,$rowData);
}
} }
$style = (new StyleBuilder()) $style = (new StyleBuilder())
//->setFontBold() //->setFontBold()
@@ -595,7 +597,7 @@ class ClaimController extends Controller
->setCellAlignment(CellAlignment::LEFT) ->setCellAlignment(CellAlignment::LEFT)
// ->setBackgroundColor(Color::YELLOW) // ->setBackgroundColor(Color::YELLOW)
->build(); ->build();
$footerRow = WriterEntityFactory::createRowFromArray($footer, $style); $footerRow = WriterEntityFactory::createRowFromArray($footer, $style);
$writer->addRow($footerRow); $writer->addRow($footerRow);
} }

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

@@ -113,7 +113,7 @@ class RequestLogController extends Controller
$requestLogControllerInstance = new PrimeCenterRequestLog(); $requestLogControllerInstance = new PrimeCenterRequestLog();
try { try {
$response = $requestLogControllerInstance->createNew($request); $response = $requestLogControllerInstance->createNew($request);
if($response->original['statusCode'] == 200) if($response->original['statusCode'] == 200)
{ {
//send email //send email
@@ -354,7 +354,7 @@ class RequestLogController extends Controller
->update([ ->update([
'status_final_log' => 'requested', 'status_final_log' => 'requested',
'final_log' => 1, 'final_log' => 1,
'discharge_date' => $request->discharge_date, 'discharge_date' => $request->discharge_date,
'created_final_by'=> auth()->user()->id, 'created_final_by'=> auth()->user()->id,
'created_final_at'=> date('Y-m-d H:i:s'), 'created_final_at'=> date('Y-m-d H:i:s'),
]); ]);
@@ -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('
@@ -778,7 +779,7 @@ class RequestLogController extends Controller
$dataDiagnosis = []; $dataDiagnosis = [];
if($dataRequestLog->diagnosis) if($dataRequestLog->diagnosis)
{ {
$dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis); $dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis);
foreach ($dataDiagnosiCodes as $diagnosisCode) foreach ($dataDiagnosiCodes as $diagnosisCode)
{ {
$diagnoisis = DB::table('icd') $diagnoisis = DB::table('icd')
@@ -789,8 +790,8 @@ class RequestLogController extends Controller
} }
} }
$data['dataDiagnosis'] = $dataDiagnosis; $data['dataDiagnosis'] = $dataDiagnosis;
$pdf = new Dompdf(); $pdf = new Dompdf();

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

@@ -13,10 +13,10 @@ use Carbon\Carbon;
class RequestLogBenefitController extends Controller class RequestLogBenefitController extends Controller
{ {
public function index(Request $request) public function index(Request $request)
{ {
} }
/** /**
@@ -35,7 +35,7 @@ class RequestLogBenefitController extends Controller
*/ */
public function show($id) public function show($id)
{ {
} }
/** /**
@@ -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
@@ -90,10 +90,10 @@ class RequestLogBenefitController extends Controller
}; };
} }
$requestLogBenefit = RequestLogBenefit::insert($data); // $requestLogBenefit = RequestLogBenefit::insert($data);
return $requestLogBenefit; // return $requestLogBenefit;
} }
/** /**
@@ -125,7 +125,7 @@ class RequestLogBenefitController extends Controller
$requestLogBenefit->reason = $request->reason; $requestLogBenefit->reason = $request->reason;
$requestLogBenefit->save(); $requestLogBenefit->save();
return response()->json([ return response()->json([
'error' => false, 'error' => false,
'message' => 'Update succses', 'message' => 'Update succses',
@@ -147,5 +147,5 @@ class RequestLogBenefitController extends Controller
$requestLogBenefit->save(); $requestLogBenefit->save();
} }
} }

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;
} }

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

@@ -272,20 +272,20 @@ Route::prefix('internal')->group(function () {
Route::post('customer-service/request/{id}/delete_file', [RequestLogController::class, 'deleteFiles']); Route::post('customer-service/request/{id}/delete_file', [RequestLogController::class, 'deleteFiles']);
Route::post('customer-service/request/final-log', [RequestLogController::class, 'updateFinalLog']); Route::post('customer-service/request/final-log', [RequestLogController::class, 'updateFinalLog']);
// search diagnosis // search diagnosis
Route::get('diagnosis', [RequestLogController::class, 'diagnosis']); Route::get('diagnosis', [RequestLogController::class, 'diagnosis']);
// 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
Route::post('customer-service/request/medicine-data', [RequestLogMedicineController::class, 'store']); Route::post('customer-service/request/medicine-data', [RequestLogMedicineController::class, 'store']);
Route::delete('customer-service/request/medicine-data/{id}', [RequestLogMedicineController::class, 'destroy']); Route::delete('customer-service/request/medicine-data/{id}', [RequestLogMedicineController::class, 'destroy']);
Route::put('customer-service/request/medicine-data/{id}', [RequestLogMedicineController::class, 'update']); Route::put('customer-service/request/medicine-data/{id}', [RequestLogMedicineController::class, 'update']);
Route::get('search-organizations', [OrganizationController::class, 'searchOrganization']); Route::get('search-organizations', [OrganizationController::class, 'searchOrganization']);
Route::get('search-specialities', [SpecialityController::class, 'searchSpeciality']); Route::get('search-specialities', [SpecialityController::class, 'searchSpeciality']);
Route::resource('organizations', OrganizationController::class); Route::resource('organizations', OrganizationController::class);

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

@@ -184,7 +184,7 @@ class RequestLogService
// $kodeOrganisasi = "ORG000" . $singkatan; // $kodeOrganisasi = "ORG000" . $singkatan;
// Insert data ke tabel organizations // Insert data ke tabel organizations
$organization = DB::table('organizations')->where('code', $row['organization_id'])->first(); $organization = DB::table('organizations')->where('code', $row['organization_id'])->first();
if (!$organization){ if (!$organization){
throw new ImportRowException(__('Provider Not Found'), 0, null, $row); throw new ImportRowException(__('Provider Not Found'), 0, null, $row);
} }
@@ -219,7 +219,7 @@ class RequestLogService
} else { } else {
$status = 'requested'; $status = 'requested';
} }
$service = Service::where('name', $row['service'])->first(); $service = Service::where('name', $row['service'])->first();
if ($service){ if ($service){
$serviceCode = $service->code; $serviceCode = $service->code;
@@ -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'],
]; ];
} }
@@ -302,7 +302,7 @@ class RequestLogService
} }
if ($benefit) { // jika tidak ada benefit nya maka belum ngisi benefit nya if ($benefit) { // jika tidak ada benefit nya maka belum ngisi benefit nya
// Delete item // Delete item
if ($row['total_billing']){ if ($row['total_billing']){
RequestLogBenefit::where('request_log_id', '=', $requestLog->id)->delete(); RequestLogBenefit::where('request_log_id', '=', $requestLog->id)->delete();
} }