Index: forgon-core/src/main/java/com/forgon/security/tools/Util.java
===================================================================
diff -u -r12331 -r14831
--- forgon-core/src/main/java/com/forgon/security/tools/Util.java	(.../Util.java)	(revision 12331)
+++ forgon-core/src/main/java/com/forgon/security/tools/Util.java	(.../Util.java)	(revision 14831)
@@ -86,14 +86,14 @@
 			}
 			// 外部编码的搜索只匹配起始的字符
 			if (searchMode.indexOf("外部编码") != -1) {
-				String sqlStr = "po.externalCode like '%" + searchString + "%'";
+				String sqlStr = "po.externalCode like '" + searchString + "%'";
 				sql += (sql.length() == 0 ? sqlStr : (" or " + sqlStr));
 			}
 			sql = " and (" + sql + ")";
 		} else {
 			sql += " and (po.spelling like '%" + searchString
 					+ "%' or po.wbCode like '%" + searchString
-					+ "%' or po.externalCode like '%" + searchString + "%') ";
+					+ "%' or po.externalCode like '" + searchString + "%') ";
 		}
 		return sql;
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r14819 -r14831
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14819)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 14831)
@@ -1449,17 +1449,21 @@
 					
 					if(CollectionUtils.isNotEmpty(tousseDefinitiionList)){
 						for(TousseDefinition tousseDefinition : tousseDefinitiionList){
-						Map<String , Object> map = null;
+							Map<String , Object> map = null;
+							Double price = tousseDefinition.getPrice();
+							if(tousseDefinition.isDisinfection()){
+								price = tousseDefinitionManager.getDisinfectGoodsPrice(tousseDefinition);
+							}
 							//如果类型为消毒物品,则只保留类型为消毒物品的数据
 							if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
-								if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){
+								if(tousseDefinition.isDisinfection()){
 									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", StringUtils.isNotBlank(tousseDefinition.getExternalCode()) ? tousseDefinition.getExternalCode() + " " + tousseDefinition.getName() : tousseDefinition.getName());
 									map.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
-									map.put("price", tousseDefinition.getPrice());
+									map.put("price", price);
 									map.put("spelling",  tousseDefinition.getSpelling());
 									map.put("tousseType", tousseDefinition.getTousseType());
 									map.put("type", tousseDefinition.getTousseType());
@@ -1472,7 +1476,7 @@
 								map.put("borrowPrice", tousseDefinition.getBorrowPrice() == null ? 0 : tousseDefinition.getBorrowPrice());
 								map.put("displayName", StringUtils.isNotBlank(tousseDefinition.getExternalCode()) ? tousseDefinition.getExternalCode() + " " + tousseDefinition.getName() : tousseDefinition.getName());
 								map.put("isCleanedEntirely", tousseDefinition.getIsCleanedEntirely());
-								map.put("price", tousseDefinition.getPrice());
+								map.put("price", price);
 								map.put("spelling",  tousseDefinition.getSpelling());
 								map.put("tousseType", tousseDefinition.getTousseType());
 								map.put("type", tousseDefinition.getTousseType());
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r14819 -r14831
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14819)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 14831)
@@ -1724,7 +1724,6 @@
 				else{
 					price = MathTools.mul(price, toussePriceFluctuationPercent, 2).doubleValue();
 				}
-				
 				temp.put("price", price);
 				Double borrowPrice = tousseDefinition.getBorrowPrice();
 				temp.put("borrowPrice", borrowPrice == null ? 0 : borrowPrice);
@@ -1786,7 +1785,9 @@
 		String searchMode = AcegiHelper.getLoginUser().getSearchMode();
 		if (searchString.length() > 0) {
 			if (m.find()) {
-				sql += " and po.name like '%" + searchString + "%'";
+				sql += " and (spelling like '%" + searchString + "%' or wbCode like '%"
+				+ searchString + "%' or externalCode like '" + searchString
+				+ "%' or po.name like '%" + searchString + "%')";
 			} else {
 				searchString = searchString.toUpperCase();
 				sql += Util.getSearchSQLByUserSetting(searchMode, searchString);
@@ -2007,7 +2008,7 @@
 		String sql = "from " + TousseDefinition.class.getSimpleName() + " where id in (select tousseDefinitionId from " + 
 			CssdHandleTousses.class.getSimpleName() + " where orgUnitCode = '" + cssdOrgUnit.getOrgUnitCoding() + "')";
 		sql += " and (spelling like '%" + spell + "%' or wbCode like '%"
-				+ spell + "%' or externalCode like '%" + spell
+				+ spell + "%' or externalCode like '" + spell
 				+ "%' or name like '%" + spell + "%') and (isDisable is null or isDisable = '"+TousseDefinition.STR_NO+"')";
 		return objectDao.findByHql(sql);
 	}