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

Modules/Internal/Transformers/DoctorResource.php

@@ -61,6 +61,8 @@ class DoctorResource extends JsonResource
                         'speciality_id' => $item->speciality->id,
                     ];
                 }),
+                'period_start' => $items->pluck('period_start')->first(),
+                'period_end' => $items->pluck('period_end')->first(),
             ];
         });
 

Modules/Internal/Transformers/LivechatResource.php

@@ -5,6 +5,8 @@ namespace Modules\Internal\Transformers;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 use App\Helpers\Helper;
+use App\Models\Prescription;
+use App\Models\PrescriptionItem;
 
 class LivechatResource extends JsonResource
 {
@@ -16,6 +18,20 @@ class LivechatResource extends JsonResource
      */
     public function toArray($request)
     {
+        $prescription = Prescription::where('livechat_id', $this->nID)->first();
+        $diagnosis = $prescription ? $prescription->icd_code : '';
+        $hospital = $prescription ? $prescription->organization_id : '';
+        
+        $prescriptionItem = $prescription ? PrescriptionItem::where('prescription_id', $prescription->id)->get() : [
+            [
+                'drug_id' => 0,
+                'qty' => 0,
+                'signa' => '',
+                'unit_id' => 0,
+                'note' => '', // input to database
+            ]
+        ];
+       
         $livechat = [
             'id' => $this->nID,
             'doctor_name' => isset($this->doctor->user->sFirstName) ? $this->doctor->user->detail->sTitlePrefix . '. ' . $this->doctor->user->sFirstName . ' ' . $this->doctor->user->sLastName . ' ' . $this->doctor->user->detail->sTitleSuffix : null,
@@ -36,6 +52,9 @@ class LivechatResource extends JsonResource
             'appointment_media' => $this->appointment->sMedia ?? null,
             'status_chat' => $this->status_name ?? null,
             'payment_method' => $this->appointment->payment_method ?? null,
+            'diagnosis' => $diagnosis,
+            'hospital' => $hospital,
+            'medicine' => $prescriptionItem
         ];
 
         $start_time = $this->dStartTime;

Modules/Internal/Transformers/RequestLogShowResource.php

@@ -42,7 +42,7 @@ class RequestLogShowResource extends JsonResource
             $claimCode = $claimRequest->code;
             $isReversal = false;
             $isRole = auth()->user()->role_id;
-            if ($requestLog['status'] == 'approved' && 
+            if ($requestLog['status'] == 'approved' &&
                 $requestLog['status_final_log'] == 'approved' &&
                 $claimRequest->status == 'approved' &&
                 $claimRequest->status_claim_management == 'approved' &&
@@ -108,11 +108,14 @@ class RequestLogShowResource extends JsonResource
                     ->whereIn('code', $diagnosis)
                     ->select('code', 'name')
                     ->get();
-        }       
+        }
 
         $data = [
             'id' => $requestLog['id'],
             'code' => $requestLog['code'],
+            'invoice_no' => $requestLog['invoice_no'],
+            'billing_no' => $requestLog['billing_no'],
+            'code' => $requestLog['code'],
             'code_claim' => $claimCode,
             'member_id' => $requestLog['member']['member_id'],
             'corporate_id' => $corporateId,