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

Modules/Internal/Transformers/DailyMonitoringResource.php

@@ -14,15 +14,29 @@ class DailyMonitoringResource extends JsonResource
      */
     public function toArray($request)
     {
-
         $data = [
+            'code' => $this->code,
+            'id' => $this->id,
             'member_id' => $this->member_id,
+            'member_type' => $this->member_type,
+            'birth_date' => $this->birth_date,
             'name' => $this->name,
             'start_date' => $this->startdate,
             'end_date' => $this->enddate,
             'addmision_date' => $this->addmision_date,
+            'submission_date' => $this->submission_date,
             'provider' => $this->provider,
             'organization_id' => $this->organization_id,
+            'doctor_1' => $this->doctor_1,
+            'doctor_2' => $this->doctor_2,
+            'temp_diagnosis' => $this->temp_diagnosis,
+            'final_diagnosis' => $this->final_diagnosis,
+            'approval_pendamping' => $this->approval_pendamping,
+            'status' => $this->status,
+            'description' => strip_tags($this->description),
+            'note' => strip_tags($this->note),
+            'medical_plan' => strip_tags($this->medical_plan),
+            'non_medical_plan' => strip_tags($this->non_medical_plan),
         ];
 
         return $data;

Modules/Internal/Transformers/RequestLogShowResource.php

@@ -13,6 +13,7 @@ use App\Models\Benefit;
 use App\Models\Exclusion;
 use App\Models\ClaimRequest;
 use App\Models\Icd;
+use App\Models\Speciality;
 use App\Helpers\Helper;
 use App\Models\CorporatePolicy;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -117,12 +118,29 @@ class RequestLogShowResource extends JsonResource
         }
         $memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
 
-        // dd($memberLimitUsage);
+        if(isset($requestLog['specialities_id']))
+        {
+            $spesialis = Speciality::query()
+            ->where('id', $requestLog['specialities_id'])
+            ->select('name')
+            ->first();
+            $name = $spesialis['name'];
+        } else {
+            $name = '-';
+        }
+
+        if (isset($requestLog['specialities_id'])){
+            $dppj = $requestLog['dppj'];
+        } else {
+            $dppj = '-';
+        }
         $data = [
             'id' => $requestLog['id'],
             'code' => $requestLog['code'],
             'invoice_no' => $requestLog['invoice_no'],
             'billing_no' => $requestLog['billing_no'],
+            'specialities_id' =>  $name,
+            'dppj' => $dppj,
             'code' => $requestLog['code'],
             'code_claim' => $claimCode,
             'member_id' => $requestLog['member']['member_id'],
@@ -161,7 +179,7 @@ class RequestLogShowResource extends JsonResource
             'reason' => $requestLog['reason'],
             'diagnosis' => $icd,
             'is_reversal' => $isReversal, // untuk penjagaan, jika true tidak bisa di edit/hapus lagi
-            
+
 
         ];