Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Client/Http/Controllers/Api/ClaimController.php

@@ -290,7 +290,9 @@ class ClaimController extends Controller
             'Amt Approved',
             'Amt Not Approved',
             'Excess Paid',
-            'Diagnosis'
+            'Diagnosis',
+            'Keterangan',
+            'Catatan'
         ];
         $style = (new StyleBuilder())
            ->setFontBold()
@@ -322,7 +324,9 @@ class ClaimController extends Controller
             'request_logs.member_id',
             'request_logs.service_code',
             'request_logs.code',
-            'request_logs.diagnosis'
+            'request_logs.diagnosis',
+            'request_logs.keterangan',
+            'request_logs.catatan'
         )
         ->groupBy(
             'request_logs.submission_date',
@@ -332,7 +336,9 @@ class ClaimController extends Controller
             'request_logs.member_id',
             'request_logs.service_code',
             'request_logs.code',
-            'request_logs.diagnosis'
+            'request_logs.diagnosis',
+            'request_logs.keterangan',
+            'request_logs.catatan'
         )
         ->orderBy('request_logs.submission_date')
         ->get();
@@ -469,6 +475,8 @@ class ClaimController extends Controller
                             !empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '',
                             !empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '',
                             !empty($item->diagnosis) ? $item->diagnosis : '',
+                            !empty($item->catatan) ? $item->catatan : '',
+                            !empty($item->keterangan) ? $item->keterangan : '',
         
                         ];
                         array_push($dataRow,$rowData);

Modules/Internal/Http/Controllers/Api/RequestLogController.php

@@ -212,20 +212,49 @@ class RequestLogController extends Controller
     public function update(Request $request, $id)
     {
         $requestLog = RequestLog::findOrFail($id);
-        $requestLog->keterangan = $request->keterangan;
-        $requestLog->hak_kamar_pasien = $request->hak_kamar_pasien;
-        $requestLog->penempatan_kamar = $request->penempatan_kamar;
-        $requestLog->catatan = $request->catatan;
+        // Jika ada nilai yang dikirimkan dalam permintaan, maka edit entitas
+        if (!empty($request->submission_date)) {
+            $requestLog->submission_date = $request->submission_date;
+        }
+
+        if (!empty($request->keterangan)) {
+            $requestLog->keterangan = $request->keterangan;
+        }
+
+        if (!empty($request->hak_kamar_pasien)) {
+            $requestLog->hak_kamar_pasien = $request->hak_kamar_pasien;
+        }
+
+        if (!empty($request->penempatan_kamar)) {
+            $requestLog->penempatan_kamar = $request->penempatan_kamar;
+        }
+
+        if (!empty($request->catatan)) {
+            $requestLog->catatan = $request->catatan;
+        }
+
+        if (!empty($request->reason)) {
+            $requestLog->reason = $request->reason;
+        }
+
+        // Simpan perubahan pada entitas
+        $requestLog->save();
+
+
+        if ($request->status){
+            $requestLog->status =  $request->status;
+        }
 
-        $requestLog->status = $request->status;
         $requestLog->approved_by = auth()->user()->id;
         $requestLog->approved_at = Carbon::now();
         $requestLog->save();
 
         // update nirc member
-        $member = Member::findOrFail($requestLog->member_id);
-        $member->nric = $request->no_identitas;
-        $member->save();
+        if (!empty($request->no_identitas)) {
+            $member = Member::findOrFail($requestLog->member_id);
+            $member->nric = $request->no_identitas;
+            $member->save();
+        }
 
         return response()->json([
             'error' => false,

Modules/Internal/Transformers/RequestLogShowResource.php

@@ -113,6 +113,7 @@ class RequestLogShowResource extends JsonResource
             'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'],
             'penempatan_kamar' => $requestLog['penempatan_kamar'],
             'catatan' => $requestLog['catatan'],
+            'reason' => $requestLog['reason'],
 
 
         ];