Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r16154 -r16158
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16154)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16158)
@@ -2018,16 +2018,17 @@
 			OrgUnit cssdOrgUnit,String spell,int start,int limit,JSONObject retObj) {
 		List<TousseDefinition> list = null;
 		int totalCount = 0;
-		String sql = "from " + TousseDefinition.class.getSimpleName() + " where id in (select tousseDefinitionId from " + 
+		String whereSql = " where id in (select tousseDefinitionId from " + 
 			CssdHandleTousses.class.getSimpleName() + " where orgUnitCode = '" + cssdOrgUnit.getOrgUnitCoding() + "')";
-		sql += " and (spelling like '%" + spell + "%' or wbCode like '%"
+		whereSql += " and (spelling like '%" + spell + "%' or wbCode like '%"
 				+ spell + "%' or externalCode like '" + spell
 				+ "%' or name like '%" + spell + "%') and (isDisable is null or isDisable = '"+TousseDefinition.STR_NO+"')";
+		String findSql = String.format(" from %s %s ", TousseDefinition.class.getSimpleName(),whereSql);
 		if(limit > 0){
-			list = objectDao.findByHql(sql,start,limit);
-			totalCount = objectDao.countBySql(sql);
+			list = objectDao.findByHql(findSql,start,limit);
+			totalCount = objectDao.countObjectBySql(TousseDefinition.class.getSimpleName(),whereSql);
 		}else{
-			list = objectDao.findByHql(sql);
+			list = objectDao.findByHql(findSql);
 			if(list != null){
 				totalCount = list.size();
 			}