From 2011ce42f18600923b059904befbd8bd19778543 Mon Sep 17 00:00:00 2001 From: labkey-sweta Date: Thu, 14 Oct 2021 09:57:37 -0700 Subject: [PATCH] Fixing the build break on 21.10 caused by conflict while merging 21.7 --- .../src/org/labkey/wnprc_ehr/table/WNPRC_EHRCustomizer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/table/WNPRC_EHRCustomizer.java b/WNPRC_EHR/src/org/labkey/wnprc_ehr/table/WNPRC_EHRCustomizer.java index 5aaaa9efd..03ff230d7 100644 --- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/table/WNPRC_EHRCustomizer.java +++ b/WNPRC_EHR/src/org/labkey/wnprc_ehr/table/WNPRC_EHRCustomizer.java @@ -264,11 +264,11 @@ private void customizeFeedingTable(AbstractTableInfo ti) GUID ehrEntityId = ehrContainer.getEntityId(); SQLFragment sql = new SQLFragment("(SELECT " + " (CASE WHEN " + ExprColumn.STR_TABLE_ALIAS + ".type = (SELECT Rowid from ehr_lookups.lookups where set_name = 'feeding_types' and value = 'log' and container ='"+ ehrEntityId.toString() + "')" + - "THEN (ROUND(amount*"+ conv.toString() + ") || ' flower')" + + "THEN (ROUND(amount*"+ conv + ") || ' flower')" + "WHEN " + ExprColumn.STR_TABLE_ALIAS + ".type = (SELECT Rowid from ehr_lookups.lookups where set_name = 'feeding_types' and value = 'log (gluten-free)' and container ='"+ ehrEntityId.toString() + "')" + - "THEN (ROUND(amount*"+ conv.toString() + ") || ' flower')" + + "THEN (ROUND(amount*"+ conv + ") || ' flower')" + "WHEN " + ExprColumn.STR_TABLE_ALIAS + ".type = (SELECT Rowid from ehr_lookups.lookups where set_name = 'feeding_types' and value = 'flower' and container ='" + ehrEntityId.toString() + "')" + - "THEN (ROUND(amount*" + invconv.toString() + ") || ' log')" + + "THEN (ROUND(amount*" + invconv + ") || ' log')" + "ELSE " + " 'bad data'" + "END) as ChowConversion)");