Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r23276 -r23280
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23276)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23280)
@@ -310,7 +310,7 @@
 			}
 			for (RecyclingApplication recyclingApplicationTemp : gatherRecyclingApplicationList) {
 				if(StringUtils.equals(InvoicePlan.GATHERSTATUS_YES, recyclingApplicationTemp.getGatherStatus())){
-					throw new RuntimeException("单号为"+ recyclingApplicationTemp.getSerialNumber() +"的申请单汇总状态为已汇总,请不要重复汇总");
+					throw new RuntimeException("单号为"+ recyclingApplicationTemp.getSerialNumber() +"的申请单汇总状态为"+ InvoicePlan.GATHERSTATUS_YES +",请不要重复汇总");
 				}
 			}
 			objectDao.excuteSQL("update " + InvoicePlan.class.getSimpleName() 
@@ -4863,6 +4863,7 @@
 					vo.setTousseDefinitionID(tousseDefinitionId);
 					vo.setTousseName(td.getName());
 					vo.setName(td.getName());
+					vo.setMaterials(tousseDefinitionManager.getMaterialsOfDisinfectionGoods(td).toString());
 					vo.setAmount(tousseItemMap.get(tousseDefinitionId));
 					vo.setTousseType(td.getTousseType());
 					vo.setDiposable(TousseItem.DIPOSABLE_NO);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r23276 -r23280
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 23276)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 23280)
@@ -38,6 +38,7 @@
 
 import com.beust.jcommander.ParameterException;
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.model.CssdServiceDepts;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
@@ -1629,13 +1630,31 @@
 			StrutsResponseUtils.output(false, "后台出错,请联系管理员");
 		}
 	}
+
+	/**
+	 * 获取当前登录科室的供应室服务临床科室配置
+	 */
+	public void getCssdServiceDeptsConfigOfCurrentOrg(){
+		JSONArray result = null;
+		try{
+			Collection<CssdServiceDepts> configList = 
+					orgUnitManager.getCssdsByApplyDepartAndType(AcegiHelper.getCurrentOrgUnitCode(), TousseDefinition.PACKAGE_TYPE_INSIDE);
+			if(CollectionUtils.isNotEmpty(configList)){
+				result = JSONArray.fromObject(configList);
+			}else{
+				result = new JSONArray();
+			}
+		}catch(Exception e){
+			e.printStackTrace();
+		}finally{
+			StrutsResponseUtils.output(result);
+		}
+	}
 	
 	public void getAllProject(){
 		String projectName = StrutsParamUtils.getPraramValue("spell", "");
-		List<ProjectDict> projList = null;//projectManager.getAllProject(projectName);
-//		String projectName = StrutsParamUtils.getPraramValue("spell", null);
-//		String userCode = StrutsParamUtils.getPraramValue("userCode", null);
-//		List<ProjectDict> projList = projectManager.getAllProject(userCode , projectName);
+		String userCode = StrutsParamUtils.getPraramValue("userCode", null);
+		List<ProjectDict> projList = null;//projectManager.getAllProject(userCode , projectName);
 		if(projList == null){
 			projList = new ArrayList<ProjectDict>();
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js
===================================================================
diff -u -r23276 -r23280
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js	(.../goodsApplicationViewVersion3.js)	(revision 23276)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js	(.../goodsApplicationViewVersion3.js)	(revision 23280)
@@ -5,11 +5,30 @@
         //取消隐藏
         Ext.get('desktop_normal').dom.style.display = "";
 
-        //申领器械包(惠福院区临床科室)
-        Ext.get('tousseApplication').addListener('click', function (e) {
-        	openApplication(tousseApplicationForm);
-        });
-        
+        //如果当前登录用户所属科室在供应室服务临床科室配置我物品类型为器械包中有是否需要回收为否的数据时,则该图标显示出来
+        Ext.Ajax.request({
+			url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!getCssdServiceDeptsConfigOfCurrentOrg.do',
+			params : {ids : ids},
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				if(result && result.length > 0){
+					for(var i = 0;i < result.length;i++){
+						var tousseItemObject = result[i];
+						if(needRecycling='否' && tousseType='器械包'){
+							Ext.get('tousseApplication').dom.style.display = "";
+							//申领器械包(惠福院区临床科室)
+							Ext.get('tousseApplication').addListener('click', function (e) {
+								openApplication(tousseApplicationForm);
+							});
+							return;
+						}
+					}
+				}
+			},
+			failure : function(response, options) {
+				showResult(response.responseText);
+			}
+		});
         //申领敷料
         Ext.get('tousseDressingApplication').addListener('click', function (e) {
         	var tousseGroups = '';
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp
===================================================================
diff -u -r23276 -r23280
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp	(.../goodsApplicationViewVersion3.jsp)	(revision 23276)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.jsp	(.../goodsApplicationViewVersion3.jsp)	(revision 23280)
@@ -52,7 +52,7 @@
 <body>
 <div id="desktop_normal" class="desktop" style="width:100%;height:100%;display: none;">
     <ul id="desktopPanel_normal" class="desktopPanel" style="display:block">
-    	<li id="tousseApplication" class="ui-state-default" title="申领器械包">
+    	<li id="tousseApplication" style="display:none" class="ui-state-default" title="申领器械包">
             <div class="imgDvi">
                 <p><span><img class="cursorPointer" width="86" height="86" src="${ctx}/themes/portalPage/img/tabs_tousse.png"></span></p>
             </div>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
===================================================================
diff -u -r23276 -r23280
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 23276)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 23280)
@@ -35,6 +35,9 @@
 	private String supplierName;
 
 	private Integer amount;// 申请或借物品的总数
+
+	//材料md5
+	private String materials;
 	
 	private Double price = 0d; // 物品单价
 	
@@ -432,6 +435,14 @@
 		this.expressInvoice = expressInvoice;
 	}
 
+	public String getMaterials() {
+		return materials;
+	}
+
+	public void setMaterials(String materials) {
+		this.materials = materials;
+	}
+
 	/**
 	 * 判断是否一次性物品
 	 * @return