Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java
===================================================================
diff -u -r16747 -r16752
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 16747)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 16752)
@@ -58,22 +58,9 @@
 	}
 	private void createWareHouse(){
 		//消毒供应室的仓库
-		WareHouse whDisinfect = new WareHouse();
-		whDisinfect.setOrgUnitCode(Constants.ORG_UNIT_CODE_DISINFECT);
-		whDisinfect.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT);
-		whDisinfect.setName(Constants.ORG_UNIT_NAME_DISINFECT + "仓库");
+		createWareHouse(Constants.ORG_UNIT_CODE_DISINFECT);
 		//仓库临床科室的仓库
-		WareHouse wh = new WareHouse();
-		wh.setOrgUnitCode(clinicOrgUnitCode);
-		wh.setOrgUnitName("外六科护士站18B");
-		wh.setName("外六科护士站18B仓库");
-		try {
-			wareHouseManager.saveOrUpdateWareHouse(whDisinfect);
-			wareHouseManager.saveOrUpdateWareHouse(wh);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		createWareHouse(clinicOrgUnitCode);
 	}
 	private void createTousseInstanceAndUpdateStock(){
 		createSimpleTousseInstanceByParam(barcodeArray1, "Test开胸包", BarcodeDevice.BARCODE_TYPE_PACKAGE, Constants.ORG_UNIT_NAME_DISINFECT, Constants.ORG_UNIT_CODE_DISINFECT, 3.14);
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16742 -r16752
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16742)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16752)
@@ -2628,8 +2628,21 @@
 		}
 		vos.add(vo);
 	}
-
 	/**
+	 * 创建仓库,只设置科室编码。测试用例只有这个属性是有用的
+	 * @param orgUnitCode
+	 */
+	protected void createWareHouse(String orgUnitCode){
+		WareHouse wh = new WareHouse();
+		wh.setOrgUnitCode(orgUnitCode);
+		try {
+			wareHouseManager.saveOrUpdateWareHouse(wh);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	/**
 	 * 默认回滚数据
 	 */
 //	@Override