Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

app/Controllers/EmployeeRestController.php

@@ -3065,6 +3065,7 @@ class EmployeeRestController extends AdminController
             ->where('client_id', $this->request->getGet('client_id'))
             ->where('client_branch_id', $this->request->getGet('client_branch_id'))
             ->where('family_floater_key', 'self')->where('is_active', 1)
+            ->orderBy('id', 'DESC')
             ->get()->getRow();
 
         $employeeName = $employeeSelfData->name ?? "";
@@ -3218,6 +3219,7 @@ class EmployeeRestController extends AdminController
 
             $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
             $apiServiceController    = new ApiServiceController;
+            // dd($employeeSelfData->id);
             $emp_wellness_data       = $apiServiceController->getWellnessUrl($employeeSelfData->id ?? null);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'emp_not_enrolled_count' => $empNotEnrolledCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);

app/Models/ClaimsCollectionV2DashboardModel.php

@@ -218,18 +218,21 @@ SQL;
 SELECT
     /* run days */
     DATEDIFF(
-        MAX(COALESCE(tm.claim_dump_date, cp.policy_end_date)),
+        LEAST(CURDATE(), cp.policy_end_date),
         cp.policy_start_date
     ) + 1 AS run_days,
 
     /* earned premium */
     FORMAT(
-        (prem.premium_as_on_date / 365)
-        * (DATEDIFF(
-            MAX(COALESCE(tm.claim_dump_date, cp.policy_end_date)),
-            cp.policy_start_date
-        ) + 1)
-    , 0) AS earned_premium,
+        (prem.premium_as_on_date / 365) *
+        (
+            DATEDIFF(
+                LEAST(CURDATE(), cp.policy_end_date),
+                cp.policy_start_date
+            ) + 1
+        ),
+        2
+    ) AS earned_premium,
 
     /* claims reported */
     FORMAT(COUNT(tm.id), 0) AS claims_reported,