diff --git a/app/Controllers/Billing/CaseMaster.php b/app/Controllers/Billing/CaseMaster.php index b0dc82a..341b954 100644 --- a/app/Controllers/Billing/CaseMaster.php +++ b/app/Controllers/Billing/CaseMaster.php @@ -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 diff --git a/app/Models/OrganizationCaseModel.php b/app/Models/OrganizationCaseModel.php index 7ee3ffc..6daf2df 100644 --- a/app/Models/OrganizationCaseModel.php +++ b/app/Models/OrganizationCaseModel.php @@ -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