Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java =================================================================== diff -u -r23276 -r23282 --- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 23276) +++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java (.../OrgUnitManagerImpl.java) (revision 23282) @@ -1258,7 +1258,7 @@ CssdServiceDepts.TOUSSETYPE_DIPOSABLEGOODS.equals(type) ? type : CssdServiceDepts.TOUSSETYPE_TOUSSE); } } - String querySql = "select defaultHandleDepart,cssdOrgUnitCode,cssdOrgUnitName from " + CssdServiceDepts.class.getSimpleName() + " po " + sql; + String querySql = "select defaultHandleDepart,cssdOrgUnitCode,cssdOrgUnitName,clinicOrgUnitCode,clinicOrgUnitName,needRecycling,tousseType from " + CssdServiceDepts.class.getSimpleName() + " po " + sql; Map map = new HashMap(); ResultSet rs = null; try{ @@ -1274,6 +1274,10 @@ cssdServiceDepts = new CssdServiceDepts(); cssdServiceDepts.setCssdOrgUnitCode(cssdOrgUnitCode); cssdServiceDepts.setCssdOrgUnitName(cssdOrgUnitName); + cssdServiceDepts.setClinicOrgUnitCode(rs.getString("clinicOrgUnitCode")); + cssdServiceDepts.setClinicOrgUnitName(rs.getString("clinicOrgUnitName")); + cssdServiceDepts.setNeedRecycling(rs.getString("needRecycling")); + cssdServiceDepts.setTousseType(rs.getString("tousseType")); } if (Constants.STR_YES.equals(defaultHandleDepart)) { cssdServiceDepts.setDefaultHandleDepart(defaultHandleDepart); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js =================================================================== diff -u -r23280 -r23282 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js (.../goodsApplicationViewVersion3.js) (revision 23280) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion3.js (.../goodsApplicationViewVersion3.js) (revision 23282) @@ -8,13 +8,13 @@ //如果当前登录用户所属科室在供应室服务临床科室配置我物品类型为器械包中有是否需要回收为否的数据时,则该图标显示出来 Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getCssdServiceDeptsConfigOfCurrentOrg.do', - params : {ids : ids}, + params : {}, 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='器械包'){ + if(tousseItemObject.needRecycling == '否' && tousseItemObject.tousseType == '器械包'){ Ext.get('tousseApplication').dom.style.display = ""; //申领器械包(惠福院区临床科室) Ext.get('tousseApplication').addListener('click', function (e) {