Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17183 -r17191 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17183) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17191) @@ -7638,7 +7638,7 @@ + " where mi.tousse_id=td.id and td.forDisplay=1 group by td.name) tdc " + " where i.id=ti.invoice_id and ti.tousseDefinition_id=td.id " + " and tdc.tdName = td.name " - + " and ti.depart != '手术室' " + + " and (ti.depart is null or ti.depart != '手术室') " + " and td.packageType != '纸塑' " + " and i.sendTime between " + startDay +" and "+endDay; Integer amount10 = getAmountBySql(sql10);