Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r17295 -r17356 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 17295) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 17356) @@ -1,6 +1,7 @@ package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service; import java.io.File; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; @@ -9,12 +10,14 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.CssdServiceDepts; @@ -673,8 +676,17 @@ } @Override - public JSONArray getAllApplyDepartment() { + public JSONArray getAllApplyDepartment(String departCodings) { List list = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_3); + if(CollectionUtils.isNotEmpty(list) && StringTools.isNotBlank(departCodings)){ + String[] departCodes = departCodings.split(";"); + + List ret = list.stream().filter( + p->ArrayUtils.contains(departCodes, p.getOrgUnitCoding()) + && StringTools.isNotBlank(p.getOrgUnitCoding()) + ).collect(Collectors.toList()); + return toJsonArray(ret); + } return toJsonArray(list); } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r16994 -r17356 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 16994) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 17356) @@ -156,7 +156,8 @@ public List getApplyDepartment(String spell, int pages,int countOfLI); /** * 获取所有申请科室的数据 + * @param departCodings 科室分组中的科室编码,用;分隔 * @return */ - public JSONArray getAllApplyDepartment(); + public JSONArray getAllApplyDepartment(String departCodings); } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r17347 -r17356 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17347) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 17356) @@ -3667,7 +3667,8 @@ * @return 返回科室供应室配置中,科室申领配置列表中的科室 */ public String getApplyDepartment(JSONObject params){ - JSONObject json = JSONUtil.buildJsonObject(true, supplyRoomConfigManager.getAllApplyDepartment()); + String departCodings = params.optString("departCodings"); + JSONObject json = JSONUtil.buildJsonObject(true, supplyRoomConfigManager.getAllApplyDepartment(departCodings)); return json.toString(); }