Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r17896 -r17968
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 17896)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 17968)
@@ -2440,6 +2440,10 @@
                	 		var item = application.applicationItems[i];
                			if(item.diposable == '否' && item.isRecycling != '否' && item.tousseType != '敷料包' && item.tousseType != '自制物品'){
                				var recycleAmount = item.prepareRecycleAmount;
+               				if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1 && recycleAmount === 0){
+               					//配置为预回收为0的物品需要隐藏,则不显示
+               					continue;
+               				}
                				if(recycleAmount == null){
                					recycleAmount = item.amount;
                				}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r17753 -r17968
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 17753)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 17968)
@@ -103,5 +103,7 @@
   //使用记录合并转换申请单规则(根据手术间号),默认为不合并.可以为depart,operationRoom等
   useRecordConvertRecyclingApplicationMergeRegular : 'operationRoom',
   //使用记录转申请单合并后的备注信息(如手术台数:** 器械数量:**)
-  useRecordMergeConvertRecyclingApplicationRemark : '手术台数:@operationAmount;器械包数量:@tousseAmount'
+  useRecordMergeConvertRecyclingApplicationRemark : '手术台数:@operationAmount;器械包数量:@tousseAmount',
+  //已经预回收的，回收数量为0的物品，在回收的时候是否隐藏.为true则隐藏,为false则不隐藏,默认为false
+  hideZeroPrerecycleAmountTousseItem:true
 }
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
===================================================================
diff -u -r17512 -r17968
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 17512)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 17968)
@@ -45,6 +45,11 @@
 	private List<TousseItemVo> applicationItems;// 申请的物品
 	
 	public String tousseBarcodes;
+	
+	/**
+	 * 是否已预回收
+	 */
+	private Integer isPrepareRecycled = 0;
 
 	public Long getId() {
 		return id;
@@ -189,5 +194,13 @@
 	public void setTousseBarcodes(String tousseBarcodes) {
 		this.tousseBarcodes = tousseBarcodes;
 	}
+
+	public Integer getIsPrepareRecycled() {
+		return isPrepareRecycled;
+	}
+
+	public void setIsPrepareRecycled(Integer isPrepareRecycled) {
+		this.isPrepareRecycled = isPrepareRecycled;
+	}
 	
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r17512 -r17968
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 17512)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 17968)
@@ -313,6 +313,7 @@
 			vo.setType(invoicePlan.getType());
 			vo.setRemark(invoicePlan.getRemark());
 			vo.setTousseBarcodes(invoicePlan.getTousseBarcodes());
+			vo.setIsPrepareRecycled(invoicePlan.getIsPrepareRecycled());
 			if(invoicePlan.getSubmitTime() != null){
 				vo.setSubmitTime(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(invoicePlan.getSubmitTime()));
 			}