Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r15859 -r15897
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15859)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15897)
@@ -1671,7 +1671,30 @@
 		return new JSONStringer().object().key("success").value(true)
 				.endObject().toString();
 	}
-
+	/**
+	 * 获取config.js中的配置信息
+	 * @param params 包含需要查询的属性名称的集合,多个属性以;分隔
+	 * @return 返回值的data属性记录了查询的各个属性的值,以json格式,data是一个json对象,包含查询的各个属性.
+	 * 属性的值为字符串类型。如果对应的属性没有定义,则返回json对象中也没有对应的属性
+	 */
+	public String getConfig(JSONObject params){
+		String properties = params.optString("properties");
+		if(StringTools.isBlank(properties)){
+			return JSONUtil.buildJsonObject(false, "缺少属性,获取参数失败").toString();
+		}
+		String[] props = properties.split(";");
+		if(ArrayUtils.isEmpty(props)){
+			return JSONUtil.buildJsonObject(false, "缺少属性,获取参数失败").toString();
+		}
+		JSONObject data = new JSONObject();
+		for(String prop : props){
+			String v = CssdUtils.getSystemSetConfigByName(prop);
+			if(v != null){
+				data.put(prop, v);
+			}
+		}
+		return JSONUtil.buildJsonObject(true, data).toString();
+	}
 	public String washRecordPositionConfiged(JSONObject params){
 		boolean haveRinserPosition = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("haveRinserPosition"),"false"));
 		boolean wrRecordScanPosition = Boolean.parseBoolean(StringTools.defaultIfEmpty(CssdUtils.getSystemSetConfigByName("wrRecordScanPosition"),"false"));
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java
===================================================================
diff -u -r15634 -r15897
--- ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java	(.../DaoUserDetailSSTSImpl.java)	(revision 15634)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/security/userdetails/DaoUserDetailSSTSImpl.java	(.../DaoUserDetailSSTSImpl.java)	(revision 15897)
@@ -191,7 +191,6 @@
 			}
 		}
 		
-		
 		// 查找用户拥有的角色
 		userVO.setRoleIdsOfUser(currentLoginedUser
 				.getRoleIdNotKeyIds());
@@ -210,6 +209,8 @@
 		String currentOrgUnitCode = userManager.getCurrentOrgUnitCode(currentLoginedUser);
 		
 		userVO.setCurrentOrgUnitCode(currentOrgUnitCode);
+		
+		userVO.setFirstSupplyRoomUser(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
 
 		THTreeNode tHTreeNode2 = orgUnitManager
 				.getOrgUnitByCode(currentOrgUnitCode);
Index: forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java
===================================================================
diff -u -r15864 -r15897
--- forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java	(.../LoginUserData.java)	(revision 15864)
+++ forgon-core/src/main/java/com/forgon/directory/vo/LoginUserData.java	(.../LoginUserData.java)	(revision 15897)
@@ -105,7 +105,19 @@
 	 * 客户端程序版本
 	 */
 	private String clientVersion;
+	/**
+	 * 是否一级供应室用户,true为一级供应室用户,false为二级供应室用户
+	 */
+	private Boolean firstSupplyRoomUser;
 
+	public Boolean getFirstSupplyRoomUser() {
+		return firstSupplyRoomUser;
+	}
+
+	public void setFirstSupplyRoomUser(Boolean firstSupplyRoomUser) {
+		this.firstSupplyRoomUser = firstSupplyRoomUser;
+	}
+
 	public String getClientType() {
 		return clientType;
 	}