Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r30123 -r30128
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 30123)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 30128)
@@ -571,8 +571,7 @@
 
 	@Deprecated
 	public boolean getAfterRecyclingTousseDeliver() {
-		if(StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERPRERECYCLING)
-				|| StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERRECYCLING)){
+		if(StringUtils.equals(tousseDeliverOccasion, TOUSSEDELIVEROCCASION_AFTERRECYCLING)){
 			return true;
 		}
 		return false;
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r30124 -r30128
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 30124)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 30128)
@@ -3328,12 +3328,14 @@
 		
 		String invoiceOrigin = systemParamsObj.getInvoiceOrigin();
 		boolean afterRecyclingTousseDeliver = systemParamsObj.getAfterRecyclingTousseDeliver();
+		String tousseDeliverOccasion = systemParamsObj.getTousseDeliverOccasion();
+		boolean afterPreRecyclingTousseDeliver = StringUtils.equals(SupplyRoomConfig.TOUSSEDELIVEROCCASION_AFTERPRERECYCLING, tousseDeliverOccasion);
 		
 		//按包数打印消毒物品的数量，即无论消毒物品是否整包申请，均按包数量打印
 		boolean printDisinfectionGoodsAmountByPackage = CssdUtils.getSystemSetConfigByNameBool("printDisinfectionGoodsAmountByPackage", false);
 		
 		for (int i=0;i<tousseItems.size();i++){
-			PrintRowVo printRowVo = tousseItem2PrintVo(tousseItems.get(i), printApplyInfo, invoiceOrigin, afterRecyclingTousseDeliver, printDisinfectionGoodsAmountByPackage);
+			PrintRowVo printRowVo = tousseItem2PrintVo(tousseItems.get(i), printApplyInfo, invoiceOrigin, afterRecyclingTousseDeliver, afterPreRecyclingTousseDeliver, printDisinfectionGoodsAmountByPackage);
 			if(mergeSameGoods){
 				PrintRowVo rowVo = find(rowVos,tousseItems.get(i));
 				if(rowVo != null && printRowVo != null){
@@ -3412,7 +3414,7 @@
 	 * @param printDisinfectionGoodsAmountByPackage 按包数打印消毒物品的数量，即无论消毒物品是否整包申请，均按包数量打印
 	 * @return
 	 */
-	private PrintRowVo tousseItem2PrintVo(TousseItem tousseItem, boolean isPrintApplyInfo, String invoiceOrigin, boolean afterRecyclingTousseDeliver,boolean printDisinfectionGoodsAmountByPackage) {
+	private PrintRowVo tousseItem2PrintVo(TousseItem tousseItem, boolean isPrintApplyInfo, String invoiceOrigin, boolean afterRecyclingTousseDeliver, boolean afterPreRecyclingTousseDeliver, boolean printDisinfectionGoodsAmountByPackage) {
 		PrintRowVo rowVo = new PrintRowVo();
 
 		String name = tousseItem.getTousseName();
@@ -3446,7 +3448,9 @@
 			Integer recyclingAmount = tousseItem.getRecyclingAmount();
 			// 预回收数量
 			if(recyclingAmount == null || recyclingAmount.intValue() == 0){
-				recyclingAmount = tousseItem.getPrepareRecycleAmount();
+				if(afterPreRecyclingTousseDeliver){
+					recyclingAmount = tousseItem.getPrepareRecycleAmount();
+				}
 			}
 			// 已被回收，则打印回收数量
 			if (!TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType) && recyclingAmount != null){