Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketManagerTest.java
===================================================================
diff -u -r41397 -r41406
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketManagerTest.java	(.../ClassifyBasketManagerTest.java)	(revision 41397)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ClassifyBasketManagerTest.java	(.../ClassifyBasketManagerTest.java)	(revision 41406)
@@ -6,6 +6,8 @@
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -39,11 +41,32 @@
 	 * 清洗篮筐条码
 	 */
 	private String containerBarcode;
+	/**
+	 * 测试申请单id
+	 */
+	private Long invoicePlanId;
+	/**
+	 * 测试回收记录id
+	 */
+	private Long recyclingRecordId;
+	/**
+	 * 测试篮筐id
+	 */
+	private Long containerId;
+	/**
+	 * 测试篮筐实例id
+	 */
+	private Long classifyBasketId;
+	/**
+	 * 测试篮筐物品id
+	 */
+	private Long classifiedItemId;
 	
 	/**
 	 * 生成测试数据
 	 */
-	private void prepareDate(){
+	@Before
+	public void prepareDate(){
 		this.initCSSDData();
 		settleAccountsDepartCoding = "测试结算科室编码" + DateTools.getCurrentDayByFormat(DateTools.COMMON_DATE_HMS);
 		//新建清洗篮筐Container、篮筐状态为"清洗装载"
@@ -77,16 +100,54 @@
 				classifiedItem.setRecyclingRecordId(recyclingRecord.getId());
 				objectDao.save(classifiedItem);
 				objectDao.getHt().flush();
+				invoicePlanId = recyclingApplication.getId();
+				recyclingRecordId = recyclingRecord.getId();
+				containerId = c.getId();
+				classifyBasketId = classifyBasket.getId();
+				classifiedItemId = classifiedItem.getId();
 			}
 		});
 	}
 	
+	@After
+	public void deleteTestData(){
+		runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
+			@Override
+			public void runTask() {
+				RecyclingRecord recyclingRecord = (RecyclingRecord) objectDao.getById(RecyclingRecord.class.getSimpleName(), recyclingRecordId);
+				InvoicePlan recyclingApplication = (InvoicePlan) objectDao.getById(InvoicePlan.class.getSimpleName(), invoicePlanId);
+				//清洗篮筐
+				Container c = (Container) objectDao.getById(Container.class.getSimpleName(), containerId);
+				//清洗篮筐实例ClassifyBasket、洗篮筐装载的物品ClassifiedItem
+				ClassifiedItem classifiedItem = (ClassifiedItem) objectDao.getById(ClassifiedItem.class.getSimpleName(), classifiedItemId);
+				ClassifyBasket classifyBasket = (ClassifyBasket) objectDao.getById(ClassifyBasket.class.getSimpleName(), classifyBasketId);
+				if(recyclingRecord != null){
+					recyclingRecord.setRecyclingApplication(null);
+					objectDao.delete(recyclingRecord);
+				}
+				if(recyclingApplication != null){
+					objectDao.delete(recyclingApplication);
+				}
+				if(classifiedItem != null){
+					classifiedItem.setClassifyBasket(null);
+					objectDao.delete(classifiedItem);
+				}
+				if(classifyBasket != null){
+					objectDao.delete(classifyBasket);
+				}
+				if(c != null){
+					objectDao.delete(c);
+				}
+				objectDao.getHt().flush();
+			}
+		});
+	}
+	
 	/**
 	 * 根据结算科室查询待清洗篮筐信息
 	 */
 	@Test
 	public void loadPendingWashBasketAndClassifiedItemInfosTest(){
-		this.prepareDate();
 		List<PendingWashBasketDto> pendingWashBasketDtoList = classifyBasketManager.loadPendingWashBasketAndClassifiedItemInfos(settleAccountsDepartCoding);
 		assertTrue(pendingWashBasketDtoList.size() > 0);
 		PendingWashBasketDto targetPendingWashBasketDto = null;
@@ -104,7 +165,6 @@
 	 */
 	@Test
 	public void getPendingWashAndDisinfectBasketSettleAccountsDepartTest(){
-		this.prepareDate();
 		List<Map<String, String>> settleAccountsDepartMapList = classifyBasketManager.getPendingWashAndDisinfectBasketSettleAccountsDepart();
 		assertTrue(settleAccountsDepartMapList.size() > 0);
 		Map<String, String> settleAccountsDepartMap = null;