From 9dae88d95aa7af139f3506ff1efbbc56c8c8a0a0 Mon Sep 17 00:00:00 2001 From: Venkatesh Date: Fri, 3 Jul 2026 12:00:44 +0530 Subject: [PATCH 1/2] FIX_CLAIM_STATUS_1_YES_0_NO --- app/Models/EmployeePolicyModel.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 474221b2..2fc7715a 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -1196,7 +1196,10 @@ class EmployeePolicyModel extends Model deletiondata.changeevent, deletiondata.reasonforexit, deletiondata.status, - deletiondata.claimstatus, + CASE + WHEN deletiondata.claimstatus = 1 THEN 'Yes' + ELSE 'No' + END AS claimstatus, DATE_FORMAT(employees.dob, '%d-%b-%Y') AS emp_dob, DATE_FORMAT(employees.doj, '%d-%b-%Y') AS emp_doj, From 00e44a10aef05c975a82488e93b82fd8b49f194e Mon Sep 17 00:00:00 2001 From: Venkatesh Date: Fri, 3 Jul 2026 14:34:30 +0530 Subject: [PATCH 2/2] FIX_CLAIM_DASHBOARD_EARNED_PREMIUM --- .../ClaimsCollectionV2DashboardModel.php | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/Models/ClaimsCollectionV2DashboardModel.php b/app/Models/ClaimsCollectionV2DashboardModel.php index 3067443f..57039270 100644 --- a/app/Models/ClaimsCollectionV2DashboardModel.php +++ b/app/Models/ClaimsCollectionV2DashboardModel.php @@ -346,22 +346,29 @@ JOIN ( ep2.client_policy_id, COALESCE(SUM( CASE - WHEN e2.change_event = 'inception' - THEN ep2.rata_premimum - WHEN e2.change_event != 'inception' - AND (ep2.date_of_exit IS NULL OR ep2.date_of_exit = '') - THEN ep2.rata_premimum WHEN ep2.date_of_exit IS NOT NULL AND ep2.date_of_exit != '' - AND ep2.claim_status = 0 - THEN -ep2.rata_premimum - ELSE 0 + AND (ep2.claim_status = 0 OR ep2.claim_status IS NULL) + AND ep2.date_coverage IS NOT NULL + AND ep2.date_coverage != '' + AND ep2.policy_end_date IS NOT NULL + AND ep2.policy_end_date != '' + THEN (ep2.rata_premimum + COALESCE(ep2.gst, 0)) + * ( + (DATEDIFF(ep2.policy_end_date, ep2.date_coverage) + 1) + - (DATEDIFF(ep2.policy_end_date, ep2.date_of_exit) - 1) + ) + / NULLIF(DATEDIFF(ep2.policy_end_date, ep2.date_coverage) + 1, 0) + ELSE (ep2.rata_premimum + COALESCE(ep2.gst, 0)) END ), 0) AS premium_as_on_date FROM employee_polices ep2 JOIN employees e2 ON e2.id = ep2.employee_id WHERE ep2.client_policy_id = :policy_id: AND ep2.is_active = 1 + AND ep2.status = 'active' + AND e2.is_active = 1 + AND e2.emp_status = 'active' GROUP BY ep2.client_policy_id ) prem ON prem.client_policy_id = cp.id