Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gowtham M 2026-07-03 17:49:34 +05:30
commit 92adc96ce6
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Models/ClaimsCollectionV2DashboardModel.php
View File

@ -346,30 +346,37 @@ JOIN (
ep2.client_policy_id, ep2.client_policy_id,
COALESCE(SUM( COALESCE(SUM(
CASE 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 WHEN ep2.date_of_exit IS NOT NULL
AND ep2.date_of_exit != '' AND ep2.date_of_exit != ''
AND ep2.claim_status = 0 AND (ep2.claim_status = 0 OR ep2.claim_status IS NULL)
THEN -ep2.rata_premimum AND ep2.date_coverage IS NOT NULL
ELSE 0 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 END
), 0) AS premium_as_on_date ), 0) AS premium_as_on_date
FROM employee_polices ep2 FROM employee_polices ep2
JOIN employees e2 ON e2.id = ep2.employee_id JOIN employees e2 ON e2.id = ep2.employee_id
WHERE ep2.client_policy_id = :policy_id: WHERE ep2.client_policy_id = :policy_id:
AND ep2.is_active = 1 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 GROUP BY ep2.client_policy_id
) prem ON prem.client_policy_id = cp.id ) prem ON prem.client_policy_id = cp.id
JOIN ticket_master tm LEFT JOIN ticket_master tm
ON tm.client_policy_id = cp.id ON tm.client_policy_id = cp.id
AND tm.is_active = 1 AND tm.is_active = 1
JOIN ticket_claim_status tcs LEFT JOIN ticket_claim_status tcs
ON tcs.id = tm.claim_status_id ON tcs.id = tm.claim_status_id
WHERE cp.id = :policy_id: WHERE cp.id = :policy_id:

5
app/Models/EmployeePolicyModel.php
View File

@ -1196,7 +1196,10 @@ class EmployeePolicyModel extends Model
deletiondata.changeevent, deletiondata.changeevent,
deletiondata.reasonforexit, deletiondata.reasonforexit,
deletiondata.status, 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.dob, '%d-%b-%Y') AS emp_dob,
DATE_FORMAT(employees.doj, '%d-%b-%Y') AS emp_doj, DATE_FORMAT(employees.doj, '%d-%b-%Y') AS emp_doj,