Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r15589 -r16281
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 15589)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 16281)
@@ -90,6 +90,7 @@
 	});
 	
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
+        pageSize: 100,
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
 			method : 'POST'
@@ -202,6 +203,9 @@
 					displayField : 'displayName',
 					anchor : '100%',
 					store : tousseAndDiposableGoodsStore,
+                    pageSize : 100,
+                    width : 400,
+                    listConfig: {width: 300},
 					lazyInit : true,
 					triggerAction : 'all',
 					hideTrigger : true,
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r16165 -r16281
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 16165)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 16281)
@@ -1746,17 +1746,9 @@
 			if(StringUtils.isNotBlank(showUnAppGoodsStr) && "true".equals(showUnAppGoodsStr)){
 				showDisableGoods  = true;
 			}
-			JSONObject json = null;
 			// 根据拼音码、五笔码获取内部器械包(器械包和敷料包)
-			json = tousseDefinitionManager
-					.searchAllTousseAndDiposableGoods(spell,showDisableGoods);
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("UTF-8");
-			PrintWriter out;
-
-			out = response.getWriter();
-			out.print(json);
-			out.close();
+			List<Map<String, Object>> mapList = tousseDefinitionManager.searchAllTousseAndDiposableGoods(spell, showDisableGoods);
+			PageUtil.outPutResult(PageUtil.getPagePara(), mapList);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r16246 -r16281
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 16246)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 16281)
@@ -140,18 +140,18 @@
 	public int getWorkloadAmount(TousseDefinition tousseDefinition);
 
 	/**
-	 * 根据关键字进行检索物品（包括但不限于器械包和一次性物品）， 
+	 * 根据关键字进行检索物品（包括但不限于器械包和一次性物品），
 	 * 关键字为中文，则按照器械包的（拼音码、五笔码、外部编码、名称）这四个字段进行检索，
-	 * 关键字为英文，则根据用户属性表的searchMode字段来决定 
+	 * 关键字为英文，则根据用户属性表的searchMode字段来决定
 	 * 关键字为为null或者空字符串，则返回全部物品
-	 * 
+	 *
 	 * @param simpleSpell	进行检索的关键字
 	 * @param showDisableGoods	是否显示已经停用物品
 	 * @return
-	 * 
+	 *
 	 */
-	public JSONObject searchAllTousseAndDiposableGoods(String simpleSpell,boolean showDisableGoods);
-	
+	 List<Map<String,Object>> searchAllTousseAndDiposableGoods(String simpleSpell,boolean showDisableGoods);
+
 	/**
 	 * 根据处"理科室的编码"获取器械包
 	 * 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r16246 -r16281
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16246)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16281)
@@ -1432,6 +1432,13 @@
 	 * 
 	 */
 	@Override
+	public List<Map<String,Object>> searchAllTousseAndDiposableGoods(String simpleSpell,boolean showDisableGoods) {
+		List<Map<String, Object>> mapList = searchTousseBySimpleCodeAndAnyTousseTypeArr(simpleSpell, new String[] {},showDisableGoods);
+		mapList.addAll(searchTousseOrDiposableGoodsBySpellAndWbCode(simpleSpell, false, false, false,false,false,"1","0",showDisableGoods,false,null));
+		return mapList;
+	}
+
+/*	@Override
 	public JSONObject searchAllTousseAndDiposableGoods(String simpleSpell,boolean showDisableGoods) {
 		List<Map<String, Object>> mapList = searchTousseBySimpleCodeAndAnyTousseTypeArr(
 				simpleSpell, new String[] {},showDisableGoods);
@@ -1441,7 +1448,7 @@
 		map.put("totalCount", mapList.size());
 		map.put("data", mapList);
 		return JSONObject.fromObject(map);
-	}
+	}*/
 
 	/**
 	 * 根据拼音码、五笔码获取内部器械包(器械包和敷料包)或一次性物品 isSearchTousse=true 即只查询器械包，否则只查询一次性物品