Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
===================================================================
diff -u -r21050 -r21056
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21050)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java	(.../ExpensiveGoodsManagerImpl.java)	(revision 21056)
@@ -48,8 +48,6 @@
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance;
@@ -1885,7 +1883,7 @@
 	@Override
 	public List<Map<String, Object>> searchExpensiveGoodsByKeyword(String keyword) {
 		String sql = "select id,name,specification,certification,spelling,referencePrice "
-				+ " from ExpensiveGoods where isApplicationMaterial='" + Constants.STR_CAN + "' ";
+				+ " from ExpensiveGoods po where isApplicationMaterial='" + Constants.STR_CAN + "' ";
 		if (StringUtils.isNotBlank(keyword)) {
 			keyword = keyword.trim();
 			Matcher matcher = Pattern.compile("[\\u4E00-\\u9FA5]+").matcher(keyword);
@@ -1993,6 +1991,7 @@
 		return inventroy;
 	}
 	
+	@Override
 	public ExpensiveGoodsInstance getExpensiveGoodsInstanceByBodyCode(String firstBodyCode,String secondBodyCode,String thirdBodyCode){
 		String sql = String.format(" where po.firstBodyCode='%s' and po.secondBodyCode='%s' and po.thirdBodyCode='%s'", firstBodyCode,secondBodyCode,thirdBodyCode);
 		return (ExpensiveGoodsInstance)objectDao.getBySql(ExpensiveGoodsInstance.class.getSimpleName(), sql);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r21050 -r21056
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 21050)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 21056)
@@ -2826,24 +2826,22 @@
 	public List<Map<String, Object>> searchTousseAndDisposableGoodsAndExpensiveGoods(String keyword) {
 		//1、器械包
 		List<Map<String, Object>> list = new ArrayList<Map<String,Object>>();
-		List<Map<String, Object>> tousseList = searchTousseByKeywordAndTousseTypeArr(keyword, new String[]{TousseDefinition.PACKAGE_TYPE_INSIDE,
-						TousseDefinition.PACKAGE_TYPE_DRESSING,
-						TousseDefinition.PACKAGE_TYPE_DISINFECTION },false ,true);
-		if (CollectionUtils.isEmpty(tousseList)) {
+		List<Map<String, Object>> tousseList = searchTousseByKeywordAndTousseTypeArr(keyword, new String[]{},true ,true);
+		if (CollectionUtils.isNotEmpty(tousseList)) {
 			list.addAll(tousseList);
 		}
 		
 		//2、一次性物品
-		List<Map<String, Object>> disposableGoodsList = searchTousseOrDiposableGoodsBySpellAndWbCode(keyword, false, false, false,false,true,"1","0",false,false,null,null);
-		if (CollectionUtils.isEmpty(disposableGoodsList)) {
+		List<Map<String, Object>> disposableGoodsList = searchTousseOrDiposableGoodsBySpellAndWbCode(keyword, false, false, false,false,false,"1","0",true,false,null,null);
+		if (CollectionUtils.isNotEmpty(disposableGoodsList)) {
 			list.addAll(disposableGoodsList);
 		}
 		
 		//3、高值耗材
 		List<Map<String, Object>> expensiveGoodsList = expensiveGoodsManager.searchExpensiveGoodsByKeyword(keyword);
-		if (CollectionUtils.isEmpty(expensiveGoodsList)) {
+		if (CollectionUtils.isNotEmpty(expensiveGoodsList)) {
 			list.addAll(expensiveGoodsList);
 		}
-		return list;
+		return list;	
 	}
 }