Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r16144 -r16160
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 16144)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 16160)
@@ -500,11 +500,11 @@
 		boolean isProxyDisinfectionTousse = false;
 		boolean isForeignProxyItem = false;
 		
-		if (vo.getProxyDisinfectionId() != null){
+		if (DatabaseUtil.isPoIdValid(vo.getProxyDisinfectionId())){
 			isProxyDisinfectionTousse = true;
 		}
 		
-		if (vo.getForeignProxyItemId() != null){
+		if (DatabaseUtil.isPoIdValid(vo.getForeignProxyItemId())){
 			isForeignProxyItem = true;
 		}
 		
@@ -634,10 +634,15 @@
 	 */
 	public void getWaitSterileLoadingTousseInstance(){
 		try {
+			String start = StrutsParamUtils.getPraramValue("start", "");
+			String limit = StrutsParamUtils.getPraramValue("limit", "");
 			JSONArray jsonArray = new JSONArray();
+			Map<String , String> sqlCondition = new HashMap<String , String>();
 			List<TousseInstance> tousses = 
-					tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null , 100);
+					tousseInstanceManager.getAllReviewedTousseInstanceWithOutBasket(acegiHelper.getCurrentOrgUnitCode(), null, null , start , limit , sqlCondition);
 			
+			int count = objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sqlCondition.get("condition"));
+			
 			//将set转换成list,按id降序排序
 			List<TousseInstance> tousseList = new ArrayList<TousseInstance>();
 			tousseList.addAll(tousses);
@@ -657,8 +662,11 @@
 			response.setContentType("text/html;charset=UTF-8");
 			PrintWriter out;
 			try {
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("root", jsonArray);
+				jsonObject.put("totalProperty", count);
 				out = response.getWriter();
-				out.print(jsonArray);
+				out.print(jsonObject);
 				out.close();
 			} catch (IOException e) {
 				e.printStackTrace();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r16130 -r16160
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 16130)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 16160)
@@ -592,7 +592,7 @@
 	 * 今天审核的未入筐器械包
 	 */
 	public List<TousseInstance> getAllReviewedTousseInstanceWithOutBasket(
-			String orgUnitCode , String beginDate , String endDate , Integer amount){
+			String orgUnitCode , String beginDate , String endDate , String start , String limit , Map<String , String> sqlCondition){
 		String sql = " where po.status = '" + TousseInstance.STATUS_REVIEWED
 				+ "' and reviewBasket_id is null";
 		if(StringUtils.isNotBlank(beginDate)){
@@ -608,9 +608,18 @@
 					+ "' or (po.orgUnitCoding != '" + orgUnitCode
 					+ "' and po.foreignProxyItem_id is not null))";
 		}
+		
+		sqlCondition.put("condition" ,sql);
+		
 		@SuppressWarnings("unchecked")
-		List<TousseInstance> list = objectDao.findBySql(
-				TousseInstance.class.getSimpleName(), sql,0 , 100,"barcode desc");
+		List<TousseInstance> list = null;
+		if(StringUtils.isNumeric(start) && StringUtils.isNumeric(limit)){
+			list = objectDao.findBySql(
+					TousseInstance.class.getSimpleName(), sql,Integer.parseInt(start) , Integer.parseInt(limit),"barcode desc");
+		}else{
+			list = objectDao.findBySql(
+					TousseInstance.class.getSimpleName(), sql);
+		}
 		return list;
 	}
 
@@ -621,7 +630,7 @@
 	public List<TousseInstance> getTodayReviewedTousseInstanceWithOutBasket(
 			String orgUnitCode) {
 		String todayStr = DateTools.getCurrentDayByFormat("yyyy-MM-dd");
-		return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr , 1000);
+		return getAllReviewedTousseInstanceWithOutBasket(orgUnitCode , todayStr, todayStr , null , null , null);
 	}
 
 	/**
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r16127 -r16160
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 16127)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 16160)
@@ -86,7 +86,7 @@
 	 * @return
 	 */
 	public List<TousseInstance> getAllReviewedTousseInstanceWithOutBasket(
-			String orgUnitCode , String beginDate , String endDate , Integer amount);
+			String orgUnitCode , String beginDate , String endDate , String start , String limit , Map<String , String> sqlCondition);
 	
 	/**
 	 * 根据科室编码和器械包名称，获取今天审核未入灭菌篮筐的器械包