Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r22061 -r22068
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 22061)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 22068)
@@ -157,7 +157,10 @@
 						+ "' and (po.supplyRoomType = "
 						+ SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM
 						+ " or po.supplyRoomType ="
-						+ SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM + ")");
+						+ SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM
+						+ " or po.supplyRoomType ="
+						+ SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY 
+						+ ")");
 	}
 	
 	@Override
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r21930 -r22068
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 21930)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 22068)
@@ -365,7 +365,7 @@
 		boolean expensiveGoodsQuery = operationManager.isUserHasOperation(
 				SSTS_SYSTEMWARNING_REGISTRATIONCERTIFICATION, userOperationIds);
 		if (expensiveGoodsQuery) {
-			int certificationAmount = getWarningExpensiveGoodsCount(orgUnitCoding);
+			int certificationAmount = getWarningExpensiveGoodsCount(roomType);
 			if (certificationAmount > 0) {
 				SystemWarningItemVO vo = new SystemWarningItemVO();
 				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_EXPENSIVEGOODS_MIN_STOCK);
@@ -376,7 +376,7 @@
 		
 		// 高值耗材库存最大提示
 		if (expensiveGoodsQuery) {
-			int certificationAmount = getWarningMaxExpensiveGoodsCount(orgUnitCoding);
+			int certificationAmount = getWarningMaxExpensiveGoodsCount(roomType);
 			if (certificationAmount > 0) {
 				SystemWarningItemVO vo = new SystemWarningItemVO();
 				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_EXPENSIVEGOODS_MAX_STOCK);
@@ -443,8 +443,8 @@
 	 * @return
 	 */
 	private int getWarningCertifiCatioCount(int supplyRoomType) {
-		// 只有一级供应室才能看到
-		if (supplyRoomType == SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM) {
+		// 只有高值耗材处理科室才能看到
+		if (supplyRoomType == SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY) {
 			String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
 			String sql = " where po.validityTime > "
 					+ dateQueryAdapter.dateAdapter(date)
@@ -463,13 +463,9 @@
 	 * @return
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private int getWarningExpensiveGoodsCount(String orgUnitCoding) {
-
-		boolean isRelativeDeparment = supplyRoomConfigManager
-				.isCssdTraceabilitySystemRelativeDepartment(orgUnitCoding);
-
-		// 是否追溯系统相关部门
-		if (isRelativeDeparment) {
+	private int getWarningExpensiveGoodsCount(int supplyRoomType) {
+		// 只有高值耗材处理科室才能看到
+		if (supplyRoomType == SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY) {
 			String sql = "where 1=1 and " + SqlUtils.getNonStringFieldInCollectionsPredicate("warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
 			List<ExpensiveGoodsStock> expensiveGoodsStock = (List<ExpensiveGoodsStock>) objectDao.findBySql(ExpensiveGoodsStock.class.getSimpleName(),sql);
 			int goodsAmount = 0;
@@ -498,12 +494,9 @@
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	private int getWarningMaxExpensiveGoodsCount(String orgUnitCoding) {
-		boolean isRelativeDeparment = supplyRoomConfigManager
-				.isCssdTraceabilitySystemRelativeDepartment(orgUnitCoding);
-
-		// 是否追溯系统相关部门
-		if (isRelativeDeparment) {
+	private int getWarningMaxExpensiveGoodsCount(int supplyRoomType) {
+		// 只有高值耗材处理科室才能看到
+	    if (supplyRoomType == SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY) {
 			String sql = "where 1=1 and " + SqlUtils.getNonStringFieldInCollectionsPredicate("warehouseID", wareHouseManager.getCurrentUserOrgUnitWarehouseIds());
 			List<ExpensiveGoodsStock> expensiveGoodsStock = (List<ExpensiveGoodsStock>) objectDao.findBySql(ExpensiveGoodsStock.class.getSimpleName(),sql);
 			if(expensiveGoodsStock.size()>0){