diff --git a/wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql b/wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql index 1bd9b2a2d..a25f4696a 100644 --- a/wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql +++ b/wnprc_billing/resources/queries/wnprc_billing/perDiemFeeRates.sql @@ -58,4 +58,5 @@ (CAST(pdt.adate AS DATE) <= cr1.enddate OR cr1.enddate IS NULL)) LEFT JOIN ehr_billing.chargeableItems ci1 ON ci1.rowid = cr1.chargeId) pdr WHERE (pdr.item = 'Per diems' AND pdr.project.projectType IS NULL) --Excluding research projects from reduce perDiem - OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24') --Only assigning reduce perDiem to U24 projects \ No newline at end of file + OR (pdr.item = 'Special Animal Per Diem' AND pdr.project.projectType = 'Marmoset U24') --Only assigning reduce perDiem to U24 projects + OR (pdr.item = 'BSL3 Per diems' AND pdr.project.projectType = 'BSL3') \ No newline at end of file diff --git a/wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java b/wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java index e19e0c290..f19830977 100644 --- a/wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java +++ b/wnprc_billing/src/org/labkey/wnprc_billing/table/WNPRC_BillingCustomizer.java @@ -80,6 +80,8 @@ private void customizeChargeableItems(AbstractTableInfo ti) " THEN 'Yes'" + " WHEN " + ExprColumn.STR_TABLE_ALIAS + ".name = 'Special Animal Per Diem'" + " THEN 'Yes'" + + " WHEN " + ExprColumn.STR_TABLE_ALIAS + ".name = 'BSL3 Per diems'" + + " THEN 'Yes'" + " ELSE ''" + " END)" + ")";