Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r30832 -r30948
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 30832)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 30948)
@@ -934,17 +934,23 @@
 	
 
 	@Override
-	public JSONArray promptUploadDeviceParameterPicture() {
+	public JSONArray promptUploadDeviceParameterPicture(String warningType) {
 		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(StringUtils.equals(warningType, "washAndDisinfect")){
+			allVo = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture();
+		}else if(StringUtils.equals(warningType, "sterilizationRecord")){
+			allVo = sterilizationRecordManager.promptUploadDeviceParameterPicture();
+		}else{
+			List<SystemWarningVo> vo1 = sterilizationRecordManager.promptUploadDeviceParameterPicture();
+			List<SystemWarningVo> vo2 = washAndDisinfectRecordManager.promptUploadDeviceParameterPicture();
+			if(vo1 != null){
+				allVo.addAll(vo1);
+			}
+			if(vo2 != null){
+				allVo.addAll(vo2);
+			}
 		}
-		if(vo2 != null){
-			allVo.addAll(vo2);
-		}
 		allVo.sort(new Comparator<SystemWarningVo>() {
 			@Override
 			public int compare(SystemWarningVo o1, SystemWarningVo o2) {
@@ -963,4 +969,5 @@
 		}
 		return message;
 	}
+
 }
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
===================================================================
diff -u -r30752 -r30948
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 30752)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 30948)
@@ -320,7 +320,9 @@
 	 */
 	public void promptUploadDeviceParameterPicture(){
 		try {
-			JSONArray message = systemWarningManager.promptUploadDeviceParameterPicture();
+			//告警类型
+			String warningType = StrutsParamUtils.getPraramValue("warningType", null);
+			JSONArray message = systemWarningManager.promptUploadDeviceParameterPicture(warningType);
 			StrutsResponseUtils.output(true, message);
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManager.java
===================================================================
diff -u -r30747 -r30948
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManager.java	(.../SystemWarningManager.java)	(revision 30747)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManager.java	(.../SystemWarningManager.java)	(revision 30948)
@@ -20,7 +20,8 @@
 	
 	/**
 	 * 提示上传设备物理参数图片(SZYK-27)
+	 * @param warningType 告警类型
 	 */
-	public JSONArray promptUploadDeviceParameterPicture();
+	public JSONArray promptUploadDeviceParameterPicture(String warningType);
 
 }