Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r28675 -r28692
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 28675)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 28692)
@@ -6389,7 +6389,7 @@
 	@Override
 	@SuppressWarnings("unchecked")
 	public JSONObject getTousseItemSummaryByInvoicePlanIds(
-			String recyclingRecordIds) {
+			String recyclingRecordIds, boolean priorityRecyclingAmount) {
 		if(StringUtils.isBlank(recyclingRecordIds)){
 			throw new SystemException("参数recyclingRecordIds的值不能为空");
 		}
@@ -6406,9 +6406,14 @@
 			if(CollectionUtils.isNotEmpty(tousseItems)){
 				for (TousseItem tousseItem : tousseItems) {
 					String tousseName = tousseItem.getTousseName();
-					Integer amount = tousseItem.getAmount();
-					Integer sum = nameToAmount.get(tousseName);
+					Integer amount = null;
+					if(priorityRecyclingAmount && tousseItem.getRecyclingAmount() != null && tousseItem.getRecyclingAmount().intValue() > 0){
+						amount = tousseItem.getRecyclingAmount();
+					}else{
+						amount = tousseItem.getAmount();
+					}
 					if (amount != null && amount > 0){
+						Integer sum = nameToAmount.get(tousseName);
 						if (sum == null) {
 							nameToAmount.put(tousseName, amount);
 						} else {
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r28592 -r28692
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 28592)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 28692)
@@ -3577,7 +3577,7 @@
 	}
 	
 	/**
-	 * BJDXZLYY-4 科室申领中打印回收汇总单增加打印格式
+	 * 科室申领中打印回收汇总单增加打印格式
 	 * 根据勾选的申请单，打印物品的申请数量，按物品名称汇总打印
 	 * @param recyclingRecordIds 申请单id,例如1,2,3
 	 */
@@ -3590,8 +3590,10 @@
 				data = recyclingRecordManager.getTousseItemSummaryByInvoicePlanIds2(recyclingRecordIds);
 			}else if("printRecyclingInvoiceTotalConfig_GroupByDepart".equals(customPrintName)){
 				data = recyclingRecordManager.getTousseItemSummaryByInvoicePlanIdsGroupByDepart(recyclingRecordIds);
-			}else{
-				data = recyclingRecordManager.getTousseItemSummaryByInvoicePlanIds(recyclingRecordIds);
+			}else{//初始格式(BJDXZLYY-4,ZJJSRM-12的格式;其中ZJJSRM-12数量优先取回收数量)
+				//数量优先取值回收数量
+				boolean priorityRecyclingAmount = StrutsParamUtils.getBoolPraramValue("priorityRecyclingAmount", false);
+				data = recyclingRecordManager.getTousseItemSummaryByInvoicePlanIds(recyclingRecordIds,priorityRecyclingAmount);
 			}
 			StrutsResponseUtils.output(data);
 		}catch(Exception e){
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java
===================================================================
diff -u -r28546 -r28692
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 28546)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManager.java	(.../RecyclingRecordManager.java)	(revision 28692)
@@ -217,9 +217,10 @@
 	/**
 	 * 根据申请单ID获取申请物品汇总表
 	 * @param recyclingRecordIds
+	 * @param priorityRecyclingAmount true:数量优先取回收数量 false:数量取申请数量
 	 * @return
 	 */
-	public JSONObject getTousseItemSummaryByInvoicePlanIds(String recyclingRecordIds);
+	public JSONObject getTousseItemSummaryByInvoicePlanIds(String recyclingRecordIds, boolean priorityRecyclingAmount);
 	/**
 	 * 根据申请单ID获取申请物品汇总表(按器械包分组排序,相关jira编号FJSSSYY-5)
 	 * FJSSSYY-5 汇总单将同一名称的物品进行汇总，物品需要按照包定义中的【器械包分组】进行排序；