Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r21036 -r21059
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 21036)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 21059)
@@ -111,7 +111,7 @@
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
         pageSize: 100,
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseAndDisposableGoodsAndExpensiveGoods.do',
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
@@ -121,6 +121,7 @@
 		    {name : 'id',mapping : 'id'}, 
 		    {name : 'spelling',mapping : 'spelling'}, 
 		    {name : 'name',mapping : 'name'}, 
+		    {name : 'showName',mapping : 'showName'}, 
 		    {name : 'displayName',mapping : 'displayName'}, 
 		    {name : 'amount',mapping : 'amount'}]
 		)
@@ -237,7 +238,7 @@
 					allowBlank : true,
 					listeners : {
 						select : function(combo, record, index) {
-							Ext.getCmp('goodsSearch').setValue(record.data.name);
+							Ext.getCmp('goodsSearch').setValue(record.data.showName);
 						}
 					}
 				}]
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r21050 -r21059
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 21050)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 21059)
@@ -41,7 +41,6 @@
 import org.hibernate.LockMode;
 import org.hibernate.Query;
 import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.forgon.attachfile.service.AttachFileManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
@@ -84,7 +83,6 @@
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao;
 import com.forgon.disinfectsystem.inventorymanagement.model.Inventory;
-import com.forgon.disinfectsystem.inventorymanagement.service.InventoryManager;
 import com.forgon.disinfectsystem.vo.PriceAmount;
 import com.forgon.log.service.LogManager;
 import com.forgon.security.tools.Util;
@@ -961,6 +959,7 @@
 		temp.put("disposableGoodsName", disposableGoods.getName());//没有拼接的名字
 		temp.put("specification", disposableGoods.getSpecification());//规格
 		temp.put("name", goodsName);
+		temp.put("showName", goodsName);
 		temp.put("unitForDisplay", disposableGoods.getUnitForDisplay());
 		temp.put("spelling", disposableGoods.getSpelling());
 		temp.put("externalCode", externalCode);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
===================================================================
diff -u -r21036 -r21059
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 21036)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js	(.../invoiceQueryView.js)	(revision 21059)
@@ -104,7 +104,7 @@
 		
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseAndDisposableGoodsAndExpensiveGoods.do',
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
@@ -114,6 +114,7 @@
 		    {name : 'id',mapping : 'id'}, 
 		    {name : 'spelling',mapping : 'spelling'}, 
 		    {name : 'name',mapping : 'name'}, 
+		    {name : 'showName',mapping : 'showName'},
 		    {name : 'displayName',mapping : 'displayName'}, 
 		    {name : 'amount',mapping : 'amount'}]
 		)
@@ -221,7 +222,7 @@
 						allowBlank : true,
 						listeners : {
 							select : function(combo, record, index) {
-								Ext.getCmp('goodsName').setValue(record.data.name);
+								Ext.getCmp('goodsName').setValue(record.data.showName);
 							}
 						}
 					}]
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r21056 -r21059
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 21056)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 21059)
@@ -1054,6 +1054,7 @@
 					Map<String, Object> temp = new HashMap<String, Object>();
 					temp.put("id", tousseDefinition.getId());
 					temp.put("name", tousseDefinition.getName());
+					temp.put("showName", tousseDefinition.getName());
 					temp.put("displayName", tousseDefinition.getName());
 					temp.put("spelling", tousseDefinition.getSpelling());
 					temp.put("price", tousseDefinition.getPrice());
@@ -1793,6 +1794,7 @@
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("id", tousseDefinition.getId());
 				temp.put("name", tousseDefinition.getName());
+				temp.put("showName", tousseDefinition.getName());
 				temp.put("displayName", StringUtils.isNotBlank(tousseDefinition.getExternalCode()) ? tousseDefinition.getExternalCode() + " " + tousseDefinition.getName() : tousseDefinition.getName());
 				temp.put("spelling", tousseDefinition.getSpelling());
 				temp.put("wbCode", tousseDefinition.getWbCode());