Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r30076 -r31092 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 30076) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 31092) @@ -572,7 +572,7 @@ showResult(result.cause); } }); - }else if(sstsConfig.printRecyclingDetailWithDepartGroup){ + }else if(projectName == 'gdsy' && sstsConfig.printRecyclingDetailWithDepartGroup){ //按科室分组打印回收清单 Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!handleResultSetByRecyclingDetailPrintConfig.do', @@ -594,6 +594,28 @@ showResult(result.cause); } }); + }else if(sstsConfig.printRecyclingDetailWithDepartGroup){ + //按科室分组打印回收清单 + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printRecyclingDetailWithDepartmentGroup.do', + params : { + startDateTime : startDateTime, + endDateTime : endDateTime, + handlerDepartCoding : handlerDepartCoding + }, + success : function(response, options) { + var obj = JSON.parse(response.responseText); + if(obj.success){ + printRecyclingDetailWithDepartgroup(printType,startDateTime,endDateTime,obj.printUser,obj); + }else{ + showResult(obj.message); + } + }, + failure : function(response, options) { + var result = Ext.decode(response.responseText); + showResult(result.cause); + } + }); } // 根据项目的JSON配置进行打印 else {