Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java
===================================================================
diff -u -r17643 -r17658
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java	(.../RecyclingApplication.java)	(revision 17643)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingapplication/RecyclingApplication.java	(.../RecyclingApplication.java)	(revision 17658)
@@ -288,6 +288,7 @@
 							tousseItem.setInvoicePlan(this);
 							tousseItem.setInvoicePlanID(this.getId());
 							tousseItem.setTousseName(tousseInstance.getTousseName());
+							tousseItem.setAmount(1);
 							
 							TousseDefinition td = tousseInstance.getTousseDefinition();
 							if (td != null){
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
===================================================================
diff -u -r17500 -r17658
--- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 17500)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 17658)
@@ -4,6 +4,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate4.HibernateTemplate;
 import org.springframework.test.annotation.Rollback;
@@ -14,14 +16,19 @@
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
+import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
+import com.forgon.disinfectsystem.entity.useRecord.UseRecordToRecycleApplication;
 import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
 import com.forgon.serialnumber.model.SerialNum;
+
 import test.forgon.disinfectsystem.dataProvider.UseRecord.UseRecordDataProvider;
 import test.forgon.disinfectsystem.dataProvider.tousseDefinition.TousseDefinitionDataProvider;
 
@@ -38,7 +45,6 @@
 	 * 测试聚合包与普通器械包录入使用记录并转换申请单
 	 */
 	@Test
-	@Rollback(value=false)
 	public void testComboTousseAndNormalTousseFixUseRecord() {
 		//初始化数据
 		initCSSDData();
@@ -378,9 +384,1853 @@
 		//只有开口包1被转换成申请单,聚合包都不会转换
 		AssertJUnit.assertEquals(1, recyclingApplication2.getApplicationItems().size());
 	}
+	
+	String yes = com.forgon.Constants.STR_YES;
+	String no = com.forgon.Constants.STR_NO;
+	String part = com.forgon.Constants.STR_PART;
+	
+	String applicationFormTypeMerge = InvoicePlan.APPLICATION_FORM_TYPE_MERGE;
+	String applicationFormTypeSplit = InvoicePlan.APPLICATION_FORM_TYPE_SPLIT;
+	
+	String convertMergeRegularNone = null;
+	String convertMergeRegularOperationRoom = UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM;
+	String convertMergeRegularDepart = UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART;
 
+	/**
+	 * 测试器械包录入使用记录并转换申请单
+	 * 1.器械包定义是否发货:全为是、全为否、部分为是部分为否                      (相关器械包的定义)
+	 * 2.科室供应室配置:使用记录转换的申请单是否要发货-即配置手术室(配置了不发)或不配置手术室(未配置或默认则要发)    (科室供应室配置)
+	 * 3.申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单   (config.js配置)
+	 * 4.一次性物品是否转换申请单:是、否                                                            (科室供应室配置)
+	 * 5.一次性物品转换申请单是否与器械包合并                                                   (科室供应室配置)
+	 * 6.使用记录转申请单合并规则:未配置、operationRoom,depart        (config.js配置)
+	 * 7.备注的格式                                                                                                    (config.js配置)
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene1(){
+		
+		//场景1:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		//initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景2:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景3:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景4:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		/*		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景5:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景6:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularDepart);
+		
+		//场景7:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景8:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+		
+		//场景9:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景10:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景11:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景12:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+		
+		//场景13:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景14:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景15:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularDepart);
+		
+		//场景16:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景17:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+		
+		//场景18:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		
+		//场景19:器械包全部都要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景20:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景21:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景22:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景23:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景24:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularDepart);
+		
+		//场景25:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景26:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+		
+		//场景27:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景28:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景29:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景30:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+		
+		//场景31:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景32:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景33:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularDepart);
+		
+		//场景34:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景35:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+		
+		//场景36:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		
+		
+		
+		
+		//场景37:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景38:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景39:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景40:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景41:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	yes,no,convertMergeRegularOperationRoom);
+		
+		//场景42:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	yes,no,convertMergeRegularDepart);
+		
+		//场景43:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景44:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	no,null,convertMergeRegularOperationRoom);
+		
+		//场景45:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景46:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景47:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景48:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	yes,yes,convertMergeRegularDepart);
+		
+		//场景49:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景50:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	yes,no,convertMergeRegularOperationRoom);
+		
+		//场景51:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	yes,no,convertMergeRegularDepart);
+		
+		//场景52:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景53:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	no,null,convertMergeRegularOperationRoom);
+		
+		//场景54:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		
+		//场景55:使用记录的器械包:部分要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景56:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景57:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景58:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景59:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景60:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularDepart);
+		
+		//场景61:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景62:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+		
+		//场景63:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景64:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景65:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景66:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+		
+		//场景67:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景68:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景69:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularDepart);
+		
+		//场景70:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景71:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+		
+		//场景72:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		//场景73:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景74:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景75:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景76:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景77:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景78:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularDepart);
+		
+		//场景79:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景80:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+		
+		//场景81:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景82:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景83:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景84:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+		
+		//场景85:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景86:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景87:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularDepart);
+		
+		//场景88:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景89:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+		
+		//场景90:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		
+		//场景91:器械包全部都不要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+		
+		//场景92:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景93:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularDepart);
+		
+		//场景94:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+		
+		//场景95:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景96:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularDepart);
+		
+		//场景97:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+		
+		//场景98:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+		
+		//场景99:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularDepart);
+		
+		
+		
+		
+		//场景100:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,yes,convertMergeRegularNone);
+		
+		//场景101:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,yes,convertMergeRegularOperationRoom);
+		
+		//场景102:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+		
+		//场景103:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+		
+		//场景104:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+		
+		//场景105:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularDepart);
+		
+		//场景106:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+		
+		//场景107:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+		
+		//场景108:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+//		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularDepart);*/
+	}
+	
+	/**
+	 * 场景2
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene2(){
 
+		//场景2:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+		
 	/**
+	 * 场景3
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene3(){
+		//场景4:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	
+		/**
+	 * 场景4
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene4(){
+		//场景5:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+	}		
+	/**
+	 * 场景5
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene5(){
+		//场景7:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	/**
+	 * 场景6
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene6(){		
+		//场景8:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+	}		
+	/**
+	 * 场景7
+	 */
+	/*@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene7(){		
+		//场景12:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+	}*/
+	/**
+	 * 场景8
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene8(){		
+		//场景13:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	/**
+	 * 场景9
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene9(){		
+		//场景14:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+	}		
+	/**
+	 * 场景10
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene10(){
+		//场景16:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	/**
+	 * 场景11
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene11(){		
+		//场景17:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景12
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene12(){		
+		//场景19:器械包全部都要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+	}
+	/**
+	 * 场景13
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene13(){		
+		//场景20:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景14
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene14(){
+		//场景22:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	/**
+	 * 场景15
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene15(){		
+		//场景23:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景16
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene16(){		
+		//场景25:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	/**
+	 * 场景17
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene17(){		
+		//场景26:器械包全部都要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+	}		
+	/**
+	 * 场景18
+	 */
+	/*@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene18(){		//场景30:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按科室合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,yes,convertMergeRegularDepart);
+	}*/
+	/**
+	 * 场景19
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene19(){		
+		//场景31:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	/**
+	 * 场景20
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene20(){		
+		//场景32:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景21
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene21(){		//场景34:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	/**
+	 * 场景22
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene22(){		
+		//场景35:器械包全部都要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(yes , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景23
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene23(){		
+		//场景37:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+	}
+	/**
+	 * 场景24
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene24(){		
+		//场景38:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景25
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene25(){		//场景40:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	/**
+	 * 场景26
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene26(){		
+		//场景41:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	yes,no,convertMergeRegularOperationRoom);
+	}		
+	/**
+	 * 场景27
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene27(){
+		//场景43:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	/**
+	 * 场景28
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene28(){		
+		//场景44:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeMerge,	no,null,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景29
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene29(){		//场景49:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	/**
+	 * 场景30
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene30(){		
+		//场景50:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	yes,no,convertMergeRegularOperationRoom);
+	}
+	/**
+	 * 场景31
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene31(){		
+		//场景52:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景32
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene32(){		
+		//场景53:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , yes , applicationFormTypeSplit,	no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景33
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene33(){	
+		//场景55:使用记录的器械包:部分要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景34
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene34(){		
+		//场景56:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景35
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene35(){		
+		//场景58:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景36
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene36(){		
+		//场景59:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景37
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene37(){	
+		//场景61:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景38
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene38(){		
+		//场景62:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景39
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene39(){	
+		//场景67:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景40
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene40(){		
+		//场景68:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景41
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene41(){	
+		//场景70:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景42
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene42(){		
+		//场景71:使用记录的器械包:部分要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(part , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景43
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene43(){
+		//场景73:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景44
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene44(){		
+		//场景74:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景45
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene45(){	
+		//场景76:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景46
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene46(){
+		//场景77:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景47
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene47(){	
+		//场景79:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景48
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene48(){		
+		//场景80:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景49
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene49(){		
+		//场景85:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景50
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene50(){		
+		//场景86:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景51
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene51(){	
+		//场景88:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景52
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene52(){		
+		//场景89:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , yes , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景53
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene53(){		
+		//场景91:器械包全部都不要发货、使用记录转换的申请单不要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景54
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene54(){		
+		//场景92:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,yes,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景55
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene55(){	
+		//场景94:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景56
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene56(){		
+		//场景95:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景57
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene57(){	
+		//场景97:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景58
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene58(){		
+		//场景98:器械包全部都不要发货、使用记录转换的申请单要发货、合单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeMerge,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景59
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene59(){		
+		//场景103:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景60
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene60(){		
+		//场景104:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品要转换、一次性物品不要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,yes,no,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 场景61
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene61(){		
+		//场景106:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品与器械包合并转换无所谓、转换申请单不合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularNone);
+	}
+	
+	/**
+	 * 场景62
+	 */
+	@Test
+	@Rollback(false)
+	public void testUseRecordConvertRecyclingApplicationScene62(){		
+		//场景107:器械包全部都不要发货、使用记录转换的申请单要发货、分单、一次性物品不转换、一次性物品要与器械包合并转换、转换申请单按手术间合并
+		initUseRecordConvertRecyclingApplication(no , no , applicationFormTypeSplit,no,null,convertMergeRegularOperationRoom);
+	}
+	
+	/**
+	 * 测试测试器械包录入使用记录并转换申请单
+	 * @param tousseAllInvoice 所有包定义的是否发货属性
+	 * @param needDelivedForUseRecordToRecyclingApplication
+	 * @param applicationFormType
+	 * @param isDisposableGoodsConvert
+	 * @param isDisposableGoodsMergeTousseConvert
+	 * @param userConvertMergeRegular
+	 */
+	private void initUseRecordConvertRecyclingApplication(String tousseAllInvoice , String needDelivedForUseRecordToRecyclingApplication
+			,String applicationFormType , String isDisposableGoodsConvert , String isDisposableGoodsMergeTousseConvert , String userConvertMergeRegular) {
+		//初始化数据
+		initCSSDData();
+		
+		//发货给手术室,同时由手术室录使用记录
+		String testOrgunitName = Constants.ORG_UNIT_NAME_OR;
+		String testOrgunitCoding = Constants.ORG_UNIT_CODE_OR;
+		
+		//聚合包内普通器械包
+		TousseDefinition td_开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
+		TousseDefinition td_开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包");
+		
+		//与聚合包不任何关系的普通器械包(Test开口包需要转换申请单、Test穿刺包不需要转换申请单)
+		TousseDefinition td_开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包");
+		TousseDefinition td_穿刺包 = tousseDefinitionManager.getTousseDefinitionByName("Test穿刺包");
+		
+		//根据所传参数改变配置
+		if(com.forgon.Constants.STR_YES.equals(tousseAllInvoice)){
+			td_开胸包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_开胸包);
+			td_开颅包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_开颅包);
+			td_开口包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_开口包);
+			td_穿刺包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_穿刺包);
+		} else if(com.forgon.Constants.STR_NO.equals(tousseAllInvoice)){
+			td_开胸包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_开胸包);
+			td_开颅包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_开颅包);
+			td_开口包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_开口包);
+			td_穿刺包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_穿刺包);
+		} else if(com.forgon.Constants.STR_PART.equals(tousseAllInvoice)){
+			td_开胸包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_开胸包);
+			td_开颅包.setIsInvoice(com.forgon.Constants.STR_YES);
+			objectDao.saveOrUpdate(td_开颅包);
+			td_开口包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_开口包);
+			td_穿刺包.setIsInvoice(com.forgon.Constants.STR_NO);
+			objectDao.saveOrUpdate(td_穿刺包);
+		}
+		
+		//科室供应室配置(supplyRoomType为5)
+		List<SupplyRoomConfig> convertRecyclingApplicationOrgUnitList = supplyRoomConfigManager.getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_5);
+		if(com.forgon.Constants.STR_YES.equals(needDelivedForUseRecordToRecyclingApplication)){
+			if(CollectionUtils.isNotEmpty(convertRecyclingApplicationOrgUnitList)){
+				for (SupplyRoomConfig supplyRoomConfig : convertRecyclingApplicationOrgUnitList) {
+					if(StringUtils.equals(supplyRoomConfig.getOrgUnitCoding(), testOrgunitCoding)){
+						objectDao.delete(supplyRoomConfig);
+					}
+				}
+			}
+		}else if(com.forgon.Constants.STR_NO.equals(needDelivedForUseRecordToRecyclingApplication)){
+			if(CollectionUtils.isNotEmpty(convertRecyclingApplicationOrgUnitList)){
+				boolean exists = false;
+				for (SupplyRoomConfig supplyRoomConfig : convertRecyclingApplicationOrgUnitList) {
+					if(StringUtils.equals(supplyRoomConfig.getOrgUnitCoding(), testOrgunitCoding)){
+						exists = true;
+						break;
+					}
+				}
+				if(exists == false){
+					SupplyRoomConfig supplyRoomConfig = new SupplyRoomConfig();
+					supplyRoomConfig.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_5);
+					supplyRoomConfig.setAfterRecyclingTousseDeliver(true);
+					supplyRoomConfig.setAutoMergeApplication(true);
+					supplyRoomConfig.setAutoSignInvoice(true);
+					supplyRoomConfig.setDiposablePriceFluctuation(1);
+					supplyRoomConfig.setPrintUserFullName(true);
+					supplyRoomConfig.setSecondSupplyRoomNeedRecycle(true);
+					supplyRoomConfig.setOrgUnitCoding(testOrgunitCoding);
+					supplyRoomConfig.setOrgUnitName(testOrgunitName);
+					objectDao.saveOrUpdate(supplyRoomConfig);
+				}
+			}else{
+				SupplyRoomConfig supplyRoomConfig = new SupplyRoomConfig();
+				supplyRoomConfig.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_5);
+				supplyRoomConfig.setAfterRecyclingTousseDeliver(true);
+				supplyRoomConfig.setAutoMergeApplication(true);
+				supplyRoomConfig.setAutoSignInvoice(true);
+				supplyRoomConfig.setDiposablePriceFluctuation(1);
+				supplyRoomConfig.setPrintUserFullName(true);
+				supplyRoomConfig.setSecondSupplyRoomNeedRecycle(true);
+				supplyRoomConfig.setOrgUnitCoding(testOrgunitCoding);
+				supplyRoomConfig.setOrgUnitName(testOrgunitName);
+				objectDao.saveOrUpdate(supplyRoomConfig);
+			}
+		}
+		
+		//科室供应室配置(supplyRoomType为0)
+		SupplyRoomConfig sysSupplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+		if(sysSupplyRoomConfig == null){
+			sysSupplyRoomConfig = new SupplyRoomConfig();
+			sysSupplyRoomConfig.setSupplyRoomType(SupplyRoomConfig.SUPPLYROOM_TYPE_0);
+			sysSupplyRoomConfig.setAfterRecyclingTousseDeliver(true);
+			sysSupplyRoomConfig.setAutoMergeApplication(true);
+			sysSupplyRoomConfig.setAutoSignInvoice(true);
+			sysSupplyRoomConfig.setDiposablePriceFluctuation(1);
+			sysSupplyRoomConfig.setPrintUserFullName(true);
+			sysSupplyRoomConfig.setSecondSupplyRoomNeedRecycle(true);
+		}
+		if(com.forgon.Constants.STR_YES.equals(isDisposableGoodsConvert)){
+			sysSupplyRoomConfig.setIsDgConvertApplication(true);
+		}else if(com.forgon.Constants.STR_NO.equals(isDisposableGoodsConvert)){
+			sysSupplyRoomConfig.setIsDgConvertApplication(false);
+		}
+		
+		//科室供应室配置
+		if(com.forgon.Constants.STR_YES.equals(isDisposableGoodsMergeTousseConvert)){
+			sysSupplyRoomConfig.setIsTousseDgMergeConvert(true);
+		}else if(com.forgon.Constants.STR_NO.equals(isDisposableGoodsMergeTousseConvert)){
+			sysSupplyRoomConfig.setIsTousseDgMergeConvert(false);
+		}
+		objectDao.saveOrUpdate(sysSupplyRoomConfig);
+		
+		//config.js
+		CssdUtils.setAndWriteConfigByNameAndValue("applicationFormType",applicationFormType);
+		
+		//config.js
+		CssdUtils.setAndWriteConfigByNameAndValue("useRecordConvertRecyclingApplicationMergeRegular",userConvertMergeRegular);
+		
+		
+		//设置装配时间
+		Date packingTime = new Date();
+		
+		/**************普通包发货*******start**************/
+		Invoice invoice = new Invoice();
+		invoice.setApplicant("test1");
+		invoice.setApplicationTime(new Date());
+		invoice.setAssistantSender("test2");
+		invoice.setDepartCoding(testOrgunitCoding);
+		invoice.setDepart(testOrgunitName);
+		objectDao.saveOrUpdate(invoice);
+		
+		TousseInstance tousseInstance_开胸包1 = new TousseInstance();
+		tousseInstance_开胸包1.setTousseDefinition(td_开胸包);
+		tousseInstance_开胸包1.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开胸包1.setOperationTime(packingTime);
+		tousseInstance_开胸包1.setTousseName(tousseInstance_开胸包1.getTousseDefinitionName());
+		tousseInstance_开胸包1.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开胸包1.setInvoice_id(invoice.getId());
+		tousseInstance_开胸包1.setInvoiceSender(invoice.getSender());
+		tousseInstance_开胸包1.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开胸包1.setLocation(invoice.getDepartCoding());
+		tousseInstance_开胸包1.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开胸包1);
+		
+		TousseInstance tousseInstance_开胸包2 = new TousseInstance();
+		tousseInstance_开胸包2.setTousseDefinition(td_开胸包);
+		tousseInstance_开胸包2.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开胸包2.setOperationTime(packingTime);
+		tousseInstance_开胸包2.setTousseName(tousseInstance_开胸包2.getTousseDefinitionName());
+		tousseInstance_开胸包2.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开胸包2.setInvoice_id(invoice.getId());
+		tousseInstance_开胸包2.setInvoiceSender(invoice.getSender());
+		tousseInstance_开胸包2.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开胸包2.setLocation(invoice.getDepartCoding());
+		tousseInstance_开胸包2.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开胸包2);
+		
+		TousseInstance tousseInstance_开颅包1 = new TousseInstance();
+		tousseInstance_开颅包1.setTousseDefinition(td_开颅包);
+		tousseInstance_开颅包1.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开颅包1.setOperationTime(packingTime);
+		tousseInstance_开颅包1.setTousseName(tousseInstance_开颅包1.getTousseDefinitionName());
+		tousseInstance_开颅包1.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开颅包1.setInvoice_id(invoice.getId());
+		tousseInstance_开颅包1.setInvoiceSender(invoice.getSender());
+		tousseInstance_开颅包1.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开颅包1.setLocation(invoice.getDepartCoding());
+		tousseInstance_开颅包1.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开颅包1);
+		
+		TousseInstance tousseInstance_开颅包2 = new TousseInstance();
+		tousseInstance_开颅包2.setTousseDefinition(td_开颅包);
+		tousseInstance_开颅包2.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开颅包2.setOperationTime(packingTime);
+		tousseInstance_开颅包2.setTousseName(tousseInstance_开颅包2.getTousseDefinitionName());
+		tousseInstance_开颅包2.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开颅包2.setInvoice_id(invoice.getId());
+		tousseInstance_开颅包2.setInvoiceSender(invoice.getSender());
+		tousseInstance_开颅包2.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开颅包2.setLocation(invoice.getDepartCoding());
+		tousseInstance_开颅包2.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开颅包2);
+		
+		TousseInstance tousseInstance_开胸包3 = new TousseInstance();
+		tousseInstance_开胸包3.setTousseDefinition(td_开胸包);
+		tousseInstance_开胸包3.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开胸包3.setOperationTime(packingTime);
+		tousseInstance_开胸包3.setTousseName(tousseInstance_开胸包3.getTousseDefinitionName());
+		tousseInstance_开胸包3.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开胸包3.setInvoice_id(invoice.getId());
+		tousseInstance_开胸包3.setInvoiceSender(invoice.getSender());
+		tousseInstance_开胸包3.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开胸包3.setLocation(invoice.getDepartCoding());
+		tousseInstance_开胸包3.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开胸包3);
+		
+		TousseInstance tousseInstance_开颅包3 = new TousseInstance();
+		tousseInstance_开颅包3.setTousseDefinition(td_开颅包);
+		tousseInstance_开颅包3.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开颅包3.setOperationTime(packingTime);
+		tousseInstance_开颅包3.setTousseName(tousseInstance_开颅包3.getTousseDefinitionName());
+		tousseInstance_开颅包3.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开颅包3.setInvoice_id(invoice.getId());
+		tousseInstance_开颅包3.setInvoiceSender(invoice.getSender());
+		tousseInstance_开颅包3.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开颅包3.setLocation(invoice.getDepartCoding());
+		tousseInstance_开颅包3.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开颅包3);
+		
+		TousseInstance tousseInstance_开颅包4 = new TousseInstance();
+		tousseInstance_开颅包4.setTousseDefinition(td_开颅包);
+		tousseInstance_开颅包4.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开颅包4.setOperationTime(packingTime);
+		tousseInstance_开颅包4.setTousseName(tousseInstance_开颅包4.getTousseDefinitionName());
+		tousseInstance_开颅包4.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开颅包4.setInvoice_id(invoice.getId());
+		tousseInstance_开颅包4.setInvoiceSender(invoice.getSender());
+		tousseInstance_开颅包4.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开颅包4.setLocation(invoice.getDepartCoding());
+		tousseInstance_开颅包4.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开颅包4);
+		
+		//不为聚合包且不属于任何聚合包的普通器械包实例
+		TousseInstance tousseInstance_开口包1 = new TousseInstance();
+		tousseInstance_开口包1.setTousseDefinition(td_开口包);
+		tousseInstance_开口包1.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开口包1.setOperationTime(packingTime);
+		tousseInstance_开口包1.setTousseName(tousseInstance_开口包1.getTousseDefinitionName());
+		tousseInstance_开口包1.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开口包1.setInvoice_id(invoice.getId());
+		tousseInstance_开口包1.setInvoiceSender(invoice.getSender());
+		tousseInstance_开口包1.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开口包1.setLocation(invoice.getDepartCoding());
+		tousseInstance_开口包1.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开口包1);
+		
+		TousseInstance tousseInstance_开口包2 = new TousseInstance();
+		tousseInstance_开口包2.setTousseDefinition(td_开口包);
+		tousseInstance_开口包2.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_开口包2.setOperationTime(packingTime);
+		tousseInstance_开口包2.setTousseName(tousseInstance_开口包2.getTousseDefinitionName());
+		tousseInstance_开口包2.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_开口包2.setInvoice_id(invoice.getId());
+		tousseInstance_开口包2.setInvoiceSender(invoice.getSender());
+		tousseInstance_开口包2.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_开口包2.setLocation(invoice.getDepartCoding());
+		tousseInstance_开口包2.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_开口包2);
+		
+		TousseInstance tousseInstance_穿刺包1 = new TousseInstance();
+		tousseInstance_穿刺包1.setTousseDefinition(td_穿刺包);
+		tousseInstance_穿刺包1.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_穿刺包1.setOperationTime(packingTime);
+		tousseInstance_穿刺包1.setTousseName(tousseInstance_穿刺包1.getTousseDefinitionName());
+		tousseInstance_穿刺包1.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_穿刺包1.setInvoice_id(invoice.getId());
+		tousseInstance_穿刺包1.setInvoiceSender(invoice.getSender());
+		tousseInstance_穿刺包1.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_穿刺包1.setLocation(invoice.getDepartCoding());
+		tousseInstance_穿刺包1.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_穿刺包1);
+		
+		TousseInstance tousseInstance_穿刺包2 = new TousseInstance();
+		tousseInstance_穿刺包2.setTousseDefinition(td_穿刺包);
+		tousseInstance_穿刺包2.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		tousseInstance_穿刺包2.setOperationTime(packingTime);
+		tousseInstance_穿刺包2.setTousseName(tousseInstance_穿刺包2.getTousseDefinitionName());
+		tousseInstance_穿刺包2.setStatus(TousseInstance.STATUS_SHIPPED);
+		tousseInstance_穿刺包2.setInvoice_id(invoice.getId());
+		tousseInstance_穿刺包2.setInvoiceSender(invoice.getSender());
+		tousseInstance_穿刺包2.setInvoiceSendTime(invoice.getSendTime());
+		tousseInstance_穿刺包2.setLocation(invoice.getDepartCoding());
+		tousseInstance_穿刺包2.setLocationForDisplay(invoice.getDepart());
+		tousseInstanceManager.saveOrUpdate(tousseInstance_穿刺包2);
+		
+		
+		//共有包实例11个:td_穿刺包和td_开口包各两个、td_开颅包4个、td_开胸包3个
+		/**************普通包发货*******end**************/
+		
+		UseRecord original1 = new UseRecord();
+		original1.setApplicationTime(new Date());
+		original1.setHospitalNum("aa");
+		original1.setDepart(invoice.getDepart());
+		original1.setDepartCoding(invoice.getDepartCoding());
+		original1.setDoctorName("aaa");
+		original1.setEnteringDate(new Date());
+		original1.setPatientName("aaaa");
+		original1.setPatientAge("aaaaa");
+		original1.setPatientIDCard("aaaaaa");
+		original1.setOperationRoom("testOperationRoom");
+		original1.setStatus(UseRecord.STATUS_UNAUDITED);
+		original1.setWashHandNurse("张三");
+		original1.setCircuitNurse("李四");
+		original1.setOperator(AcegiHelper.getLoginUserFullName());
+		
+		List<TousseInstance> orginalTousseInstanceListForUseRecord1 = new ArrayList<TousseInstance>();
+		orginalTousseInstanceListForUseRecord1.add(tousseInstance_开口包1);
+		orginalTousseInstanceListForUseRecord1.add(tousseInstance_穿刺包1);
+		original1.setTousseInstanceList(orginalTousseInstanceListForUseRecord1);
+		//新增使用记录一(扫描第一个聚合包条码、tousseInstance_开口包1、tousseInstance_穿刺包1),断言第一个聚合包、开口包1和穿刺包1包的状态及有没有被录入到使用记录一、使用记录的状态是否为未审核
+		useRecordManager.saveUseRecord_TRANS_REQUIRED(original1);
+		
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_开口包1.getStatus());
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_穿刺包1.getStatus());
+		AssertJUnit.assertEquals(UseRecord.STATUS_UNAUDITED, original1.getStatus());
+		
+		//因为开口包会转申请单,而穿刺包不会转,所以实际会被转的包实例数量为1
+		AssertJUnit.assertEquals(1, original1.getTousseInstanceWillBeConvertedTousseItemList(objectDao).size());
+		//总共的包实例数据为2
+		AssertJUnit.assertEquals(2, original1.getTousseInstanceList(objectDao).size());
+		
+		UseRecord modified1 = new UseRecord();
+		modified1.setId(original1.getId());
+		modified1.setApplicationTime(new Date());
+		modified1.setHospitalNum("aa1");
+		modified1.setDepart(invoice.getDepart());
+		modified1.setDepartCoding(invoice.getDepartCoding());
+		modified1.setDoctorName("aaa1");
+		modified1.setEnteringDate(new Date());
+		modified1.setPatientName("aaaa1");
+		modified1.setPatientAge("aaaaa1");
+		modified1.setPatientIDCard("aaaaaa1");
+		modified1.setOperationRoom("testOperationRoom");
+		modified1.setStatus(UseRecord.STATUS_UNAUDITED);
+		modified1.setOperator(AcegiHelper.getLoginUserFullName());
+		modified1.setWashHandNurse("张三1");
+		modified1.setCircuitNurse("李四1");
+		
+		List<TousseInstance> modifiedTousseInstanceListForUseRecord1 = new ArrayList<TousseInstance>();
+		modifiedTousseInstanceListForUseRecord1.add(tousseInstance_开胸包1);
+		modifiedTousseInstanceListForUseRecord1.add(tousseInstance_开颅包1);
+		modifiedTousseInstanceListForUseRecord1.add(tousseInstance_开口包2);
+		modifiedTousseInstanceListForUseRecord1.add(tousseInstance_穿刺包1);
+		modifiedTousseInstanceListForUseRecord1.add(tousseInstance_穿刺包2);
+		modified1.setTousseInstanceList(modifiedTousseInstanceListForUseRecord1);
+
+		useRecordManager.updateUseRecord_TRANS_REQUIRED(original1, modified1);
+		
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_开胸包1.getStatus());
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_开颅包1.getStatus());
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_开口包2.getStatus());
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_穿刺包1.getStatus());
+		AssertJUnit.assertEquals(TousseInstance.STATUS_USED, tousseInstance_穿刺包2.getStatus());
+		
+		//开口1状态回滚
+		AssertJUnit.assertNotSame(TousseInstance.STATUS_USED, tousseInstance_开口包1.getStatus());
+		AssertJUnit.assertEquals(UseRecord.STATUS_UNAUDITED, original1.getStatus());
+		
+		//因为开口包会转申请单,而穿刺包不会转,所以实际会被转的包实例数量为1
+		AssertJUnit.assertEquals(3, modified1.getTousseInstanceWillBeConvertedTousseItemList(objectDao).size());
+		//总共的包实例数据为2
+		AssertJUnit.assertEquals(5, modified1.getTousseInstanceList(objectDao).size());
+		
+		//审核使用记录一
+		useRecordManager.auditUseRecords_TRANS_REQUIRED(Collections.singletonList(modified1.getId()));
+		AssertJUnit.assertEquals(UseRecord.STATUS_AUDITED, original1.getStatus());
+		
+		//返回为未审核
+		useRecordManager.becomeNotAudited(Collections.singletonList(modified1.getId()));
+		AssertJUnit.assertEquals(UseRecord.STATUS_UNAUDITED, original1.getStatus());
+		
+		//再次审核使用记录一
+		useRecordManager.auditUseRecords_TRANS_REQUIRED(Collections.singletonList(modified1.getId()));
+		AssertJUnit.assertEquals(UseRecord.STATUS_AUDITED, original1.getStatus());
+		
+		//使用记录一转换申请单
+		useRecordManager.createRecyclingApplicationByUseRecords(Collections.singletonList(modified1.getId()), 
+				modified1.getOperator(), modified1.getDepart(), modified1.getDepartCoding(), new Date(), applicationFormType);
+		AssertJUnit.assertEquals(UseRecord.STATUS_APPLIED, original1.getStatus());
+		
+		RecyclingApplication recyclingApplication1 = (RecyclingApplication)objectDao.getByProperty(RecyclingApplication.class.getSimpleName(), "useRecord.id" , modified1.getId());
+		AssertJUnit.assertNotNull(recyclingApplication1);
+		
+		if(com.forgon.Constants.STR_NO.equals(needDelivedForUseRecordToRecyclingApplication) || com.forgon.Constants.STR_NO.equals(tousseAllInvoice)){
+			AssertJUnit.assertTrue(StringUtils.isBlank(recyclingApplication1.getDeliverStatus()));
+		}else{
+			AssertJUnit.assertEquals(InvoicePlan.DELIVERSTATUS_AWAITDELIVER, recyclingApplication1.getDeliverStatus());
+		}
+		//开胸包、开颅包、开口包会转换成申请单,穿刺包都不会转换
+		AssertJUnit.assertEquals(3, recyclingApplication1.getApplicationItems().size());
+		
+		//断言使用记录转申请单的中间表数量为1
+		List<UseRecordToRecycleApplication> list = objectDao.findAllObjects(UseRecordToRecycleApplication.class.getSimpleName());
+		AssertJUnit.assertNotNull(list);
+		AssertJUnit.assertEquals(1, list.size());
+		
+		UseRecord original2 = new UseRecord();
+		original2.setApplicationTime(new Date());
+		original2.setHospitalNum("cc");
+		original2.setDepart(invoice.getDepart());
+		original2.setDepartCoding(invoice.getDepartCoding());
+		original2.setDoctorName("ccc");
+		original2.setEnteringDate(new Date());
+		original2.setPatientName("cccc");
+		original2.setPatientAge("ccccc");
+		original2.setPatientIDCard("cccccc");
+		original2.setOperationRoom("testOperationRoom");
+		original2.setStatus(UseRecord.STATUS_UNAUDITED);
+		original2.setOperator(AcegiHelper.getLoginUserFullName());
+		original2.setWashHandNurse("王五");
+		original2.setCircuitNurse("赵六");
+		
+		List<TousseInstance> orginalTousseInstanceListForUseRecord2 = new ArrayList<TousseInstance>();
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开口包1);
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开胸包2);
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开胸包3);
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开颅包2);
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开颅包3);
+		orginalTousseInstanceListForUseRecord2.add(tousseInstance_开颅包4);
+		original2.setTousseInstanceList(orginalTousseInstanceListForUseRecord2);
+		
+		//保存审核并转换申请单
+		try {
+			useRecordManager.saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED(original2, 
+					original2.getOperator(), original2.getDepart(), original2.getDepartCoding(), new Date(), applicationFormType);
+			AssertJUnit.assertEquals(UseRecord.STATUS_APPLIED, original2.getStatus());
+			
+			//因为开口包会转申请单,而穿刺包不会转,所以实际会被转的包实例数量为1
+			AssertJUnit.assertEquals(6, original2.getTousseInstanceWillBeConvertedTousseItemList(objectDao).size());
+			//总共的包实例数据为2
+			AssertJUnit.assertEquals(6, original2.getTousseInstanceList(objectDao).size());
+			
+			//断言使用记录转申请单的中间表数量为1
+			List<UseRecordToRecycleApplication> list2 = objectDao.findAllObjects(UseRecordToRecycleApplication.class.getSimpleName());
+			AssertJUnit.assertNotNull(list2);
+			AssertJUnit.assertEquals(2, list2.size());
+		} catch (Exception e) {
+			e.printStackTrace();
+			Assert.assertEquals(1, 2, "后台报错,测试用例不通过");
+		}
+		
+		RecyclingApplication recyclingApplication2 = (RecyclingApplication)objectDao.getByProperty(RecyclingApplication.class.getSimpleName(), "useRecord.id" , original2.getId());
+		AssertJUnit.assertNotNull(recyclingApplication2);
+		
+		//根据不同的业务场景进行相应的结果断言
+		if(StringUtils.equals(com.forgon.Constants.STR_YES, tousseAllInvoice)){
+			if(StringUtils.equals(com.forgon.Constants.STR_YES, needDelivedForUseRecordToRecyclingApplication)){
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			} else {
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			}
+		} else if(StringUtils.equals(com.forgon.Constants.STR_PART, tousseAllInvoice)){
+			if(StringUtils.equals(com.forgon.Constants.STR_YES, needDelivedForUseRecordToRecyclingApplication)){
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			} else {
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			}
+		} else if(StringUtils.equals(com.forgon.Constants.STR_NO, tousseAllInvoice)){
+			if(StringUtils.equals(com.forgon.Constants.STR_YES, needDelivedForUseRecordToRecyclingApplication)){
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			} else {
+				if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_MERGE, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				} else if(StringUtils.equals(InvoicePlan.APPLICATION_FORM_TYPE_SPLIT, applicationFormType)){
+					if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsConvert)){
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}else{
+						if(StringUtils.equals(com.forgon.Constants.STR_YES, isDisposableGoodsMergeTousseConvert)){
+							//业务场景不存在
+						}else{
+							if(StringUtils.isBlank(userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() != recyclingApplication2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM, userConvertMergeRegular)){
+								AssertJUnit.assertTrue(recyclingApplication1.getId() == recyclingApplication2.getId());
+								AssertJUnit.assertEquals(recyclingApplication1.getUseRecord().getId(), original2.getId());
+							}else if(StringUtils.equals(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_DEPART, userConvertMergeRegular)){
+								//待完善
+							}
+						}
+					}
+				}else{
+					//业务场景不存在
+				}
+			}
+		}else{
+			//业务场景不存在
+		}
+	}
+
+	/**
 	 * 测试使用记录干预功能修改(在审核之后在转成申请单之前)
 	 */
 	@Test
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r17643 -r17658
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 17643)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 17658)
@@ -942,7 +942,7 @@
 
 				//如果没有启用是否真正使用功能,那下面这句就为true,不影响之前的功能,否则就看是否真正使用的值,如果已经使用的,就看包定义是否转换。如果没有使用,则需要转换,而不管理包定义是否转换
 				boolean actualUsed = enableActualUsed?(!tousseInstance.actualNotUsed()):true;
-				if (TousseDefinition.STR_NO.equals(tousseDefinition.getIsConvertApplyGoods()) && actualUsed) {
+				if (!TousseDefinition.STR_YES.equals(tousseDefinition.getIsConvertApplyGoods()) && actualUsed) {
 					continue;
 				}
 
@@ -1578,17 +1578,46 @@
 		String useRecordConvertRecyclingApplicationRemark = CssdUtils.getConfigProperty("useRecordConvertRecyclingApplicationRemark");
 		if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){
 			//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
-			useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
-			useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
-			useRecordConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
-			useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
-			useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
+			if(StringUtils.isNotBlank(getCircuitNurseLabelName())){
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
+			}else{
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", "");
+			}
+			if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
+			}else{
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", "");
+			}
+			if(StringUtils.isNotBlank(useRecord.getPatientName())){
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
+			}else{
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", "");
+			}
+			if(StringUtils.isNotBlank(useRecord.getRemark())){
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
+			}else{
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", "");
+			}
+			if(StringUtils.isNotBlank(useRecord.getHospitalNum())){
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
+			}else{
+				useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", "");
+			}
 			//手术台数(一条使用记录默认就是一台手术)
-			useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", "1");
+			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", "1");
 			//器械件数(仅计算能被转换到申请单的器械包总件数)
-			useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao)));
+			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao)));
 		}else{
-			useRecordConvertRecyclingApplicationRemark = "洗手护士:" + useRecord.getWashHandNurse() + ";" + getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";" + "病人:" + useRecord.getPatientName();
+			useRecordConvertRecyclingApplicationRemark = "";
+			if(StringUtils.isNotBlank(useRecord.getWashHandNurse())){
+				useRecordConvertRecyclingApplicationRemark += "洗手护士:" + useRecord.getWashHandNurse() + ";";
+			}
+			if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
+				useRecordConvertRecyclingApplicationRemark = getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";";
+			}
+			if(StringUtils.isNotBlank(useRecord.getPatientName())){
+				useRecordConvertRecyclingApplicationRemark = "病人:" + useRecord.getPatientName() + ";";
+			}
 		}
 		return useRecordConvertRecyclingApplicationRemark;
 	}
@@ -1605,36 +1634,76 @@
 	 * @return
 	 */
 	private String getRemarkByRecyclingApplicationAndProjectConfig(RecyclingApplication recyclingApplication){
-		String useRecordConvertRecyclingApplicationRemark = CssdUtils.getConfigProperty("useRecordConvertRecyclingApplicationRemark");
+		String useRecordConvertRecyclingApplicationRemark = CssdUtils.getSystemSetConfigByName("useRecordConvertRecyclingApplicationRemark");
 		List<UseRecord> useRecordList = objectDao.findBySql(UseRecord.class.getSimpleName(), 
 				" where id in (select useRecordId from UseRecordToRecycleApplication where invoicePlanId="+ recyclingApplication.getId() +")");
 		Set<String> remarks = new HashSet<String>();
 		if(CollectionUtils.isNotEmpty(useRecordList)){
+			//如果有配置使用记录转换申请单后的备注格式
 			if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){
-				for (UseRecord useRecord : useRecordList) {
-					//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
-					useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
-					useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
-					useRecordConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
-					useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
-					useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
-					remarks.add(useRecordConvertRecyclingApplicationRemark);
+				//如果备注格式只需要@operationAmount或@tousseAmount并且又未配置@circuitNurseLabelName、@circuitNurseLabelName、@circuitNurse、@patientName、@useRecordRemark、@hospitalNumber其中任何一个时等时
+				if((useRecordConvertRecyclingApplicationRemark.indexOf("@operationAmount") != -1 || useRecordConvertRecyclingApplicationRemark.indexOf("@tousseAmount") != -1)){
+					if(CollectionUtils.isNotEmpty(recyclingApplication.getApplicationItems())){
+						int tousseTotalAmount = 0;
+						for (TousseItem tousseItem : recyclingApplication.getApplicationItems()) {
+							tousseTotalAmount += tousseItem.getAmount();
+						}
+						
+						//手术台数(一条使用记录默认就是一台手术)
+						useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", String.valueOf(useRecordList.size()));
+						//器械件数(仅计算能被转换到申请单的器械包总件数)
+						useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(tousseTotalAmount));
+						remarks.add(useRecordConvertRecyclingApplicationRemark);
+					}
 				}
 				
-				if(CollectionUtils.isNotEmpty(recyclingApplication.getApplicationItems())){
-					int tousseTotalAmount = 0;
-					for (TousseItem tousseItem : recyclingApplication.getApplicationItems()) {
-						tousseTotalAmount += tousseItem.getAmount();
+				if(useRecordConvertRecyclingApplicationRemark.indexOf("@circuitNurseLabelName") != -1
+						|| useRecordConvertRecyclingApplicationRemark.indexOf("@circuitNurse") != -1
+						|| useRecordConvertRecyclingApplicationRemark.indexOf("@patientName") != -1
+						|| useRecordConvertRecyclingApplicationRemark.indexOf("@useRecordRemark") != -1
+						|| useRecordConvertRecyclingApplicationRemark.indexOf("@hospitalNumber") != -1){
+					for (UseRecord useRecord : useRecordList) {
+						//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
+						if(StringUtils.isNotBlank(getCircuitNurseLabelName())){
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
+						}else{
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", "");
+						}
+						if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", useRecord.getCircuitNurse());
+						}else{
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", "");
+						}
+						if(StringUtils.isNotBlank(useRecord.getPatientName())){
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", useRecord.getPatientName());
+						}else{
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", "");
+						}
+						if(StringUtils.isNotBlank(useRecord.getRemark())){
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", useRecord.getRemark());
+						}else{
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", "");
+						}
+						if(StringUtils.isNotBlank(useRecord.getHospitalNum())){
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", useRecord.getHospitalNum());
+						}else{
+							useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", "");
+						}
+						remarks.add(useRecordConvertRecyclingApplicationRemark);
 					}
-					//手术台数(一条使用记录默认就是一台手术)
-					useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", String.valueOf(useRecordList.size()));
-					//器械件数(仅计算能被转换到申请单的器械包总件数)
-					useRecordConvertRecyclingApplicationRemark.replace("@tousseAmount", String.valueOf(tousseTotalAmount));
-					remarks.add(useRecordConvertRecyclingApplicationRemark);
 				}
 			}else{
 				for (UseRecord useRecord : useRecordList) {
-					useRecordConvertRecyclingApplicationRemark = "洗手护士:" + useRecord.getWashHandNurse() + ";" + getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";" + "病人:" + useRecord.getPatientName();
+					useRecordConvertRecyclingApplicationRemark = "";
+					if(StringUtils.isNotBlank(useRecord.getWashHandNurse())){
+						useRecordConvertRecyclingApplicationRemark += "洗手护士:" + useRecord.getWashHandNurse() + ";";
+					}
+					if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
+						useRecordConvertRecyclingApplicationRemark = getCircuitNurseLabelName() + ":" + useRecord.getCircuitNurse() + ";";
+					}
+					if(StringUtils.isNotBlank(useRecord.getPatientName())){
+						useRecordConvertRecyclingApplicationRemark = "病人:" + useRecord.getPatientName() + ";";
+					}
 					remarks.add(useRecordConvertRecyclingApplicationRemark);
 				}
 			}