Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizerQualityReportHelper.java =================================================================== diff -u -r37727 -r37754 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizerQualityReportHelper.java (.../SterilizerQualityReportHelper.java) (revision 37727) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SterilizerQualityReportHelper.java (.../SterilizerQualityReportHelper.java) (revision 37754) @@ -77,7 +77,7 @@ String sql = " select ti.sterilizerName,ti.sterileFrequency,ti.tousseName, ou.name sendDepart," + " ti.sterileStartTime,ti.sterilizationUser,count(*) amount " - + ",case when b.noqualified=1 then '否' else '是' end isQualified " + + ",case when b.noqualified=1 then '不合格' else '合格' end isQualified " + "from tousseinstance ti join barcodeDevice bd on bd.id=ti.id " + " join sterilizer ster on ti.sterilizerName = ster.name" + " left join (select qmd.barcode,1 noqualified from " @@ -348,7 +348,7 @@ } child.setTousseAmount(rs.getInt(7)); String isQualified = rs.getString("isQualified"); - child.setIsQualified(isQualified); + child.setIsQualified("不合格"); SterilizerQualiyBean bean; if(map.containsKey(key)){ bean = map.get(key); @@ -370,7 +370,7 @@ } String noQualifiedMapKey = sterilizerName + sterileFrequency + tousseName + sendDepart + sterileStartTime + sterilizationUser; - if("否".equals(isQualified) && noQualifiedMap.containsKey(noQualifiedMapKey)){ + if("不合格".equals(isQualified) && noQualifiedMap.containsKey(noQualifiedMapKey)){ JSONArray qmiArr = noQualifiedMap.get(noQualifiedMapKey); if(qmiArr != null){ msgb.setLength(0);