Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r22068 -r22108
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 22068)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 22108)
@@ -157,10 +157,7 @@
 						+ "' and (po.supplyRoomType = "
 						+ SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM
 						+ " or po.supplyRoomType ="
-						+ SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM
-						+ " or po.supplyRoomType ="
-						+ SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY 
-						+ ")");
+						+ SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM + ")");
 	}
 	
 	@Override
@@ -849,5 +846,23 @@
 		return supplyRoomConfig != null;
 	}
 
+	@Override
+	public int getExpensivegoodsRoomTypeByOrgUnitCoding(String orgUnitCoding) {
+		int supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_SYSTEM_CONFIG; 
+		
+		SupplyRoomConfig supplyRoomConfig = getExpensivegoodsConfigByOrgUnitCoding(orgUnitCoding);
+		if(supplyRoomConfig != null && supplyRoomConfig.getSupplyRoomType() != null){
+			supplyRoomType = supplyRoomConfig.getSupplyRoomType();
+		}
+		return supplyRoomType;
+	}
 
+	private SupplyRoomConfig getExpensivegoodsConfigByOrgUnitCoding(
+			String orgUnitCoding) {
+		return (SupplyRoomConfig) objectDao.getBySql(
+				SupplyRoomConfig.class.getSimpleName(),
+				"where po.orgUnitCoding = '" + orgUnitCoding
+						+ "' and (po.supplyRoomType = "
+						+ SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY + ")");
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java
===================================================================
diff -u -r22061 -r22108
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 22061)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java	(.../SupplyRoomConfigManager.java)	(revision 22108)
@@ -229,4 +229,10 @@
 	 * @return
 	 */
 	public boolean isRecyclingApplicationNotInvoiceDepart(String departCoding);
+	/**
+	 * 获取高值耗材配置供应室类型
+     * @param orgUnitCoding
+	 * @return
+	 */
+	public int getExpensivegoodsRoomTypeByOrgUnitCoding(String orgUnitCoding);
 }
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r22068 -r22108
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 22068)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 22108)
@@ -240,6 +240,8 @@
 		String orgUnitCoding = AcegiHelper.getLoginUser()
 				.getOrgUnitCodingFromSupplyRoomConfig();
 		int roomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
+		//获取高值耗材供应室类型
+		int expensivegoodsRoomType = supplyRoomConfigManager.getExpensivegoodsRoomTypeByOrgUnitCoding(orgUnitCoding);
 		
 		if (diposablegoodsQuery) {
 			// 即将过期的一次性物品
@@ -352,7 +354,7 @@
 		boolean certificationQuery = operationManager.isUserHasOperation(
 				SSTS_SYSTEMWARNING_REGISTRATIONCERTIFICATION, userOperationIds);
 		if (certificationQuery) {
-			int certificationAmount = getWarningCertifiCatioCount(roomType);
+			int certificationAmount = getWarningCertifiCatioCount(expensivegoodsRoomType);
 			if (certificationAmount > 0) {
 				SystemWarningItemVO vo = new SystemWarningItemVO();
 				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_REGISTRATIONCERTIFICATION);
@@ -365,7 +367,7 @@
 		boolean expensiveGoodsQuery = operationManager.isUserHasOperation(
 				SSTS_SYSTEMWARNING_REGISTRATIONCERTIFICATION, userOperationIds);
 		if (expensiveGoodsQuery) {
-			int certificationAmount = getWarningExpensiveGoodsCount(roomType);
+			int certificationAmount = getWarningExpensiveGoodsCount(expensivegoodsRoomType);
 			if (certificationAmount > 0) {
 				SystemWarningItemVO vo = new SystemWarningItemVO();
 				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_EXPENSIVEGOODS_MIN_STOCK);
@@ -376,7 +378,7 @@
 		
 		// 高值耗材库存最大提示
 		if (expensiveGoodsQuery) {
-			int certificationAmount = getWarningMaxExpensiveGoodsCount(roomType);
+			int certificationAmount = getWarningMaxExpensiveGoodsCount(expensivegoodsRoomType);
 			if (certificationAmount > 0) {
 				SystemWarningItemVO vo = new SystemWarningItemVO();
 				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_EXPENSIVEGOODS_MAX_STOCK);