Index: ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
===================================================================
diff -u -r18377 -r18467
--- ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 18377)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 18467)
@@ -275,7 +275,7 @@
 					list = tousseInstanceList;*/
 					
 					//数量重新计算
-					totalResults = objectDao.countBySql("select count(0) from TousseInstance po " + sql + sqlCondition);
+					totalResults = objectDao.countBySql("select count(0) from TousseInstance po join BarcodeDevice b on po.id=b.id " + sql + sqlCondition);
 				}
 			}
 		}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r18416 -r18467
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18416)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 18467)
@@ -456,7 +456,6 @@
 			}
 			jsonArray.addAll(notTimeoutArray);
 			json.put("rows", jsonArray);
-			json.put("totalResults", jsonArray.size());
 		}
 		return json.toString();
 	}