Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r20628 -r20633
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20628)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 20633)
@@ -2784,6 +2784,9 @@
 	
 	@Override
 	public List<DisposableGoodsBatchStock> getExpdateDisposableGoodsBatchStocks(Long disposableGoodsID,String expdateType){
+		if(disposableGoodsID == null){
+			return null;
+		}
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
 		calendar.add(Calendar.DAY_OF_YEAR, 30);// 默认告警日期为30天
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r20627 -r20633
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 20627)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 20633)
@@ -1394,6 +1394,9 @@
 		}
 	}
 	
+	/**
+	 * 根据警告类型和一次性物品id获得已过期的一次性物品信息
+	 */
 	public String loadExpiredDiposableGoods() {
 		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 		String id = StrutsParamUtils.getPraramValue("id", "");//一次性物品id
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js
===================================================================
diff -u -r20627 -r20633
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 20627)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.js	(.../diposableGoodsWarningView.js)	(revision 20633)
@@ -315,7 +315,7 @@
 	formWindow = new top.Ext.Window( {
 		id : 'diposableGoodsWin',
 		layout : 'fit',
-		title : '一次性物品信息',
+		title : '一次性物品信息'+'('+$Id("parm_s_type").value+')',
 		width : 850,
 		modal : true,
 		autoHeight : true,
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r20464 -r20633
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 20464)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 20633)
@@ -268,8 +268,38 @@
 		String json = gridManager.renderGrid(parameterMap,
 				DisposableGoodsBatchStock.class.getSimpleName(), sql,
 				new String[] { "identifications", "goodsBatchs" });
+		json = adjustGridAmount(json,type);//校正一次性物品告警列表总数
 		return json;
 	}
+	
+	//校正一次性物品告警列表总数
+	private String adjustGridAmount(String json, String expdateType) {
+		if(StringUtils.isNotBlank(json)){
+			try {
+				//转回json对象
+				JSONObject obj = JSONObject.fromObject(json);
+				//获得rows的json数组
+				net.sf.json.JSONArray rows = obj.optJSONArray("rows");
+				for (Object object : rows) {
+					JSONObject jsonObj = (JSONObject) object;
+					//获得rows中的diposableGoods json对象
+					JSONObject diposableGoods = jsonObj.optJSONObject("diposableGoods");
+					String id = diposableGoods.getString("id");
+					List<DisposableGoodsBatchStock> DisposableGoodsBatchStocks = diposableGoodsManager.getExpdateDisposableGoodsBatchStocks(Long.valueOf(id), expdateType);
+					int expDateAmount = 0;
+					for (DisposableGoodsBatchStock disposableGoodsBatchStock : DisposableGoodsBatchStocks) {
+						expDateAmount += disposableGoodsBatchStock.getStorage();
+					}
+					//校正总数
+					diposableGoods.put("amount", expDateAmount);
+				}
+				return obj.toString();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return json;
+	}
 
 	public String[] getBatchNumbersByDiposableGoodsId(String id,
 			boolean selectAll) {
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r20627 -r20633
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 20627)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 20633)
@@ -257,7 +257,7 @@
 	/**
 	 * 获得失效的批次库存
 	 * @param disposableGoodsID 一次洗物品id
-	 * @param expdateType	即将过期的一次性物品/已过期的一次性物品
+	 * @param expdateType	即将过期的一次性物品/已过期的一次性物品/全部
 	 * @return
 	 */
 	public List<DisposableGoodsBatchStock> getExpdateDisposableGoodsBatchStocks(Long disposableGoodsID,String expdateType);
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp
===================================================================
diff -u -r12916 -r20633
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 12916)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp	(.../diposableGoodsWarningView.jsp)	(revision 20633)
@@ -21,7 +21,7 @@
     var diposableGoods = '<%=SystemWarningItemVO.WARNING_TYPE_DIPOSABLEGOODS%>';
     var warningType = '<%= request.getParameter("queryType")%>';
     if(warningType == null || warningType == "null"){
-    	warningType = "";
+    	warningType = "全部";
     }
 </script>