diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php index caaaeaef..6b187717 100644 --- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php +++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php @@ -23,11 +23,11 @@ class DataServiceMonitoring extends JsonResource $filesFinalLogKondisi = []; if (count($this->files)>0){ foreach ($this->files as $key => $value) { - /* - Sementara di buat satu dulu, jangan di hapus.. + /* + Sementara di buat satu dulu, jangan di hapus.. karena suka labil client nya, tiba2 hide tiba2 munculin fitur :D */ - + // if($value->type == 'final-log-result'){ array_push($filesFinalLogResult, $value); // }; @@ -71,7 +71,7 @@ class DataServiceMonitoring extends JsonResource $main_diagnosis = $d; } $diagnosis = '-'; - } + } if ($key > 0){ if ($icd) { @@ -121,7 +121,7 @@ class DataServiceMonitoring extends JsonResource $arr_document = []; $document = DB::table('files') ->where([ - 'fileable_type' => 'App\Models\LaboratoriumResult', + 'fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_id' => $requestLogDailyMonitoring->id, 'deleted_at' => null ]) @@ -138,7 +138,7 @@ class DataServiceMonitoring extends JsonResource } } - + return [ 'time' => Carbon::parse($requestLogDailyMonitoring->submission_date)->format('H:i') ?? null, 'status' => 'Done' ?? null, @@ -180,12 +180,12 @@ class DataServiceMonitoring extends JsonResource }) ->map(function ($groupedItems) { return collect($groupedItems) - + ->map(function ($test) { $arr_document = []; $document = DB::table('files') ->where([ - 'fileable_type' => 'App\Models\LaboratoriumResult', + 'fileable_type' => 'App\Models\LaboratoriumResult', 'fileable_id' => $test->id, 'deleted_at' => null ]) @@ -201,7 +201,7 @@ class DataServiceMonitoring extends JsonResource ]; } } - + return [ 'code' => $test->code, 'date' => Carbon::parse($test->lab_date)->format('d M Y') ?? null, diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 1d1a60fa..42fce6b1 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -694,7 +694,11 @@ class RequestLogController extends Controller ->select('members.name') ->limit(1) ->first(); - $data['namaKaryawan'] = $dataNamaKaryawan->name; + if ($dataNamaKaryawan){ + $data['namaKaryawan'] = $dataNamaKaryawan->name; + } else { + $data['namaKaryawan'] = $dataMember->name; + } } else{ $data['namaKaryawan'] = $dataMember->name; @@ -849,7 +853,7 @@ class RequestLogController extends Controller ->where('id', '=', $request_logs_id) ->select('id', 'member_id', 'service_code') ->first(); - + $check_claim_requests = DB::table('claim_requests') ->where('claim_requests.request_log_id', '=', $request_logs_id) ->first(); @@ -861,12 +865,12 @@ class RequestLogController extends Controller $requestLogData = RequestLog::where('id',$request_logs_id)->first(); $organization = Organization::where(['id' => $requestLogData->organization_id, 'type' => 'hospital'])->first('code'); $provideCode = $organization ? $organization->code : ''; - + $newClaimRequest = ClaimRequestService::storeClaimRequest( - row: [], - code: $code, - member: $member, - paymentType: 'cashless', + row: [], + code: $code, + member: $member, + paymentType: 'cashless', serviceCode: $data_req_logs->service_code, requestLogID: $request_logs_id, organization_code: $provideCode, @@ -878,7 +882,7 @@ class RequestLogController extends Controller 'type' => 'info', 'system_origin' => 'hospital-portal' ]); - + // Claim Log DB::table('claim_logs') ->insert([ diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 7250ffef..3c382daf 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -4,6 +4,7 @@ namespace Modules\Internal\Http\Controllers\Api; use App\Helpers\Helper; use App\Models\RequestLog; +use App\Models\RequestLogBenefit; use App\Models\Organization; use App\Models\Icd; use App\Services\ClaimService; @@ -302,6 +303,8 @@ class RequestLogController extends Controller $requestLog->final_log = 0; $requestLog->reason_final = 'Reason Delete ' .$request->reason; $requestLog->save(); + // Hapus semua manfaat log permintaan terkait + RequestLogBenefit::where('request_log_id', $id)->delete(); return response()->json([ 'error' => false, 'message' => 'Delete Final LOG', diff --git a/Modules/Internal/Routes/api.php b/Modules/Internal/Routes/api.php index 87107355..e7f5cd19 100644 --- a/Modules/Internal/Routes/api.php +++ b/Modules/Internal/Routes/api.php @@ -287,7 +287,7 @@ Route::prefix('internal')->group(function () { // insert benefit Route::post('customer-service/request/insert-benefit', [RequestLogBenefitController::class, 'store']); - Route::delete('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'destroy']); + Route::post('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'destroy']); Route::put('customer-service/request/benefit_data/{id}', [RequestLogBenefitController::class, 'update']); // insert medicine diff --git a/Modules/Linksehat/Transformers/User/UserProfileResource.php b/Modules/Linksehat/Transformers/User/UserProfileResource.php index cb1aa512..56749f68 100644 --- a/Modules/Linksehat/Transformers/User/UserProfileResource.php +++ b/Modules/Linksehat/Transformers/User/UserProfileResource.php @@ -39,8 +39,10 @@ class UserProfileResource extends JsonResource $linking = true; } else { $member = Member::where('email', $this->sEmail)->get()->first(); - $person = Person::where('phone', $this->sPhone)->get()->first(); - if ($member || $person){ // Autolinking + // $person = Person::where('phone', $this->sPhone)->get()->first(); + // dd($person); + if ($member){ // Autolinking + $corporateEmployee = CorporateEmployee::where('member_id', $member->id)->get()->first(); // cek corporate id empolyee/member if ($corporateEmployee){ $corporate = Corporate::findOrFail($corporateEmployee->corporate_id)->automatic_linking; // cek autocomplete @@ -76,11 +78,11 @@ class UserProfileResource extends JsonResource }; if (count($memberProfile) > 0){ - + $urlAvatarDefault = $this->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png'; $avatarMember = $this->detail->sImage ?? $urlAvatarDefault; $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $this->nIDHubunganKeluarga)->first('sHubunganKeluarga'); - + $dataUser = [ 'id' => $this->nID, 'name' => $this->sFirstName . ' ' . $this->sLastName, @@ -94,7 +96,7 @@ class UserProfileResource extends JsonResource $urlAvatarDefault = $m['detail']['nIDJenisKelamin'] == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png'; $avatarMember = $m['detail']['sImage'] ?? $urlAvatarDefault; $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $m['nIDHubunganKeluarga'])->first('sHubunganKeluarga'); - + $data = [ 'id' => $m['nID'], 'name' => $m['full_name'], @@ -112,17 +114,17 @@ class UserProfileResource extends JsonResource $memberProfile = User::with('detail')->where('nIDUser', $nID)->get()->toArray(); $dataMember = User::with('detail')->where('nID', $nID)->get()->first(); - + if ($this->detail){ $urlAvatarDefault = $this->detail->nIDJenisKelamin == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png'; } else { $urlAvatarDefault = 'https://linksehat.dev/assets/img/users/male-avatar.png'; } $avatar = $this->detail->sImage ?? $urlAvatarDefault; - + $avatarMember = $dataMember->detail->sImage ?? $urlAvatarDefault; $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $this->nIDHubunganKeluarga)->first('sHubunganKeluarga'); - + $dataUser = [ 'id' => $dataMember->nID, 'name' => $dataMember->sFirstName . ' ' . $dataMember->sLastName, @@ -136,14 +138,14 @@ class UserProfileResource extends JsonResource $urlAvatarDefault = $m['detail']['nIDJenisKelamin'] == 1 ? 'https://linksehat.dev/assets/img/users/male-avatar.png' : 'https://linksehat.dev/assets/img/users/female-avatar.png'; $avatarMember = $m['detail']['sImage'] ?? $urlAvatarDefault; $relationship = DB::connection('oldlms')->table('tm_hubungan_keluarga')->where('nID', $m['nIDHubunganKeluarga'])->first('sHubunganKeluarga'); - + $data = [ 'id' => $m['nID'], 'name' => $m['full_name'], 'relationship' => $relationship->sHubunganKeluarga, 'avatar' => $avatarMember, ]; - + array_push( $dataMemberProfile, $data); } }