Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java =================================================================== diff -u -r38951 -r38953 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38951) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/RealTimeBulletinBoardWorkloadHelper.java (.../RealTimeBulletinBoardWorkloadHelper.java) (revision 38953) @@ -1584,7 +1584,10 @@ String invocieUrgentAmountSql = "select ti.tousseName,sum(ti.urgentAmount) tiUrgentAmount" //不回收的物品 需扣除装配数量 - + ", sum(case when t.amount>0 and ti.urgentAmount>0 then ti.urgentAmount when t.amount>0 then 0 " + + ", sum(case when t.amount>0 and ti.urgentAmount > 0 and ti.amount -t.amount>ti.urgentAmount " + + "then ti.urgentAmount " + + "when t.amount>0 and ti.urgentAmount > 0 and ti.amount -t.amount0 then 0 " + "when ti.recyclingAmount is null then ti.urgentAmount " + "when ti.urgentAmount<=ti.recyclingAmount then 0 else ti.urgentAmount - ti.recyclingAmount end) notRecycledUrgentAmount " + ",sum(ti.sendOutAmount) invoiceAmount from "