Index: ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js =================================================================== diff -u -r16769 -r16779 --- ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js (.../supplyRoomsUnfinishedWork.js) (revision 16769) +++ ssts-web/src/main/webapp/homepage/supplyRoomsUnfinishedWork.js (.../supplyRoomsUnfinishedWork.js) (revision 16779) @@ -72,6 +72,7 @@ packingStore.baseParams['tousseName'] = goodNmae; packingStore.baseParams['tousseType'] = tousseType; + packingStore.baseParams['department'] = department; packingStore.load({params:{start: 0, limit: 10}}); reviewStore.baseParams['tousseName'] = goodNmae; Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java =================================================================== diff -u -r16778 -r16779 --- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 16778) +++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java (.../SupplyRoomControlManagerImpl.java) (revision 16779) @@ -547,6 +547,9 @@ if(StringUtils.isNotBlank(tousseName)){ sql += " and po.tousseDefinition.name = '"+tousseName+"'"; } + if(StringUtils.isNotBlank(departCoding)){ + sql += " and po.department like '%"+departCoding+"%'"; + } sql += " and po.orgUnitCoding = '" + AcegiHelper.getLoginUser()