Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r33947 -r33948 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33947) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 33948) @@ -7556,7 +7556,7 @@ rowNumSql = " and rownum <= 20 "; } - String recordSql = String.format("select %s distinct sterilizer.name, po.id, po.frequency, po.endDate from %s po " + String recordSql = String.format("select %s sterilizer.name, po.id, po.frequency, po.endDate from %s po " + " join %s sterilizer on sterilizer.id = po.sterilizer_id " + " left join %s srp on srp.sterilizationRecord_id = po.id " + " where (po.sterilizerRecordAmount is null or po.sterilizerRecordAmount = 0) and po.endDate is not null and po.endDate < %s and %s and po.promptUploadDevParamPic = '%s' " @@ -7573,8 +7573,8 @@ ResultSet rs = null; - rs = objectDao.executeSql(recordSql); try { + rs = objectDao.executeSql(recordSql); while(rs.next()){ Date endDate = rs.getTimestamp("endDate"); Integer frequency = rs.getInt("frequency"); Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r33947 -r33948 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 33947) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 33948) @@ -4234,7 +4234,7 @@ rowNumSql = " and rownum <= 20 "; } - String recordSql = String.format("select %s distinct r.name rinserName, po.endDate from %s po " + String recordSql = String.format("select %s r.name rinserName, po.endDate from %s po " + "join %s r on r.id = po.rinserId " + "left join %s wp on wp.washAndDisinfectRecord_id = po.id " + "where (po.washDataAmount is null or po.washDataAmount = 0) and po.endDate is not null and po.endDate < %s and %s and po.promptUploadDevParamPic = '%s' "