Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16762 -r16782
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16762)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16782)
@@ -279,8 +279,8 @@
 		tousseDefinition.setIsTraceable(TousseDefinition.STR_NO);
 		tousseDefinition.setTaskGroup("术科组"); 
 		tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
-		tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-		tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
+		tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+		tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition.getMaterialInstances().add(materialInstance);
 		tousseDefinition.setForDisplay(true);
 		objectDao.saveOrUpdate(materialInstance);
@@ -294,9 +294,19 @@
 		disinfectionTousse.setPrice(2.5);
 		disinfectionTousse.setIsCleanedEntirely("否");
 		disinfectionTousse.setIsRecycling(TousseDefinition.STR_YES);
+		disinfectionTousse.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+		disinfectionTousse.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		objectDao.save(disinfectionTousse);
 		disinfectionTousse.setAncestorID(disinfectionTousse.getId());
 		objectDao.saveOrUpdate(disinfectionTousse);
+		
+		CssdHandleTousses cssdHandleTousses = new CssdHandleTousses();
+		cssdHandleTousses.setOrgUnitCode(tousseDefinition.getHandlerDepartCode());
+		cssdHandleTousses.setOrgUnitName(tousseDefinition.getHandlerDepartName());
+		cssdHandleTousses.setTaskGroup(tousseDefinition.getTaskGroup());
+		cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getAncestorID());
+		cssdHandleTousses.setTousseName(tousseDefinition.getName());
+		objectDao.save(cssdHandleTousses);
 	}
 	
 	
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java
===================================================================
diff -u -r16729 -r16782
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java	(.../UnPackingDisinfectGoodsInstanceTests.java)	(revision 16729)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/UnPackingDisinfectGoodsInstanceTests.java	(.../UnPackingDisinfectGoodsInstanceTests.java)	(revision 16782)
@@ -16,6 +16,7 @@
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
+import com.forgon.directory.model.CssdHandleTousses;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
@@ -67,12 +68,13 @@
 		tousseDefinition.setIsTraceable(TousseDefinition.STR_NO);
 		tousseDefinition.setTaskGroup("术科组"); 
 		tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
-		tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-		tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
+		tousseDefinition.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+		tousseDefinition.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition.getMaterialInstances().add(materialInstance);
 		
 		objectDao.saveOrUpdate(materialInstance);
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition);
+		tousseDefinition.setAncestorID(tousseDefinition.getId());
 		
 		//雾化器
 		MaterialDefinition materialDefinition2 = new MaterialDefinition();
@@ -96,12 +98,29 @@
 		tousseDefinition2.setIsTraceable(TousseDefinition.STR_NO);
 		tousseDefinition2.setTaskGroup("术科组"); 
 		tousseDefinition2.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION);
-		tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
-		tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
+		tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
+		tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition2.getMaterialInstances().add(materialInstance2);
 		
 		objectDao.saveOrUpdate(materialInstance2);
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition2);
+		tousseDefinition2.setAncestorID(tousseDefinition2.getId());
+		
+		CssdHandleTousses cssdHandleTousses = new CssdHandleTousses();
+		cssdHandleTousses.setOrgUnitCode(tousseDefinition.getHandlerDepartCode());
+		cssdHandleTousses.setOrgUnitName(tousseDefinition.getHandlerDepartName());
+		cssdHandleTousses.setTaskGroup(tousseDefinition.getTaskGroup());
+		cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getAncestorID());
+		cssdHandleTousses.setTousseName(tousseDefinition.getName());
+		objectDao.save(cssdHandleTousses);
+		
+		CssdHandleTousses cssdHandleTousses2 = new CssdHandleTousses();
+		cssdHandleTousses2.setOrgUnitCode(tousseDefinition2.getHandlerDepartCode());
+		cssdHandleTousses2.setOrgUnitName(tousseDefinition2.getHandlerDepartName());
+		cssdHandleTousses2.setTaskGroup(tousseDefinition2.getTaskGroup());
+		cssdHandleTousses2.setTousseDefinitionId(tousseDefinition2.getAncestorID());
+		cssdHandleTousses2.setTousseName(tousseDefinition2.getName());
+		objectDao.save(cssdHandleTousses2);
 	}
 	
 	private void initData(){
@@ -289,15 +308,23 @@
 		tousseDefinition1.setIsCleanedEntirely("否");
 		tousseDefinition1.setTaskGroup("灭菌组");
 		tousseDefinition1.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
-		tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_DISINFECT);
-		tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_DISINFECT);
+		tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition1.setIsRecycling("是");
 		tousseDefinition1.setIsPacking("是");
 		tousseDefinition1.setIsTraceable("是");
 		tousseDefinition1.getMaterialInstances().add(materialInstance1);
 		tousseDefinition1.getMaterialInstances().add(materialInstance2);
 		tousseDefinition1.getMaterialInstances().add(materialInstance3);
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition1);
+		
+		CssdHandleTousses cssdHandleTousses2 = new CssdHandleTousses();
+		cssdHandleTousses2.setOrgUnitCode(tousseDefinition1.getHandlerDepartCode());
+		cssdHandleTousses2.setOrgUnitName(tousseDefinition1.getHandlerDepartName());
+		cssdHandleTousses2.setTaskGroup(tousseDefinition1.getTaskGroup());
+		cssdHandleTousses2.setTousseDefinitionId(tousseDefinition1.getAncestorID());
+		cssdHandleTousses2.setTousseName(tousseDefinition1.getName());
+		objectDao.save(cssdHandleTousses2);
 	}