Index: src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java =================================================================== diff -u -r64b870971f88eef9e5c4099f77bbe602802a3fbe -r5415cba6be7e86452da205992d85c73ff0e9ce97 --- src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 64b870971f88eef9e5c4099f77bbe602802a3fbe) +++ src/main/java/com/napa/pulse/dao/impl/SessionDAOImpl.java (.../SessionDAOImpl.java) (revision 5415cba6be7e86452da205992d85c73ff0e9ce97) @@ -2618,7 +2618,7 @@ String salesCode = jdbcTemplate.queryForObject("select MIN_MAX_SALES_SETTING from PULSE_SESSION where SESSION_ID="+sessionId,String.class); - salesCode = ("DIT").equals(salesCode)?" b.sold_last_12_months ":("IT").equals(salesCode)? " (b.sold_last_12_months + NVL(b.transfer_12_months,0)) ": " (b.sold_last_12_months - NVL(b.transfer_12_months,0)) "; + salesCode = ("DIT").equals(salesCode)?"(b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0))":("IT").equals(salesCode)? "((b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0)) + NVL(b.transfer_12_months,0))": "((b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0)) - NVL(b.transfer_12_months,0))"; String sortingStmt2 = " "; if (sortBy != null) { @@ -3170,7 +3170,7 @@ String salesCode = jdbcTemplate.queryForObject("select MIN_MAX_SALES_SETTING from PULSE_SESSION where SESSION_ID="+sessionId,String.class); - salesCode = ("DIT").equals(salesCode)?"b.sold_last_12_months":("IT").equals(salesCode)? "(b.sold_last_12_months + NVL(b.transfer_12_months,0))": "(b.sold_last_12_months - NVL(b.transfer_12_months,0))"; + salesCode = ("DIT").equals(salesCode)?"(b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0))":("IT").equals(salesCode)? "((b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0)) + NVL(b.transfer_12_months,0))": "((b.sold_last_12_months - NVL(b.hub_spoke_transfer_12,0)) - NVL(b.transfer_12_months,0))"; String sql = "WITH min_max_data as (\n" + "SELECT /*+ INDEX (b SITE_PRODUCT_PRODUCT_IDX) */ c.field_abbr , c.part_number , a.min_stocking_qty as newmin , a.max_stocking_qty as newmax , b.initial_stocking_dt ,\n" +