Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r16154 -r16156
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 16154)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 16156)
@@ -1579,30 +1579,34 @@
 				
 				List<Map<String , Object>> mapDataList = new ArrayList<Map<String,Object>>();
 				if(limit > 0){
-					totalCount = JSONUtil.optInteger(retObj, "totalCount", 0);
-					totalCount += mapList2.size();
-					if(mapList.size() >= limit){
-						// 器械包已满足一页数据
-						mapDataList.addAll(mapList);
+					if(TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
+						mapDataList.addAll(mapList2);
+						totalCount = mapList2.size();
 					}else{
-						mapDataList.addAll(mapList);
-						if(mapList2.size() > 0){
-							int endIndex = start + limit;
-							if(endIndex >= totalCount){
-								int mapList2Start = endIndex - totalCount;
-								int mapList2SubListCoumt = limit - mapList.size();
-								if(mapList2Start < mapList2.size()){
-									int mapList2EndIndex = mapList2Start + mapList2SubListCoumt;
-									if(mapList2EndIndex > mapList2.size()){
-										mapList2EndIndex = mapList2.size();
+						totalCount = JSONUtil.optInteger(retObj, "totalCount", 0);
+						totalCount += mapList2.size();
+						if(mapList.size() >= limit){
+							// 器械包已满足一页数据
+							mapDataList.addAll(mapList);
+						}else{
+							mapDataList.addAll(mapList);
+							if(mapList2.size() > 0){
+								int endIndex = start + limit;
+								if(endIndex >= totalCount){
+									int mapList2Start = endIndex - totalCount;
+									int mapList2SubListCoumt = limit - mapList.size();
+									if(mapList2Start < mapList2.size()){
+										int mapList2EndIndex = mapList2Start + mapList2SubListCoumt;
+										if(mapList2EndIndex > mapList2.size()){
+											mapList2EndIndex = mapList2.size();
+										}
+										mapList2 = mapList2.subList(mapList2Start, mapList2EndIndex);
+										mapDataList.addAll(mapList2);
 									}
-									mapList2 = mapList2.subList(mapList2Start, mapList2EndIndex);
-									mapDataList.addAll(mapList2);
 								}
 							}
 						}
 					}
-					
 				}else{
 					mapDataList.addAll(mapList);
 					mapDataList.addAll(mapList2);