Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r23216 -r23578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 23216)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 23578)
@@ -165,19 +165,14 @@
 	public boolean isFirstSupplyRoomOrgUnit(String orgUnitCoding);
 	public boolean isFirstOrSecondSupplyRoomOrgUnit(String orgUnitCoding);
 	public JSONArray getCssdList();
+
 	/**
-	 * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室
-	 * @param user 登录用户信息
-	 * @return
-	 */
-	public boolean isSupplyRoomUser(LoginUserData user);
-	/**
 	 * 判断登录用户是否是供应室用户,包括一级供应室和二级供应室，优化速度，一条查询sql判断，不用查询几次<br/>
 	 * 此方法是isSupplyRoomUser方法的升级版本
 	 * @param user 登录用户信息
 	 * @return
 	 */
-	public boolean isSupplyRoomUser2(LoginUserData user);
+	public boolean isSupplyRoomUser(LoginUserData user);
 	/**
 	 * 判断当前登录用户是否是供应室用户,包括一级供应室和二级供应室
 	 * @return
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r23216 -r23578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 23216)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 23578)
@@ -641,27 +641,6 @@
 		}
 		return jsonArray;
 	}
-	@Deprecated
-	@Override
-	public boolean isSupplyRoomUser(LoginUserData user) {
-		if(user != null){
-			SupplyRoomConfig firstSupplyRoom = getFirstSupplyRoomConfig();
-			if (firstSupplyRoom != null) {
-				if(StringTools.equals(firstSupplyRoom.getOrgUnitCoding(), user.getCurrentOrgUnitCode())){
-					return true;
-				}
-			}
-			List<SupplyRoomConfig> secondSupplyRooms = getSupplyRoomList(SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM);
-			if (secondSupplyRooms != null) {
-				for (SupplyRoomConfig config : secondSupplyRooms) {
-					if(StringTools.equals(config.getOrgUnitCoding(), user.getCurrentOrgUnitCode())){
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
 	
 	@Override
 	public boolean isExpensiveGoodsSupplyRoomUser() {
@@ -689,7 +668,7 @@
 	 * @return
 	 */
 	@Override
-	public boolean isSupplyRoomUser2(LoginUserData user) {
+	public boolean isSupplyRoomUser(LoginUserData user) {
 		if(user == null){
 			return false;
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r23447 -r23578
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 23447)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 23578)
@@ -42,7 +42,7 @@
     request.setAttribute("userName",userData.getUserFullName());  //用户的全名
     request.setAttribute("userCode",userData.getUserName());	//用户的登录名
     request.setAttribute("isFirstSupplyRoomUser",supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
-    request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser2(userData));
+    request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser(userData));
     boolean isBeApplication = userData.isBeApplication();
     request.setAttribute("isBeApplication",isBeApplication);
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r23465 -r23578
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 23465)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 23578)
@@ -262,7 +262,7 @@
 		//5、根据时间过滤（1、时间不为空 2、如果非供应室用户，满足1或2则需要按时间过滤，否则不需要）
 		String startTime = sqlWhereParamMap.get("startTime");
 		String endTime = sqlWhereParamMap.get("endTime");
-		if ((StringTools.isNotBlank(startTime) && StringTools.isNotBlank(endTime)) || !supplyRoomConfigManager.isSupplyRoomUser2(AcegiHelper.getLoginUser())) {
+		if ((StringTools.isNotBlank(startTime) && StringTools.isNotBlank(endTime)) || !supplyRoomConfigManager.isSupplyRoomUser(AcegiHelper.getLoginUser())) {
 			reAppTableSqlHandler.createTimeFilterSql(sqlWhereParamMap, sqlBuilder);
 		}
 		return gridManager.renderGrid(parameterMap,
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
===================================================================
diff -u -r22086 -r23578
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 22086)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 23578)
@@ -27,7 +27,7 @@
     LoginUserData userData = AcegiHelper.getLoginUser();
     request.setAttribute("userName",userData.getUserFullName());
     request.setAttribute("currentOrgUnitName", userData.getCurrentOrgUnitName());
-    request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser2(userData));
+    request.setAttribute("isSupplyRoomUser",supplyRoomConfigManager.isSupplyRoomUser(userData));
 %>
 <html>
 <head>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r21472 -r23578
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 21472)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 23578)
@@ -28,7 +28,7 @@
     	request.setAttribute("isPriceReadOnly", true);
     } */
     //只要是供应室用户,不管是一级供应室还是二级供应室都能修改价格
-	if(supplyRoomConfigManager.isSupplyRoomUser2(userData)){
+	if(supplyRoomConfigManager.isSupplyRoomUser(userData)){
     	request.setAttribute("isPriceReadOnly", false);
     }else{
     	request.setAttribute("isPriceReadOnly", true);