Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33843 -r33845 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33843) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33845) @@ -13062,7 +13062,10 @@ String statusSql = ""; if(enableTheSterilizationResultJudgmentFunction){ statusSql = " and po.status = '"+SterilizationRecord.STERILIZATION_STATUS_END - + "' "; + + "' and po.sterilizationResult in('" + + SterilizationRecord.STERILIZATIONRESULT_QUALIFIED + +"','"+ SterilizationRecord.STERILIZATIONRESULT_UNQUALIFIED + +"') "; } String sql = " where po.endDate between " + dateQueryAdapter.dateConverAdapter2( startTime Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java =================================================================== diff -u -r33843 -r33845 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 33843) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java (.../ReportManagerImpl.java) (revision 33845) @@ -618,7 +618,10 @@ String statusSql = ""; if(enableTheSterilizationResultJudgmentFunction){ statusSql = " and sr.status = '"+SterilizationRecord.STERILIZATION_STATUS_END - + "' "; + + "' and sr.sterilizationResult in('" + + SterilizationRecord.STERILIZATIONRESULT_QUALIFIED + +"','"+ SterilizationRecord.STERILIZATIONRESULT_UNQUALIFIED + +"') "; } String sterilizerNameGroupSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("s.ownGroup", sterilizerNameGroup, ","); String sterilizerNameSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("s.name", sterilizerName, ","); @@ -695,7 +698,10 @@ String statusSql = ""; if(enableTheSterilizationResultJudgmentFunction){ statusSql = " and sr.status = '"+SterilizationRecord.STERILIZATION_STATUS_END - + "' "; + + "' and sr.sterilizationResult in('" + + SterilizationRecord.STERILIZATIONRESULT_QUALIFIED + +"','"+ SterilizationRecord.STERILIZATIONRESULT_UNQUALIFIED + +"') "; } String sterilizerNameGroupSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("s.ownGroup", sterilizerNameGroup, ","); String sterilizerNameSql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("s.name", sterilizerName, ",");