improvement uat 1

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

@@ -33,11 +33,17 @@ class ClaimController extends Controller
      */
     public function index(Request $request)
     {
+        $serviceCode = 'IP';
         $claims = Claim::with([
             'member',
             'member.currentCorporate',
             'member.currentCorporate.currentPolicy',
-            'member.currentPlan',
+            // 'member.currentPlan' => function($memberPlan) use ($serviceCode) {
+            //     $memberPlan->where('plans.service_code', $serviceCode);
+            // },
+            'member.currentPlan' => function($memberPlan) {
+                $memberPlan->join('claim_requests', 'claim_requests.service_code', '=', 'plans.service_code');
+            },
             'diagnoses' => function ($diagnosis) {
                 $diagnosis->where('type', 'primary');
             },

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

@@ -380,7 +380,7 @@ class ClaimRequestController extends Controller
             ]);
 
         } catch (\Exception $e) {
-            return $e->getMessage();;
+            return $e->getMessage();
         }
 
         return $claimRequest;
@@ -643,20 +643,47 @@ class ClaimRequestController extends Controller
         $memberList = DB::table('members')
             ->select('id','member_id','name')
             ->where("name", "like", "%$keyword%")
+            ->orWhere("member_id", "like", "%$keyword%")
             ->orderBy('created_at', 'asc')
             ->offset($offset)
             ->limit($limit)
             ->get();
+        
+        $data = [];
+        if(count($memberList)>0){
+            $temp = [];
+            foreach($memberList as $d){
+                $serviceType = $this->getServiceMember($d->id);
+                $temp['id'] = $d->id;
+                $temp['member_id'] = $d->member_id;
+                $temp['name'] = $d->name;
+                $temp['service_type'] = $serviceType;
 
+
+                array_push($data, $temp);
+            }
+
+        }
         return response()->json([
             'error'   => false,
             'message' => "success",
             'data'    => [
-                'member_list'=> $memberList,
+                'member_list'=> $data,
             ]
         ],200);
     }
 
+    public function getServiceMember($id){
+        $service = DB::table('member_plans')
+            ->select('plans.service_code as code', 'services.name')
+            ->join('plans', 'member_plans.plan_id', '=', 'plans.id')
+            ->join('services', 'plans.service_code', '=', 'services.code')
+            ->where('member_id', $id)
+            ->get()
+            ->toArray();
+        return $service;
+    }
+
     public static function getNextCode()
     {
         // $last_number = ClaimRequest::max('code');

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

@@ -31,7 +31,7 @@ class CorporateMemberController extends Controller
      * Display a listing of the resource.
      * @return Renderable
      */
-    public function index(Request $request, $corporate_id)
+    public function index(Request $request, $corporate_id   )
     {
         $members = Member::query()
             ->joinCorporateEmployees('left')
@@ -44,7 +44,13 @@ class CorporateMemberController extends Controller
                     // return $claim->whereBetween('requested_at', [now()->startOfYear(), now()->endOfYear()]);
                     // return $claim->used(now()->startOfYear(), now()->endOfYear());
                 },
+                'currentPlans',
                 'currentPlan',
+                // 'currentPlan' => function ($currentPlan) use ($service_code){
+                //     return $currentPlan->where([
+                //         'plans.service_code' => $service_code
+                //     ]);
+                // },
                 'currentPlan.benefits' => function ($benefit) use ($corporate_id){
                     return $benefit->where([
                         'corporate_benefits.active' => 1,