Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java
===================================================================
diff -u -r12331 -r13057
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java	(.../SterilizationRecordManagerTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/SterilizationRecordManagerTests.java	(.../SterilizationRecordManagerTests.java)	(revision 13057)
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
@@ -44,8 +45,8 @@
 			//3.模拟创建器械包实例
 			TousseInstance tousseInstance1 = new TousseInstance();
 			tousseInstance1.setTousseDefinition(td);
-			tousseInstance1.setOrgUnitCoding("");
-			tousseInstance1.setOrgUnitName("");
+			tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
+			tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD);
 			tousseInstance1.setReviewer("");
 			tousseInstance1.setReviewerCode("");
 			tousseInstance1.setReviewTime(new Date());
@@ -57,12 +58,13 @@
 			tousseInstance1.setStatus(TousseInstance.STATUS_REVIEWED);
 			tousseInstance1.setVirtualBasketSeqNum("001");
 			tousseInstance1.setBarcode("010029007");
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_CSSD);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			
 			TousseInstance tousseInstance2 = new TousseInstance();
 			tousseInstance2.setTousseDefinition(td);
-			tousseInstance2.setOrgUnitCoding("");
-			tousseInstance2.setOrgUnitName("");
+			tousseInstance2.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
+			tousseInstance2.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD);
 			tousseInstance2.setReviewer("");
 			tousseInstance2.setReviewerCode("");
 			tousseInstance2.setReviewTime(new Date());
@@ -74,6 +76,7 @@
 			tousseInstance2.setStatus(TousseInstance.STATUS_REVIEWED);
 			tousseInstance2.setVirtualBasketSeqNum("001");
 			tousseInstance2.setBarcode("010029008");
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance2, Constants.ORG_UNIT_CODE_CSSD);
 			tousseInstanceManager.saveOrUpdate(tousseInstance2);
 			
 			//4.器械包打包审核
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java
===================================================================
diff -u -r13052 -r13057
--- ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java	(.../TestDepartmentMonthDetail.java)	(revision 13052)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/reports/TestDepartmentMonthDetail.java	(.../TestDepartmentMonthDetail.java)	(revision 13057)
@@ -447,6 +447,7 @@
 			Date date = c.getTime();
 			tousseInstance1.setValidUntil(date);
 			tousseInstance1.setForeignProxyItem_id(item5.getId());
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT);
 //			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 //			tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName());
 		}
@@ -515,6 +516,7 @@
 			c.add(Calendar.DAY_OF_YEAR, 1);
 			Date date = c.getTime();
 			tousseInstance1.setValidUntil(date);
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName());
 		}
@@ -538,6 +540,7 @@
 			c.add(Calendar.DAY_OF_YEAR, 1);
 			Date date = c.getTime();
 			tousseInstance1.setValidUntil(date);
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName());
 		}
@@ -564,6 +567,7 @@
 			c.add(Calendar.DAY_OF_YEAR, 1);
 			Date date = c.getTime();
 			tousseInstance1.setValidUntil(date);
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName());
 		}
@@ -586,6 +590,7 @@
 			c.add(Calendar.DAY_OF_YEAR, 1);
 			Date date = c.getTime();
 			tousseInstance1.setValidUntil(date);
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName());
 		}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java
===================================================================
diff -u -r12331 -r13057
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java	(.../TousseInstanceReviewManagerTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/TousseInstanceReviewManagerTests.java	(.../TousseInstanceReviewManagerTests.java)	(revision 13057)
@@ -6,6 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.model.BarcodeDevice;
@@ -64,9 +65,9 @@
 		tousseInstance.setValidUntil(new Date());// 失效期
 		tousseInstance.setWarningUntil(new Date());// 预警日期
 
-		tousseInstance.setOrgUnitCoding("");
+		tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
 
-		tousseInstance.setOrgUnitName("");
+		tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD);
 		
 		tousseInstance.setDisinfectIdentification("");
 		tousseInstance.setDisinfectProgram("");
@@ -80,6 +81,7 @@
 		tousseInstance.setReviewBasket_id(null);
 
 		tousseInstance.setPackingRecord_id(null);
+		tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_CSSD);
 		tousseInstanceManager.saveOrUpdate(tousseInstance);
 		
 		//4.1器械包打包审核
@@ -121,9 +123,9 @@
 		tousseInstance.setValidUntil(new Date());// 失效期
 		tousseInstance.setWarningUntil(new Date());// 预警日期
 
-		tousseInstance.setOrgUnitCoding("");
+		tousseInstance.setOrgUnitCoding(Constants.ORG_UNIT_CODE_CSSD);
 
-		tousseInstance.setOrgUnitName("");
+		tousseInstance.setOrgUnitName(Constants.ORG_UNIT_NAME_CSSD);
 		
 		tousseInstance.setDisinfectIdentification("");
 		tousseInstance.setDisinfectProgram("");
@@ -137,6 +139,7 @@
 		tousseInstance.setReviewBasket_id(null);
 
 		tousseInstance.setPackingRecord_id(null);
+		tousseInstanceManager.setToDefaultWareHouse(tousseInstance, Constants.ORG_UNIT_CODE_CSSD);
 		tousseInstanceManager.saveOrUpdate(tousseInstance);
 		
 		//4.2器械包打包审核
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r13052 -r13057
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 13052)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 13057)
@@ -1791,6 +1791,7 @@
 				e.printStackTrace();
 			}
 			tousseInstance1.setOperationTime(date);
+			tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, orgCode);
 			tousseInstanceManager.saveOrUpdate(tousseInstance1);
 			
 			//不对申请单类型为外部代理来菌单的器械包或器械包定义的类型为外部代理灭菌的器械包实例增加库存