Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

app/Models/ClaimRequest.php

@@ -114,7 +114,7 @@ class ClaimRequest extends Model
             }
         });
     }
-    
+
     // public static function getNextCode()
     // {
     //     $last_number = self::withTrashed()->max('code');
@@ -143,6 +143,21 @@ class ClaimRequest extends Model
         return $this->morphMany(File::class, 'fileable');
     }
 
+    public function claimResults()
+    {
+        return $this->files()->where('type', 'claim-result')->whereNull('deleted_at');
+    }
+
+    public function claimConditions()
+    {
+        return $this->files()->where('type', 'claim-kondisi')->whereNull('deleted_at');
+    }
+
+    public function claimDiagnosis()
+    {
+        return $this->files()->where('type', 'claim-diagnosis')->whereNull('deleted_at');
+    }
+
     public function generatedDocuments()
     {
         return $this->morphMany(GeneratedDocument::class, 'generated_documentable');

app/Services/CorporateMemberService.php

@@ -51,6 +51,7 @@ class CorporateMemberService
             ->joinClaimRequests('right')
             ->joinCorporateEmployees('left')
             ->joinCorporateDivisions('left')
+            ->with('person:id,name_prefix,name_suffix,gender,name,birth_date')
             ->withSum('claims', 'total_claim')
             ->whereHas('employeds', function (Builder $corporateEmployee) use ($corporateId) {
                 $corporateEmployee->where('corporate_id', $corporateId);
@@ -80,7 +81,7 @@ class CorporateMemberService
                     $query->getQuery()->orderBy('corporate_divisions.name', $request->order);
                 }
             })
-            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code','claim_requests.submission_date'])
+            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'claim_requests.status', 'claim_requests.code', 'claim_requests.id AS claim_request_id','claim_requests.submission_date'])
             ->paginate($limit);
     }
 
@@ -89,7 +90,7 @@ class CorporateMemberService
         $limit = $request->has('perPage') ? $request->input('perPage') : 10;
 
         return Member::query()
-           // ->joinClaimRequests('right')
+            // ->joinClaimRequests('right')
             ->joinCorporateEmployees('left')
             ->joinCorporateDivisions('left')
             ->with('currentPlan')
@@ -121,8 +122,8 @@ class CorporateMemberService
                     $query->getQuery()->orderBy('corporate_divisions.name', $request->order);
                 }
             })
-           // ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active', 'claim_requests.id', 'claim_requests.member_id', 'claim_requests.submission_date'])
-             ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active'])
+            // ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active', 'claim_requests.id', 'claim_requests.member_id', 'claim_requests.submission_date'])
+            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active'])
             ->paginate($limit);
     }