Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r12702 -r12778
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 12702)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 12778)
@@ -1191,6 +1191,10 @@
 		
 		String tousseType = StrutsParamUtils.getPraramValue("tousseType", "");
 		String hideDiposableGoodsPrice = StrutsParamUtils.getPraramValue("hideDiposableGoodsPrice", null);
+		boolean showReferencePrice = true;
+		if(StringUtils.isNotBlank(hideDiposableGoodsPrice) && "true".equals(hideDiposableGoodsPrice)){
+			showReferencePrice = false;
+		}
 		if (tousseType.indexOf(TousseDefinition.PACKAGE_TYPE_INSIDE) >= 0){
 			tousseType = TousseDefinition.PACKAGE_TYPE_INSIDE;
 		}
@@ -1210,20 +1214,36 @@
 			JSONObject json = null;
 			
 			//如果处理科室编码不为空且类型不为一次性物品,则进行过滤
-			if(StringUtils.isNotBlank(cssdOrgUnitCode) && !TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
-				OrgUnit cssd = new OrgUnit();
-				cssd.setOrgUnitCoding(cssdOrgUnitCode);
-				
-				List<TousseDefinition> tousseDefinitiionList = 
-						tousseDefinitionManager.getCssdHandleTousseDefinitionList(cssd);
-				
+			if(StringUtils.isNotBlank(cssdOrgUnitCode)){
 				List<Map<String , Object>> mapList = new ArrayList<Map<String,Object>>();
-				if(CollectionUtils.isNotEmpty(tousseDefinitiionList)){
-					Map<String , Object> map = null;
-					for(TousseDefinition tousseDefinition : tousseDefinitiionList){
-						//如果类型为消毒物品,则只保留类型为消毒物品的数据
-						if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
-							if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){
+				//如果不为一次性物品,则先查出器械包.
+				if(!TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
+					OrgUnit cssd = new OrgUnit();
+					cssd.setOrgUnitCoding(cssdOrgUnitCode);
+					
+					List<TousseDefinition> tousseDefinitiionList = 
+							tousseDefinitionManager.getCssdHandleTousseDefinitionList(cssd);
+					
+					if(CollectionUtils.isNotEmpty(tousseDefinitiionList)){
+						Map<String , Object> map = null;
+						for(TousseDefinition tousseDefinition : tousseDefinitiionList){
+							//如果类型为消毒物品,则只保留类型为消毒物品的数据
+							if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
+								if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){
+									map = new HashMap<String, Object>();
+									map.put("id", tousseDefinition.getId());
+									map.put("name", tousseDefinition.getName());
+									map.put("borrowPrice", tousseDefinition.getBorrowPrice() == null ? 0 : tousseDefinition.getBorrowPrice());
+									map.put("displayName", tousseDefinition.getName());
+									map.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
+									map.put("price", tousseDefinition.getPrice());
+									map.put("spelling",  tousseDefinition.getSpelling());
+									map.put("tousseType", tousseDefinition.getTousseType());
+									map.put("type", tousseDefinition.getTousseType());
+									map.put("unit", tousseDefinition.getUnit());
+									mapList.add(map);
+								}
+							}else{
 								map = new HashMap<String, Object>();
 								map.put("id", tousseDefinition.getId());
 								map.put("name", tousseDefinition.getName());
@@ -1237,32 +1257,25 @@
 								map.put("unit", tousseDefinition.getUnit());
 								mapList.add(map);
 							}
-						}else{
-							map = new HashMap<String, Object>();
-							map.put("id", tousseDefinition.getId());
-							map.put("name", tousseDefinition.getName());
-							map.put("borrowPrice", tousseDefinition.getBorrowPrice() == null ? 0 : tousseDefinition.getBorrowPrice());
-							map.put("displayName", tousseDefinition.getName());
-							map.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
-							map.put("price", tousseDefinition.getPrice());
-							map.put("spelling",  tousseDefinition.getSpelling());
-							map.put("tousseType", tousseDefinition.getTousseType());
-							map.put("type", tousseDefinition.getTousseType());
-							map.put("unit", tousseDefinition.getUnit());
-							mapList.add(map);
 						}
 					}
+				}else{
+					//只查出一次性物品
+					mapList = tousseDefinitionManager.searchTousseOrDiposableGoodsBySpellAndWbCode(
+							spell, false, false, false,false,showReferencePrice,"1","0",false);
 				}
 				
+				//如果为空则需要再查出一次性物品并追加
+				if(StringUtils.isBlank(tousseType)){
+					mapList.addAll(tousseDefinitionManager.searchTousseOrDiposableGoodsBySpellAndWbCode(
+							spell, false, false, false,false,showReferencePrice,"1","0",false));
+				}
+				
 				Map<String, Object> result = new HashMap<String, Object>();
 				result.put("totalCount", mapList.size());
 				result.put("data", mapList);
 				json = JSONObject.fromObject(result);
 			}else{
-				boolean showReferencePrice = true;
-				if(StringUtils.isNotBlank(hideDiposableGoodsPrice) && "true".equals(hideDiposableGoodsPrice)){
-					showReferencePrice = false;
-				}
 				json = tousseDefinitionManager.searchComboGoods(spell, tousseType,showReferencePrice);
 			}