d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(orgcase): avoid missing discount column in union query

Browse Source
This commit is contained in:
DevSoftTech Server 2026-06-05 11:34:52 +05:30
parent 9f1d5b93e6
commit e7d6dd88d2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Billing/CaseMaster.php
View File

@ -570,7 +570,7 @@ class CaseMaster extends BaseController
date_format(i.inv_date,'%d-%m-%Y') AS str_date,
concat(t.item_name) AS Description,i.invoice_code AS Code,
t.item_amount AS Amount,t.org_code AS orgcode,
coalesce(t.discount_amount,0) AS discount_amount,
case when it.item_rate is not null and it.item_rate <> t.item_rate then 1 else 0 end AS discount_amount,
it.item_rate AS d_rate
from invoice_master i
join organization_case_master c on i.insurance_case_id = c.id

2
app/Models/OrganizationCaseModel.php
View File

@ -60,7 +60,7 @@ class OrganizationCaseModel extends Model
date_format(i.inv_date,'%d-%m-%Y') AS str_date,
concat(t.item_name) AS Description,i.invoice_code AS Code,
t.item_amount AS Amount,t.org_code AS orgcode,
coalesce(t.discount_amount,0) AS discount_amount,
case when it.item_rate is not null and it.item_rate <> t.item_rate then 1 else 0 end AS discount_amount,
it.item_rate AS d_rate
from invoice_master i
join organization_case_master c on i.insurance_case_id = c.id