Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r30733 -r30752
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30733)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 30752)
@@ -3878,18 +3878,27 @@
 				dateQueryAdapter.dateAdapter(new Date()),
 				SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.rinserId", rinserIdList),
 				Constants.STR_YES);
-		List<WashAndDisinfectRecord> washAndDisinfectRecordList = objectDao.findByHql(recordHql, 0, 20);
+		List<WashAndDisinfectRecord> washAndDisinfectRecordList = objectDao.findByHql(recordHql);
 		if(CollectionUtils.isEmpty(washAndDisinfectRecordList)){
 			return warningVoList;
 		}
-		for (WashAndDisinfectRecord washAndDisinfectRecord : washAndDisinfectRecordList) {
-			String message = String.format("%s已于%s完成清洗，请上传物理参数图片。",
-					rinserMap.get(washAndDisinfectRecord.getRinserId()).getName(),
-					DateTools.getFormatDateStr(washAndDisinfectRecord.getEndDate(), DateTools.COMMON_DATE_HM));
-			SystemWarningVo vo = new SystemWarningVo();
-			vo.setMessage(message);
-			vo.setEndDate(washAndDisinfectRecord.getEndDate());
-			warningVoList.add(vo);
+		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){
+				String message = String.format("%s已于%s完成清洗，请上传物理参数图片。",
+						rinserMap.get(washAndDisinfectRecord.getRinserId()).getName(),
+						DateTools.getFormatDateStr(washAndDisinfectRecord.getEndDate(), DateTools.COMMON_DATE_HM));
+				SystemWarningVo vo = new SystemWarningVo();
+				vo.setMessage(message);
+				vo.setEndDate(washAndDisinfectRecord.getEndDate());
+				warningVoList.add(vo);
+				amount++;
+			}
 		}
 		return warningVoList;
 	}
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
===================================================================
diff -u -r30747 -r30752
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 30747)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 30752)
@@ -5,7 +5,6 @@
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
@@ -33,11 +32,8 @@
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
-import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningVo;
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
-import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager;
 import com.forgon.disinfectsystem.systemwarning.service.SystemWarningManager;
-import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
 import com.forgon.tools.SqlBuilder;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
@@ -65,21 +61,7 @@
 	private ObjectDao objectDao;
 
 	private InvoicePlanManager invoicePlanManager;
-	
-	private SterilizationRecordManager sterilizationRecordManager;
-	
-	private WashAndDisinfectRecordManager washAndDisinfectRecordManager;
-	
-	public void setSterilizationRecordManager(
-			SterilizationRecordManager sterilizationRecordManager) {
-		this.sterilizationRecordManager = sterilizationRecordManager;
-	}
 
-	public void setWashAndDisinfectRecordManager(
-			WashAndDisinfectRecordManager washAndDisinfectRecordManager) {
-		this.washAndDisinfectRecordManager = washAndDisinfectRecordManager;
-	}
-
 	public void setInvoicePlanManager(InvoicePlanManager invoicePlanManager) {
 		this.invoicePlanManager = invoicePlanManager;
 	}
@@ -338,32 +320,7 @@
 	 */
 	public void promptUploadDeviceParameterPicture(){
 		try {
-			JSONArray message = new JSONArray();
-			List<SystemWarningVo> allVo = new ArrayList<SystemWarningVo>();
-			List<SystemWarningVo> vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture();
-			List<SystemWarningVo> vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture();
-			if(vo1 != null){
-				allVo.addAll(vo1);
-			}
-			if(vo2 != null){
-				allVo.addAll(vo2);
-			}
-			allVo.sort(new Comparator<SystemWarningVo>() {
-				@Override
-				public int compare(SystemWarningVo o1, SystemWarningVo o2) {
-					if (o1.getEndDate() == null && o2.getEndDate() != null) {
-						return -1;
-					}
-					if (o1.getEndDate() != null && o2.getEndDate() == null) {
-						return 1;
-					}
-					return o2.getEndDate().compareTo(o1.getEndDate());
-				}
-			});
-			for(int i=0;i<20 && i<allVo.size();i++){
-				SystemWarningVo vo = allVo.get(i);
-				message.add(vo.getMessage());
-			}
+			JSONArray message = systemWarningManager.promptUploadDeviceParameterPicture();
 			StrutsResponseUtils.output(true, message);
 		} catch (Exception e) {
 			e.printStackTrace();