Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r13631 -r13652
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13631)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13652)
@@ -1648,9 +1648,9 @@
 					if (!TousseDefinition.STR_YES.equals(isRecycling)
 							&& !TousseDefinition.STR_NO.equals(isRecycling)
 							|| isCustomPack == null) {
-						isCustomPack = "否";
+						isQuickRecycle = "否";
 					}
-					tousseDefinition.setIsCustomPacking(isQuickRecycle);
+					tousseDefinition.setExpressRecycling(isQuickRecycle);
 					
 					// 是否打印科室
 					String isPrintOrg = ParerUtils.getCellFormatValue(row, isPrintOrgIndex);
@@ -1666,7 +1666,7 @@
 							tousseType, taskgroupName, isCleanedEntirely,
 							packageType, size, spelling, wbCode, price,
 							proxyDisinfectionPrice, borrowPrice, assetsBelong,
-							sterilingMethod, cleanMethod);
+							sterilingMethod, cleanMethod,isCustomPack,isQuickRecycle);
 					
 					// 材料使用篮筐数量materialUsebasketAmount
 					int materialUsebasketAmount = 0;
@@ -1907,7 +1907,9 @@
 				tempTousseDefinition.getBorrowPrice(),
 				tempTousseDefinition.getAssetsBelong(),
 				tempTousseDefinition.getSterilingMethod(),
-				tempTousseDefinition.getCleanMethod());
+				tempTousseDefinition.getCleanMethod(),
+				tempTousseDefinition.getIsCustomPacking(),
+				tempTousseDefinition.getExpressRecycling());
 		persistenceTousseDefinition.setIsPrintOrg(tempTousseDefinition.getIsPrintOrg());
 		// persistenceTousseDefinition.setMaterialInstance(tempTousseDefinition
 		// .getMaterialInstance());
@@ -1919,7 +1921,8 @@
 			String taskgroupName, String isCleanedEntirely, String packageType,
 			String size, String spelling, String wbCode, Double price,
 			Double proxyDisinfectionPrice, Double borrowPrice,
-			String assetsBelong, String sterilingMethod, String cleanMethod) {
+			String assetsBelong, String sterilingMethod, String cleanMethod,
+			String isCustomPacking,String expressRecycling) {
 		tousseDefinition.setTousseType(tousseType);
 		tousseDefinition.setTaskGroup(taskgroupName);
 		tousseDefinition.setIsCleanedEntirely(isCleanedEntirely);
@@ -1933,6 +1936,8 @@
 		tousseDefinition.setAssetsBelong(assetsBelong);
 		tousseDefinition.setSterilingMethod(sterilingMethod);
 		tousseDefinition.setCleanMethod(cleanMethod);
+		tousseDefinition.setIsCustomPacking(isCustomPacking);
+		tousseDefinition.setExpressRecycling(expressRecycling);
 	}
 
 	private int appendFailureRowNumAndRecordFailureNum(int failureCount,