Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r17114 -r17127 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17114) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 17127) @@ -7625,12 +7625,12 @@ String columnName9 = "处理呼吸机管道总包数"; YearWorkloadBean bean9 = new YearWorkloadBean(i,month, 9, columnName9, amount9); list.add(bean9); - // 处理临床总件数,数据获取器械包回收/发货时科室不等于手术室的,并且包装类型不包含纸塑 + // 处理临床总件数,数据获取器械包申请时科室不等于手术室的,并且包装类型不包含纸塑 String sql10 = " select sum(tdc.amount) from Invoice i,TousseInstance ti,TousseDefinition td,(select td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td " + " 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.orgUnitName != '手术室' " + + " and ti.depart != '手术室' " + " and td.packageType != '纸塑' " + " and i.sendTime between " + startDay +" and "+endDay; Integer amount10 = getAmountBySql(sql10);