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

fix(orgcase): use insurance amount1 in union invoice query

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

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

@ -570,8 +570,8 @@ 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,
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
case when it.amount1 is not null and it.amount1 <> t.item_rate then 1 else 0 end AS discount_amount,
it.amount1 AS d_rate
from invoice_master i
join organization_case_master c on i.insurance_case_id = c.id
join invoice_item t on t.inv_master_id = i.id

4
app/Models/OrganizationCaseModel.php
View File

@ -60,8 +60,8 @@ 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,
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
case when it.amount1 is not null and it.amount1 <> t.item_rate then 1 else 0 end AS discount_amount,
it.amount1 AS d_rate
from invoice_master i
join organization_case_master c on i.insurance_case_id = c.id
join invoice_item t on t.inv_master_id = i.id