Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js =================================================================== diff -u -r33390 -r33499 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 33390) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 33499) @@ -655,7 +655,7 @@ showResult("请选择供应室"); return false; } - setNeedStatisticsTousse(model, code, null); + setNeedStatisticsTousse(model, code, null, 'id'); } }] }); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js =================================================================== diff -u -r33384 -r33499 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js (.../setGoodsOption.js) (revision 33384) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js (.../setGoodsOption.js) (revision 33499) @@ -52,8 +52,8 @@ * @param code 科室编码 * @param tousseTypes 在指定的器械包类型集合(其中用分号分隔)进行选择,如果不指定则为:所有器械包类型 */ -function setNeedStatisticsTousse(model, code, tousseTypes) { - setGoodsToGoodsOption(model, code, 'tousse', tousseTypes); +function setNeedStatisticsTousse(model, code, tousseTypes, paramsType) { + setGoodsToGoodsOption(model, code, 'tousse', tousseTypes, paramsType); } /** @@ -70,14 +70,18 @@ * @param model * @param code */ -function saveSelect(model, code){ +function saveSelect(model, code, paramsType){ var ids = ""; for ( var i = 0; i < apparatusInfuTypeStore.getCount(); i++) { var record = apparatusInfuTypeStore.getAt(i); if (ids.length > 0) { ids += ';'; - } - ids += record.get('id'); + } + if(paramsType == 'id'){ + ids += record.get('id'); + }else { + ids += record.get('name'); + } } JasperreportsTableManager.setTousseWorkLoadOption(model,code,ids,function(result){ @@ -153,7 +157,7 @@ * @param type * @param tousseTypes */ -function setGoodsToGoodsOption(model, code, type, tousseTypes){ +function setGoodsToGoodsOption(model, code, type, tousseTypes, paramsType){ var isTousse = ('tousse' == type); //物品类型是否为器械包 apparatusInfuTypeStore = new top.Ext.data.Store({ @@ -372,7 +376,7 @@ id : 'saveBtn', text : '确定', handler : function(){ - saveSelect(model,code); + saveSelect(model,code,paramsType); } },{ id : 'cancleBtn',