Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35409 -r35461 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35409) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35461) @@ -9745,10 +9745,10 @@ sql += String.format(" union all select 4 orderNumber,'孔、盘、巾' firstColumnName ,'④布类班' secondColumnName,sum(tl.amount)*2 amount from (" +dataIndex.getWorkAmountByPackageSQL("配包数量", params) + ") tl "); - //统计处理科室为【大院供应室】灭菌炉分组为【高温灭菌炉】的【炉次】总数(灭菌程序为【P4(B-D试验)】除外)X 1 + //统计处理科室为【大院供应室】灭菌炉分组为【高温灭菌炉】的【炉次】总数X 1 sql += " union all select 5 orderNumber,'灭菌' firstColumnName ,'大院供应室高温炉炉次总和' secondColumnName,count(*) amount " + " from SterilizationRecord sr join Sterilizer s on s.id=sr.sterilizer_id " - + " where s.ownGroup='高温灭菌炉' and (sr.sterilizationType is null or sr.sterilizationType<>'P4(B-D试验)') and sr.startDate " + + " where s.ownGroup='高温灭菌炉' and sr.startDate " + betweenSql + " and sr.orgUnitCoding='" + orgUnitCoding