Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r28073 -r28080
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28073)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 28080)
@@ -1081,7 +1081,7 @@
 			mapList.add(temp);
 		}
 		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("totalCount", pageEntity.getCount());
+		map.put("totalCount", pageEntity != null ? pageEntity.getCount() : tousseDefinitions.size());
 		map.put("data", mapList);
 		json = JSONObject.fromObject(map);
 		return json;