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-29 17:06:41 +07:00
parent ccbc515686 c41181b93b
commit 55ff788dd6
15 changed files with 632 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,6 +312,7 @@ class ClaimController extends Controller
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
->where('corporate_employees.corporate_id', '=', $corporate_id)
->where('request_logs.status_final_log', '=', 'approved')
->where('request_logs.deleted_at', '=', null)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', $end);

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

@@ -163,6 +163,7 @@ class RequestLogController extends Controller
$results = DB::table('request_logs')
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->where('request_logs.deleted_at', null)
->when($request->input('search'), function ($query, $search) {
$query->where(function ($query) use ($search) {
$query->orWhere('request_logs.code', 'like', "%" . $search . "%")

22
Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -142,11 +142,29 @@ class CorporateMemberController extends Controller
* @param int $id
* @return Renderable
*/
public function update(Request $request, $id)
public function update(Request $request)
{
//
$member = Member::where('member_id', $request->member_id)->first();
if ($member) {
$member->update([
'birth_date' => $request->birth_date,
'gender' => $request->gender,
]);
return response()->json([
'member' => $member,
'message' => 'Status by member id Updated Successfully'
]);
} else {
return response()->json([
'member' => null,
'message' => 'Gagal update, member tidak ditemukan'
]);
}
}
/**
* Remove the specified resource from storage.
* @param int $id

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

@@ -52,6 +52,10 @@ class RequestLogController extends Controller
public function index(Request $request)
{
$requestLog = RequestLog::query()
->where('deleted_at', null)
->when($request->final_log, function($q, $final_log) {
$q->where('final_log', $final_log);
})
->when($request->search, function ($q, $search) {
$q->where('code', 'LIKE', "%".$search."%");
$q->orWhereHas('member', function ($subQuery) use ($search) {
@@ -60,14 +64,11 @@ class RequestLogController extends Controller
})
->when($request->orderBy, function ($q, $orderBy) use ($request) {
if (in_array($orderBy, ['submission_date', 'code'])) {
$q->orderBy($orderBy, $request->order);
$q->orderBy($orderBy, $request->orderBy);
}
})
->when(empty($request->orderBy), function ($q) {
$q->orderBy('created_at', 'desc');
})
->when($request->final_log, function($q, $final_log) {
$q->where('final_log', $final_log);
$q->orderBy('submission_date', 'desc');
})
->when($request->service_code, function($q, $service_code) {
if ($service_code == 'IP'){ // Penjagaan sementara agar ini hanya muncul di inpatient monitoring
@@ -252,16 +253,12 @@ class RequestLogController extends Controller
$requestLog->reason = $request->reason;
}
// Simpan perubahan pada entitas
$requestLog->save();
if ($request->status){
$requestLog->status = $request->status;
$requestLog->approved_by = auth()->user()->id;
$requestLog->approved_at = Carbon::now();
}
$requestLog->approved_by = auth()->user()->id;
$requestLog->approved_at = Carbon::now();
$requestLog->save();
// update nirc member
@@ -284,9 +281,27 @@ class RequestLogController extends Controller
* @param int $id
* @return Renderable
*/
public function destroy($id)
public function destroy(Request $request, $id)
{
//
$requestLog = RequestLog::findOrFail($id);
$requestLog->reason = 'Reason Delete ' .$request->reason;
$requestLog->deleted_at = Carbon::now();
$requestLog->deleted_by = auth()->user()->id;
// Delete the record
$requestLog->save();
}
public function deleteFinalLog(Request $request, $id){
$requestLog = RequestLog::findOrFail($id);
$requestLog->status_final_log = null;
$requestLog->final_log = 0;
$requestLog->reason_final = 'Reason Delete ' .$request->reason;
$requestLog->save();
return response()->json([
'error' => false,
'message' => 'Delete Final LOG',
'data' => $requestLog],
200);
}
/**

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

@@ -123,6 +123,7 @@ Route::prefix('internal')->group(function () {
Route::get('corporates/{corporate_id}/members/list', [CorporateMemberController::class, 'generateMemberList']);
Route::post('corporates/{corporate_id}/members/import', [CorporateMemberController::class, 'import']);
Route::put('members/{member_id}/activation', [CorporateMemberController::class, 'activation']);
Route::post('members/update', [CorporateMemberController::class, 'update']);
Route::get('corporates/{corporate_id}/diagnosis', [DiagnosisExclusionController::class, 'listDiagnosis']);
@@ -258,6 +259,8 @@ Route::prefix('internal')->group(function () {
Route::post('customer-service/request', [RequestLogController::class, 'createNew']);
Route::put('customer-service/request/{id}', [RequestLogController::class, 'update']);
Route::get('customer-service/request/{id}', [RequestLogController::class, 'show']);
Route::put('customer-service/request/delete/{id}', [RequestLogController::class, 'destroy']);
Route::put('customer-service/request/final_log/{id}', [RequestLogController::class, 'deleteFinalLog']);
Route::get('customer-service/request/{id}/download', [RequestLogController::class, 'generateRequestLog']);
Route::post('customer-service/request/import', [RequestLogController::class, 'importRequestLog']);
Route::get('customer-service/request/data', [RequestLogController::class, 'generateDataRequestLogExcel']);