Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r41640 -r41643
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41640)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41643)
@@ -786,9 +786,9 @@
 		String endDateTime = currentDate + " 23:59:59";
 		String fmt = "yyyy-MM-dd HH24:MI:SS";
 		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
-		String sql = "select alias.name , alias.reviewer , alias.isTraceable ,count(alias.name) amount from";
+		String sql = "select alias.name , alias.reviewer , alias.isTraceable , alias.sterilizationBasket,count(alias.name) amount from";
 		//聚合包及不属于任务聚合包实例的普通器械包、消毒物品、敷料包,外部代理灭菌的查询
-		sql += "(select d.name,i.reviewer as reviewer,d.isTraceable " +
+		sql += "(select d.name,i.reviewer as reviewer,d.isTraceable, i.sterilizationBasket " +
 					 "from tousseInstance i,tousseDefinition d,cssdHandleTousses t where i.toussedefinition_id = d.id and d.id=t.tousseDefinitionId "
 					 + "and i.comboTousseInstanceId is null and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and "
 					 + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt)
@@ -807,7 +807,7 @@
 		JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(orgUnitCode);
 		if(foreignTousseHandleDepartAndTaskGroupJsonobject != null && (StringUtils.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup")) || StringUtils.isBlank(taskGroup))){
 			//外来器械包、外来器械拆分小包
-			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable " +
+			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable, i.sterilizationBasket " +
 				 "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"') "
 				 + "and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and "
 				 + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt)
@@ -820,7 +820,7 @@
 		
 		if(StringUtils.equals(taskGroup, supplyRoomConfig.getCustomTousseDefaultTaskGroup()) || StringUtils.isBlank(taskGroup)){
 			//自定义器械包
-			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable " +
+			sql += " union all select d.name,i.reviewer as reviewer,d.isTraceable, i.sterilizationBasket " +
 					 "from tousseInstance i,tousseDefinition d where i.toussedefinition_id = d.id and d.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') "
 					 + "and i.reviewTime between "+dateQueryAdapter.dateConverAdapter2(startDateTime, fmt)+" and "
 					 + dateQueryAdapter.dateConverAdapter2(endDateTime, fmt)
@@ -829,7 +829,7 @@
 				sql += " and d.name like '%" + tousseName + "%' ";
 			}
 		}
-		sql += ") alias group by alias.name,alias.reviewer, alias.isTraceable";
+		sql += ") alias group by alias.name,alias.reviewer, alias.isTraceable,alias.sterilizationBasket";
 		ResultSet rs = objectDao.executeSql(sql);
 		List<ReviewerVo> returnValue = new ArrayList<ReviewerVo>();
 		try {
@@ -839,6 +839,7 @@
 			vo.setTousseName(showTousseName);
 			vo.setReviewer(rs.getString("reviewer"));
 			vo.setAmount(rs.getInt("amount"));
+			vo.setSterilizationBasket(rs.getString("sterilizationBasket"));
 			returnValue.add(vo);
 			}
 		} finally {