Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33744 -r33745 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33744) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33745) @@ -8667,9 +8667,9 @@ String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection); params.sqlLengthFunctionName = sqlLengthFunctionName; //1.计算申请科室分组为【内部代理灭菌】的【代理灭菌】处理【包数】 2.计算申请科室分组为【临床外部代理灭菌】的【外部代理灭菌】处理【包数】 取数为两者总和 - params.extraQuery = " and ( " + params.extraQuery = " and ( 1=1 " + getProxydisinfectionOrgUnitGroupSql("内部代理灭菌") - + " or " + + " or 1=1 " + getForeignproxyOrgUnitGroupSql("临床外部代理灭菌") + ") "; //灭菌记录