Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r33892 -r33947
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 33892)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 33947)
@@ -7545,34 +7545,53 @@
 		for (Sterilizer sterilizer : sterilizerList) {
 			sterilizerIdList.add(sterilizer.getId());
 		}
-		String recordHql = String.format("select po from %s po 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' "
+		
+		String topSql = "";
+		if(dbConnection.isSqlServer()){
+			topSql = " top 20 ";
+		}
+		
+		String rowNumSql = "";
+		if(dbConnection.isOracle()){
+			rowNumSql = " and rownum <= 20 ";
+		}
+		
+		String recordSql = String.format("select %s distinct 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' "
+				+ " and srp.id is null %s "
 				+ " order by po.endDate desc ",
+				topSql,
 				SterilizationRecord.class.getSimpleName(),
+				Sterilizer.class.getSimpleName(),
+				SterilizationRecordPic.class.getSimpleName(),
 				dateQueryAdapter.dateAdapter(new Date()),
-				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.sterilizer.id", sterilizerIdList),
-				Constants.STR_YES);
-		List<SterilizationRecord> sterilizationRecordList = objectDao.findByHql(recordHql);
-		if(CollectionUtils.isEmpty(sterilizationRecordList)){
-			return warningVoList;
-		}
-		int amount = 0;
-		for (int i =0;i<sterilizationRecordList.size(); i++) {
-			if(amount == 20){
-				break;
-			}
-			SterilizationRecord sterilizationRecord = sterilizationRecordList.get(i);
-			int count = objectDao.countBySql("select count(id) from "+SterilizationRecordPic.class.getSimpleName()+" where sterilizationRecord_id = "+sterilizationRecord.getId()+" ");
-			if(count==0){
+				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.sterilizer_id", sterilizerIdList),
+				Constants.STR_YES,
+				rowNumSql);
+		
+		ResultSet rs = null;
+		
+		rs = objectDao.executeSql(recordSql);
+		try {
+			while(rs.next()){
+				Date endDate = rs.getTimestamp("endDate");
+				Integer frequency = rs.getInt("frequency");
+				String name = rs.getString("name");
 				String message = String.format("%s第%s炉次已于%s完成灭菌，请上传物理参数图片。",
-						sterilizationRecord.getSterilizer().getName(),
-						sterilizationRecord.getFrequency(),
-						DateTools.getFormatDateStr(sterilizationRecord.getEndDate(), DateTools.COMMON_DATE_HM));
+						name,
+						frequency,
+						DateTools.getFormatDateStr(endDate, DateTools.COMMON_DATE_HM));
 				SystemWarningVo vo = new SystemWarningVo();
 				vo.setMessage(message);
-				vo.setEndDate(sterilizationRecord.getEndDate());
+				vo.setEndDate(endDate);
 				warningVoList.add(vo);
-				amount++;
 			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		return warningVoList;
 	}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r33885 -r33947
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 33885)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 33947)
@@ -4223,32 +4223,51 @@
 			rinserIdList.add(rinser.getId());
 			rinserMap.put(rinser.getId(), rinser);
 		}
-		String recordHql = String.format("select po from %s po 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' order by po.endDate desc",
+		
+		String topSql = "";
+		if(dbConnection.isSqlServer()){
+			topSql = " top 20 ";
+		}
+		
+		String rowNumSql = "";
+		if(dbConnection.isOracle()){
+			rowNumSql = " and rownum <= 20 ";
+		}
+		
+		String recordSql = String.format("select %s distinct 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' "
+				+ "and wp.id is null %s "
+				+ "order by po.endDate desc",
+				topSql,
 				WashAndDisinfectRecord.class.getSimpleName(),
+				Rinser.class.getSimpleName(),
+				WashAndDisinfectPic.class.getSimpleName(),
 				dateQueryAdapter.dateAdapter(new Date()),
 				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.rinserId", rinserIdList),
-				Constants.STR_YES);
-		List<WashAndDisinfectRecord> washAndDisinfectRecordList = objectDao.findByHql(recordHql);
-		if(CollectionUtils.isEmpty(washAndDisinfectRecordList)){
-			return warningVoList;
-		}
-		int amount = 0;
-		for (int i =0;i<washAndDisinfectRecordList.size(); i++) {
-			if(amount == 20){
-				break;
-			}
-			WashAndDisinfectRecord washAndDisinfectRecord = washAndDisinfectRecordList.get(i);
-			int count = objectDao.countBySql("select count(id) from "+WashAndDisinfectPic.class.getSimpleName()+" where washAndDisinfectRecord_id = "+washAndDisinfectRecord.getId()+" ");
-			if(count==0){
+				Constants.STR_YES,
+				rowNumSql);
+		
+		ResultSet rs = null;
+
+		try {
+			rs = objectDao.executeSql(recordSql);
+			while(rs.next()){
+				String rinserName = rs.getString("rinserName");
+				Date endDate = rs.getTimestamp("endDate");
 				String message = String.format("%s已于%s完成清洗，请上传物理参数图片。",
-						rinserMap.get(washAndDisinfectRecord.getRinserId()).getName(),
-						DateTools.getFormatDateStr(washAndDisinfectRecord.getEndDate(), DateTools.COMMON_DATE_HM));
+						rinserName,
+						DateTools.getFormatDateStr(endDate, DateTools.COMMON_DATE_HM));
 				SystemWarningVo vo = new SystemWarningVo();
 				vo.setMessage(message);
-				vo.setEndDate(washAndDisinfectRecord.getEndDate());
+				vo.setEndDate(endDate);
 				warningVoList.add(vo);
-				amount++;
 			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		return warningVoList;
 	}