Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r14274 -r14276 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 14274) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 14276) @@ -1129,7 +1129,6 @@ text:'待灭菌物品列表' }) }); - this.id = id; tousseItemCountJsonStore.removeAll(); ds.removeAll(); @@ -1213,7 +1212,10 @@ labelWidth: 85, valueField : 'sterilizerName', displayField : 'sterilizerName', - store : sterilizerJsonStore, + store : new Ext.data.SimpleStore({ + fields : [ 'sterilizerName' ], + url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?ownGroup=' + encodeURI(ownGroup) + }), triggerAction : 'all', mode : 'remote', listWidth:180, Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp =================================================================== diff -u -r14273 -r14276 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 14273) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp (.../sterilizationRecordView.jsp) (revision 14276) @@ -85,6 +85,7 @@ var orgUnitCoding = '${orgUnitCoding}'; +var ownGroup = '${param.ownGroup}'; var isQueryToday = false;//是否查询当天灭菌记录 if('${param.type }'){ @@ -99,7 +100,7 @@
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r14267 -r14276 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14267) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 14276) @@ -304,14 +304,17 @@ } public void getAllSterilizer() { - + String ownGroup = StrutsParamUtils.getPraramValue( + "ownGroup", ""); String departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); List