Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r29237 -r29264
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 29237)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 29264)
@@ -4671,7 +4671,7 @@
 					needInvoiceForUseRecordOfDepart,departCoding, departCanMerge,
 					applicant, depart,applicationCreateDate);
 		}
-		//throw new SystemException("test");
+//		throw new SystemException("test");
 	}
 
 	/**
@@ -5443,7 +5443,7 @@
 				//创建器械包申请单
 				List<RecyclingApplication> recyclingApplicationList = recyclingApplicationManager.createRecyclingApplicationByTousse(
 						applyTousseMap,new HashMap<String, Integer>(), applicant, depart, departCoding, hospitalNumbers, remark,
-						tousseBarcodeToTdIdMap,applicationCreateDate,operationRoom,sterilizationMode,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
+						tousseBarcodeToTdIdMap,applicationCreateDate,operationRoom,sterilizationMode,dpf,invoicePlanTypeAfterTousseConvert,
 						applyUrgentTousseMap,applyTousseNameToUrgentAmountMap,applyTousseNameToMaxUrgentLevelMap,firstUseRecordId);
 				
 				if(CollectionUtils.isNotEmpty(recyclingApplicationList)){
@@ -5551,7 +5551,7 @@
 				//创建器械包申请单
 				List<RecyclingApplication> recyclingApplicationList = recyclingApplicationManager.createRecyclingApplicationByTousse(
 						applyTousseMap,new HashMap<String, Integer>(), applicant, depart, departCoding, hospitalNumbers, remark,
-						tousseBarcodeToTdIdMap,applicationCreateDate,null,sterilizationMode,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
+						tousseBarcodeToTdIdMap,applicationCreateDate,null,sterilizationMode,dpf,invoicePlanTypeAfterTousseConvert,
 						applyUrgentTousseMap,applyTousseNameToUrgentAmountMap,applyTousseNameToMaxUrgentLevelMap,firstUseRecordId);
 				
 				if(CollectionUtils.isNotEmpty(recyclingApplicationList)){
@@ -5624,10 +5624,10 @@
 				recyclingApplicationListAfterConvert.add(recyclingApplication);
 			}
 		}else{
-			//创建器械包申请单
+			//创建新的申请单(可能是器械包申请单、也可能是通用申请单)
 			List<RecyclingApplication> recyclingApplicationList = recyclingApplicationManager.createRecyclingApplicationByTousse(
 					applyTousseMap,new HashMap<String, Integer>(), applicant, depart, departCoding, hospitalNumbers, remark,
-					tousseBarcodeToTdIdMap,applicationCreateDate,operationRoom,sterilizationMode,dpf,InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM,
+					tousseBarcodeToTdIdMap,applicationCreateDate,operationRoom,sterilizationMode,dpf,invoicePlanTypeAfterTousseConvert,
 					applyUrgentTousseMap,applyTousseNameToUrgentAmountMap,applyTousseNameToMaxUrgentLevelMap,firstUseRecordId);
 			
 			if(CollectionUtils.isNotEmpty(recyclingApplicationList)){