Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r16812 -r16994
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16812)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 16994)
@@ -13,6 +13,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
@@ -508,7 +509,23 @@
 		}
 		return jsonArray;
 	}
-
+	/**
+	 * 供应室配置转换为json数据。数组内容包含科室编码及科室名称
+	 * @param supplyRoomConfigs
+	 * @return
+	 */
+	private JSONArray toJsonArray(List<SupplyRoomConfig> supplyRoomConfigs){
+		JSONArray jsonArray = new JSONArray();
+		if(CollectionUtils.isNotEmpty(supplyRoomConfigs)){
+			for (SupplyRoomConfig config : supplyRoomConfigs) {
+				JSONObject temp = new JSONObject();
+				temp.put("departCode", config.getOrgUnitCoding());
+				temp.put("departName", config.getOrgUnitName());
+				jsonArray.add(temp);
+			}
+		}
+		return jsonArray;
+	}
 	@Deprecated
 	@Override
 	public boolean isSupplyRoomUser(LoginUserData user) {
@@ -654,4 +671,10 @@
 		String sql = "where po.orgUnitCoding = '" + orgUnitCoding + "' and po.supplyRoomType = " + type;
 		return (SupplyRoomConfig)objectDao.getBySql(SupplyRoomConfig.class.getSimpleName(), sql);
 	}
+
+	@Override
+	public JSONArray getAllApplyDepartment() {
+		List<SupplyRoomConfig> list = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_3);
+		return toJsonArray(list);
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r16812 -r16994
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 16812)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 16994)
@@ -154,4 +154,9 @@
 	 * @return
 	 */
 	public List<SupplyRoomConfig> getApplyDepartment(String spell, int pages,int countOfLI);
+	/**
+	 * 获取所有申请科室的数据
+	 * @return
+	 */
+	public JSONArray getAllApplyDepartment();
 }
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16833 -r16994
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16833)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16994)
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import net.sf.jasperreports.engine.util.JsonUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONNull;
@@ -3637,5 +3638,14 @@
 		ret.put("selectSterilizerGroup", b);
 		return ret.toString();
 	}
+	/**
+	 * 获取申请科室列表。
+	 * @param params
+	 * @return 返回科室供应室配置中，科室申领配置列表中的科室
+	 */
+	public String getApplyDepartment(JSONObject params){
+		JSONObject json = JSONUtil.buildJsonObject(true, supplyRoomConfigManager.getAllApplyDepartment());
+		return json.toString();
+	}
 	
 }