Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r15045 -r17135
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 15045)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java	(.../TousseGoodsStockTableManager.java)	(revision 17135)
@@ -109,45 +109,38 @@
 			sqlBuilder.append(" and ").append(names);
 		}
 
-		//科室名称
-		String orgUnitCode = sqlWhereParamMap.get("orgUnitCode");
-		if (StringUtils.isNotBlank(orgUnitCode)) {
-			sqlBuilder.append(" and orgUnitCode='" + orgUnitCode + "'");
-		}else{
-			sqlBuilder.append(" and orgUnitCode='" + AcegiHelper.getCurrentOrgUnitCode() + "'");
-		}
+		sqlBuilder.append(" and orgUnitCode='" + AcegiHelper.getCurrentOrgUnitCode() + "'");  //只查用户当前科室的物品的库存
 		
 		sqlBuilder.append(" group by name , orgUnitName ) vw");
 
-		int start = 0;
-		int pageSize = 20;
-		if (parameterMap != null) {
-			Map<String, String> paramSqlMap = gridManager
-					.parserMapToSQL(parameterMap);
+//		int start = 0;
+//		int pageSize = 20;
+//		if (parameterMap != null) {
+//			Map<String, String> paramSqlMap = gridManager
+//					.parserMapToSQL(parameterMap);
+//
+//			List<String> pageStart = parameterMap
+//					.get(GridManager.GRID_PAGE_START);
+//			if (pageStart != null && pageStart.size() > 0
+//					&& StringUtils.isNotBlank(pageStart.get(0))
+//					&& StringUtils.isNumeric(pageStart.get(0))) {
+//				start = Integer.valueOf(pageStart.get(0));
+//			}
+//
+//			List<String> pageSizeStr = parameterMap
+//					.get(GridManager.GRID_PAGE_SIZE);
+//			if (pageSizeStr != null && pageSizeStr.size() > 0
+//					&& StringUtils.isNotBlank(pageSizeStr.get(0))
+//					&& StringUtils.isNumeric(pageSizeStr.get(0))) {
+//				pageSize = Integer.valueOf(pageSizeStr.get(0));
+//			}
+//		}
 
-			List<String> pageStart = parameterMap
-					.get(GridManager.GRID_PAGE_START);
-			if (pageStart != null && pageStart.size() > 0
-					&& StringUtils.isNotBlank(pageStart.get(0))
-					&& StringUtils.isNumeric(pageStart.get(0))) {
-				start = Integer.valueOf(pageStart.get(0));
-			}
-
-			List<String> pageSizeStr = parameterMap
-					.get(GridManager.GRID_PAGE_SIZE);
-			if (pageSizeStr != null && pageSizeStr.size() > 0
-					&& StringUtils.isNotBlank(pageSizeStr.get(0))
-					&& StringUtils.isNumeric(pageSizeStr.get(0))) {
-				pageSize = Integer.valueOf(pageSizeStr.get(0));
-			}
-		}
-
 		String sql = sqlBuilder.toString();
 		int totalResults = objectDao.countBySql("select count(0) from " + sql);
 		List<GoodsStock> goodsStockList = new ArrayList<GoodsStock>();
 		ResultSet rs = objectDao.executeSql("select * from " + sql + " order by name");
 		try {
-			//ResultSetUtil.setFieldValueByResultSet(rs, GoodsStock.class, goodsStockList);
 			while(rs.next()){
 				GoodsStock goodsStock = new GoodsStock();
 				goodsStock.setAmount(rs.getInt("amount"));
@@ -156,14 +149,30 @@
 				goodsStockList.add(goodsStock);
 			}
 		} catch (SQLException e) {
-			
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
-		DatabaseUtil.closeResultSetAndStatement(rs);
 		
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("totalResults", totalResults);
-		map.put("list", goodsStockList);
-		//map.put("selectSqlWhereCondition", sql);
+		ResultSet rs2 = objectDao.executeSql("select '','',sum(vw.amount) amount from " + sql);  //汇总数量
+		try {
+			rs2.next();
+			GoodsStock goodsStock = new GoodsStock();
+			goodsStock.setAmount(rs2.getInt("amount"));
+			goodsStock.setName("总数");
+			goodsStock.setOrgUnitName("");
+			goodsStockList.add(goodsStock);
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs2);
+		}
+		
+		
+//		Map<String, Object> map = new HashMap<String, Object>();
+//		map.put("totalResults", totalResults);
+//		map.put("list", goodsStockList);
+//		map.put("selectSqlWhereCondition", sql);
 		String json = gridManager.converJsonString(totalResults, goodsStockList, sql , new String[]{});
 		return json;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r17030 -r17135
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 17030)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 17135)
@@ -2498,8 +2498,11 @@
 	}
 	
 	/**
-	 * 在器械包类型为（器械包、敷料包、消毒物品、外部代理灭菌、外来器械包）这五种的基础，根据关键字“spell”进行模糊查询
+	 * 在器械包类型为（器械包、敷料包、消毒物品、外部代理灭菌、自定义器械包、外来器械包、聚合包）这七种的基础之上指定想要的类型和指定的处理科室，并且根据关键字“spell”进行模糊查询
 	 * 
+	 * @param code	处理科室编码
+	 * @param tousseTypes	指定的器械包类型集合（用分号分隔）
+	 * 
 	 * 返回给前台的字符串格式如下：
 	 	{
 		 	totalCount:器械包总数
@@ -2526,10 +2529,12 @@
 		String handlerDepartCode = StrutsParamUtils.getPraramValue("code", "");
 		String tousseTypes = StrutsParamUtils.getPraramValue("tousseTypes", "");
 		
-		String[] tousseTypeArray = StringUtils.isNotBlank(tousseTypes) ? tousseTypes.split(";") : new String[] {};
+		String[] tousseTypeArray = StringUtils.isNotBlank(tousseTypes) ?
+				tousseTypes.split(";") : new String[] {};
 		
-		List<Map<String, Object>> list = tousseDefinitionManager.searchTousseBySimpleCodeAndAnyTousseTypeArr(spell,
-				tousseTypeArray, true);
+		List<Map<String, Object>> list = tousseDefinitionManager
+				.searchTousseBySimpleCodeAndAnyTousseTypeArr(spell, tousseTypeArray, true);
+				
 		JSONObject jSONObject = new JSONObject();
 		jSONObject.put("totalCount", list.size());
 		jSONObject.put("data", list);
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
===================================================================
diff -u -r16972 -r17135
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 16972)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 17135)
@@ -1,8 +1,10 @@
 var grid;
 function initQueryValueAndReload() {
+	
 	$Id('parm_s_tousseName').value = Ext.getCmp('tousseName').getRawValue();
 	grid.getStore().lastOptions.params['start'] = 0;
 	grid.dwrReload();
+	
 }
 
 /**
@@ -31,97 +33,74 @@
 	    {name : 'amount'}
 	];
 
+	
 	var form = new Ext.Panel({
 		title : '器械包库存列表',
-		layout : 'table',
-		frame : true,
 		region : 'north',
-		border : false,
-		bodyBorder : false,
-		labelAlign:"right",
-		layoutConfig : {columns : 2},
-		height : 88,
+		buttonAlign : 'center',
+		collapsible : true,
+		collapseMode : 'mini',
+		frame : true,
+		height : 100,
 		items : [{
-			columnWidth : .6,
-			layout : 'form',
-			labelWidth : 85,
-			items : [{
-				xtype : 'combo',
-				id : 'tousseName',
-				name : 'tousseName',
-				fieldLabel : '器械包名称',
-				queryParam : 'spell',
-				minChars : 0,
-				valueField : 'name',
-				displayField : 'displayName',
-				store : new Ext.data.Store({
-					proxy : new Ext.data.HttpProxy({
-						url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
-						method : 'POST'
-					}),
-					reader : new Ext.data.JsonReader({
-						totalProperty : 'totalCount',
-						root : 'data'
-					}, [
-					    {name : 'id',mapping : 'id'}, 
-					    {name : 'spelling',mapping : 'spelling'}, 
-					    {name : 'name',mapping : 'name'}, 
-					    {name : 'displayName',mapping : 'displayName'}, 
-					    {name : 'amount',mapping : 'amount'}]
-					)
-				}),
-				forceSelection : false,
-				lazyInit : true,
-				triggerAction : 'all',
-				hideTrigger : true,
-				typeAhead : false,
-				anchor : '95%',
-				listeners : {
-					select : function(combo, record, index) {
-						combo.setValue(record.data.name);
-					}
-				}
-			}]
-		},{
-			width :500,
 			layout : 'column',
 			items : [{
-				columnWidth : .2,
-				layout :'form',
+				layout : 'form',
+				width : 300,
+				labelWidth : 70,
+				labelAlign : 'right',
 				items : [{
-					xtype : 'button',
-					text : '查询',
-					minWidth : 50,
-					iconCls : 'icon_search',
-					handler : function() {
-						initQueryValueAndReload();
-					}
+					xtype : 'combo',
+					id : 'tousseName',
+					name : 'tousseName',
+					fieldLabel : '器械包名称',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : new Ext.data.Store({
+						proxy : new Ext.data.HttpProxy({
+							url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseInfoByHandlerDepartCodeAndtousseTypeArray.do',
+							method : 'POST'
+						}),
+						reader : new Ext.data.JsonReader({
+							totalProperty : 'totalCount',
+							root : 'data'
+						}, [
+						    {name : 'id',mapping : 'id'}, 
+						    {name : 'name',mapping : 'name'}]
+						)
+					}),
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					anchor : '95%'
 				}]
-			},{
-				columnWidth : .2,
-				layout :'form',
-				items : [{
-					xtype : 'button',
-					text : '重置',
-					minWidth : 50,
-					iconCls : 'icon_set',
-					handler : function() {
-						$Id('tousseName').value = "";
-					}
-				}]
-			},{
-				columnWidth : .6,
-				layout :'form',
-				items : [{
-					xtype : 'button',
-					text : '设置统计的器械包',
-					minWidth : 50,
-					iconCls : 'icon_set',
-					handler : function() {
-						setNeedStatisticsTousse('器械包库存', top.dirOrgCode, '');
-					}
-				}]
 			}]
+		}],
+		buttons : [{
+			text : '查询',
+			minWidth : 50,
+			iconCls : 'icon_search',
+			handler : function() {
+				initQueryValueAndReload();
+			}
+		},{
+			text : '重置',
+			minWidth : 50,
+			iconCls : 'icon_set',
+			handler : function() {
+				$Id('tousseName').value = "";
+			}
+		},{
+			text : '设置统计的器械包',
+			minWidth : 50,
+			iconCls : 'icon_set',
+			handler : function() {
+				setNeedStatisticsTousse(model, top.dirOrgCode, null);
+			}
 		}]
 	});
 	
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
===================================================================
diff -u -r15025 -r17135
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp	(.../tousseGoodsStockView.jsp)	(revision 15025)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp	(.../tousseGoodsStockView.jsp)	(revision 17135)
@@ -1,4 +1,5 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption"%>
 <%@ include file="/common/taglibs.jsp"%>
 
 <html>
@@ -16,23 +17,22 @@
     <operation:authorize ifAnyGranted="SSTS_SystemWarning_TousseGoods_delete">
     SSTS_SystemWarning_TousseGoods_delete = false;
     </operation:authorize>
-
+    var model = '<%=GoodsOption.MODEL_TOUSSEGOODSSTOCK%>';  //设置的类型
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css" />
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/TousseGoodsStockTableManager.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/util.js"></script>
-<script type="text/javascript" src="tousseGoodsStockView.js"></script>
-	<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/setGoodsOption.js"></script>
-	<script type="text/javascript" src="${ctx }/dwr/interface/JasperreportsTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/setGoodsOption.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/JasperreportsTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
 <script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
-
+<script type="text/javascript" src="tousseGoodsStockView.js"></script>
 <title>器械包库存</title>
 </head>
 <body>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
===================================================================
diff -u -r17007 -r17135
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 17007)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 17135)
@@ -54,87 +54,87 @@
 			height : 40,
 			labelWidth : 70,
 			items : [{
-					width : 200,
-					layout : 'form',
-					items : [ {
-						xtype : 'datefieldWithMin',
-						fieldLabel : '开始日期',
-						id : 'startTime',
-						name : 'startTime',
-						editable : false,
-						format : 'Y-m-d',
-						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-						allowBlank : false,
-						anchor : '95%',
-						value: new Date(startDayofMonth),
-						listeners : {
-							specialkey : function(field, e) {
-								if (e.getKey() == Ext.EventObject.ENTER) {
-									var isOK = field.validate();
-									if(isOK){
-										var value = field.getValue();
-										field.setValue(value);
-										var endTime = Ext.getCmp('endTime');
-										endTime.selectText();
-										endTime.focus();
-									}
-									
+				width : 200,
+				layout : 'form',
+				items : [{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '开始日期',
+					id : 'startTime',
+					name : 'startTime',
+					editable : false,
+					format : 'Y-m-d',
+					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+					allowBlank : false,
+					anchor : '95%',
+					value: new Date(startDayofMonth),
+					listeners : {
+						specialkey : function(field, e) {
+							if (e.getKey() == Ext.EventObject.ENTER) {
+								var isOK = field.validate();
+								if(isOK){
+									var value = field.getValue();
+									field.setValue(value);
+									var endTime = Ext.getCmp('endTime');
+									endTime.selectText();
+									endTime.focus();
 								}
+								
 							}
 						}
-					}]
-				},{
-					width : 200,
-					layout : 'form',
-					items : [ {
-						xtype : 'datefieldWithMin',
-						fieldLabel : '结束日期',
-						id : 'endTime',
-						name : 'endTime',
-						editable : false,
-						format : 'Y-m-d',
-						altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-						allowBlank : false,
-						anchor : '95%',
-						value: new Date(),
-						listeners : {
-							specialkey : function(field, e) {
-								if (e.getKey() == Ext.EventObject.ENTER) {
-									var isOK = field.validate();
-									if(isOK){
-										var value = field.getValue();
-										field.setValue(value);
-										reloadReport();
-									}
+					}
+				}]
+			},{
+				width : 200,
+				layout : 'form',
+				items : [{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '结束日期',
+					id : 'endTime',
+					name : 'endTime',
+					editable : false,
+					format : 'Y-m-d',
+					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+					allowBlank : false,
+					anchor : '95%',
+					value: new Date(),
+					listeners : {
+						specialkey : function(field, e) {
+							if (e.getKey() == Ext.EventObject.ENTER) {
+								var isOK = field.validate();
+								if(isOK){
+									var value = field.getValue();
+									field.setValue(value);
+									reloadReport();
 								}
 							}
 						}
-					} ]
-				},{
-					width : 280,
-					layout : 'form',
-					labelSeparator : '选择供应室:',
-					items : [{
-						xtype : 'combo',
-						id : 'querySupplyRoom',
-						name : 'querySupplyRoom',
-						valueField : 'departCode',
-						displayField : 'name',
-						allowBlank : true,
-						editable : false,
-						store : supplyRoomStore,
-						forceSelection : true,
-						mode : 'local',
-						triggerAction : 'all',
-						anchor : '95%',
-						listeners : {
-							render : function(_this) {
-								supplyRoomStore.load();
-							} 
-						}
-					}]
+					}
 				}]
-			}],
+			},{
+				width : 280,
+				layout : 'form',
+				labelSeparator : '选择供应室:',
+				items : [{
+					xtype : 'combo',
+					id : 'querySupplyRoom',
+					name : 'querySupplyRoom',
+					valueField : 'departCode',
+					displayField : 'name',
+					allowBlank : true,
+					editable : false,
+					store : supplyRoomStore,
+					forceSelection : true,
+					mode : 'local',
+					triggerAction : 'all',
+					anchor : '95%',
+					listeners : {
+						render : function(_this) {
+							supplyRoomStore.load();
+						} 
+					}
+				}]
+			}]
+		}],
 		buttons:[{
 			xtype : 'button',
 			text : '查询',
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
===================================================================
diff -u -r16900 -r17135
--- ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 16900)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 17135)
@@ -717,8 +717,8 @@
 	}
 
 	/**
-	 * 解析前台传过来的参数
-	 * @param parameterMap
+	 * 解析前台传过来名称带有“parm_s_”前缀的参数..
+	 * @param parameterMap	前台传过来的参数（一个Map的格式）
 	 * @return
 	 */
 	public Map<String, String> getParamFromView(
Index: forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
===================================================================
diff -u -r16812 -r17135
--- forgon-core/src/main/java/com/forgon/component/grid/GridManager.java	(.../GridManager.java)	(revision 16812)
+++ forgon-core/src/main/java/com/forgon/component/grid/GridManager.java	(.../GridManager.java)	(revision 17135)
@@ -63,8 +63,8 @@
 			String[] filterProperties);
 
 	/**
-	 * 解析前台传过来的参数
-	 * @param parameterMap
+	 * 解析前台传过来名称带有“parm_s_”前缀的参数..
+	 * @param parameterMap	前台传过来的参数（一个Map的格式）
 	 * @return
 	 */
 	public Map<String, String> getParamFromView(