Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r24484 -r26204
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 24484)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 26204)
@@ -25,6 +25,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.certificate.service.CertificateManager;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager;
+import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
@@ -38,6 +39,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Certificate;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.systemsetting.model.HttpOption;
 import com.forgon.systemsetting.service.HttpOptionManager;
@@ -68,6 +70,8 @@
 	
 	private CertificateManager certificateManager;
 	
+	private SupplyRoomConfigManager supplyRoomConfigManager;
+	
 	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
 		this.dateQueryAdapter = dateQueryAdapter;
 	}
@@ -106,6 +110,11 @@
 		this.certificateManager = certificateManager;
 	}
 
+	public void setSupplyRoomConfigManager(
+			SupplyRoomConfigManager supplyRoomConfigManager) {
+		this.supplyRoomConfigManager = supplyRoomConfigManager;
+	}
+
 	/**
 	 * 查找物品库存
 	 * @param parameterMap
@@ -266,9 +275,16 @@
 		String type = sqlWhereParamMap.get("type");
 		String sql = "where 1=1 and po.storage > 0";
 
+		// 默认告警日期为30天
+		Integer disposableGoodsWarningDate = 30;
+		//如果科室供应室配置有配置一次性物品告警天数,则用科室供应室配置的值
+		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+		if(supplyRoomConfig != null && supplyRoomConfig.getDisposableGoodsWarningDate() != null){
+			disposableGoodsWarningDate = supplyRoomConfig.getDisposableGoodsWarningDate();
+		}
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
-		calendar.add(Calendar.DAY_OF_YEAR, 30);// 默认告警日期为30天
+		calendar.add(Calendar.DAY_OF_YEAR, disposableGoodsWarningDate);// 默认告警日期为30天
 		String warningDate = new SimpleDateFormat("yyyy-MM-dd").format(calendar
 				.getTime());
 		String currentDate = new SimpleDateFormat("yyyy-MM-dd")
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r25459 -r26204
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 25459)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 26204)
@@ -119,12 +119,19 @@
 	 */
 	@SuppressWarnings({ "static-access"})
 	private int getWarningDiposableGoods(int supplyRoomType) {
+		// 默认告警日期为30天
+		Integer disposableGoodsWarningDate = 30;
+		//如果科室供应室配置有配置一次性物品告警天数,则用科室供应室配置的值
+		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+		if(supplyRoomConfig != null && supplyRoomConfig.getDisposableGoodsWarningDate() != null){
+			disposableGoodsWarningDate = supplyRoomConfig.getDisposableGoodsWarningDate();
+		}
 		Calendar calendar = Calendar.getInstance();
 		
 		Date today = new Date();
 		
 		calendar.setTime(today);
-		calendar.add(calendar.DAY_OF_YEAR, 30);// 默认告警日期为30天
+		calendar.add(calendar.DAY_OF_YEAR, disposableGoodsWarningDate);
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		
 		String currentDate = simpleDateFormat.format(today);