Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
===================================================================
diff -u -r19833 -r19835
--- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 19833)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 19835)
@@ -2568,11 +2568,20 @@
     	AssertJUnit.assertEquals(ra.getRecyclingStatus(), InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
     	AssertJUnit.assertTrue(ra.getTousseBarcodes().contains(tousseInstance_开胸包1.getBarcode()));
     	AssertJUnit.assertTrue(ra.getTousseBarcodes().contains(tousseInstance_开胸包2.getBarcode()));
-    	AssertJUnit.assertTrue(ra.getTousseBarcodes().contains(foreignTousseInstance.getBarcode()));
     	List<TousseItem> tousseItemList = ra.getApplicationItems();
-    	AssertJUnit.assertEquals(tousseItemList.size(), 2);
-    	AssertJUnit.assertEquals(foreignTousseApplication.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_RECYCLED);
-    	AssertJUnit.assertEquals(foreignTousseApplication.getPackageStatus() , ForeignTousseApplication.APPLICATION_STATUS_RETRUN);
+    	//使用记录转换申请单时外来器械包是否与普通器械包合并到一个申请单
+		boolean foreignTousseAndInsideTousseMergeToTheSameComboApplicationAfterUseRecordConvert = 
+				CssdUtils.getSystemSetConfigByNameBool("foreignTousseAndInsideTousseMergeToTheSameComboApplicationAfterUseRecordConvert");
+		if(foreignTousseAndInsideTousseMergeToTheSameComboApplicationAfterUseRecordConvert){
+	    	AssertJUnit.assertTrue(ra.getTousseBarcodes().contains(foreignTousseInstance.getBarcode()));
+	    	AssertJUnit.assertEquals(tousseItemList.size(), 2);
+	    	AssertJUnit.assertEquals(foreignTousseApplication.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_RECYCLED);
+	    	AssertJUnit.assertEquals(foreignTousseApplication.getPackageStatus() , ForeignTousseApplication.APPLICATION_STATUS_RETRUN);
+		}else{
+	    	AssertJUnit.assertFalse(ra.getTousseBarcodes().contains(foreignTousseInstance.getBarcode()));
+	    	AssertJUnit.assertEquals(tousseItemList.size(), 1);
+	    	AssertJUnit.assertEquals(foreignTousseApplication.getRecyclingStatus() , InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
+		}
     }
 	
 }