Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml
===================================================================
diff -u -r17818 -r18155
--- ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml	(.../AllTests.xml)	(revision 17818)
+++ ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml	(.../AllTests.xml)	(revision 18155)
@@ -22,7 +22,7 @@
        
        <class name="test.forgon.disinfectsystem.invoicemanager.service.InvoiceManagerForProxyDisinfectionTest" />
        <class name="test.forgon.disinfectsystem.invoicemanager.service.TestDisinfectGoodsInvoiceWithDiffAncestorTousseDefinition" />
-       
+       <class name="test.forgon.disinfectsystem.invoicemanager.service.OperationReservationMergeInvoiceTests" />
     </classes>
   </test>
 </suite>
\ No newline at end of file
Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r18147 -r18155
--- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 18147)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 18155)
@@ -272,6 +272,11 @@
 	public void initCSSDData() {
 		cssdTestDataProcess.initCSSDData();
 		makeActiveUser("admin");
+		// 还原科室供应室设置
+		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+		if(supplyRoomConfig != null){
+			supplyRoomConfig.setAfterRecyclingTousseDeliver(false);
+		}
 	}
 	
 	/**