Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r32886 -r32890
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 32886)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 32890)
@@ -426,9 +426,20 @@
 		
 		//4.1 材料最小库存预警
 		boolean hasThisOperation = operationManager.isUserHasOperation(SSTS_SYSTEMWARNING_MATERIAL_MIN_STOCK, userOperationIds);
-		boolean enableTousseMaterialStorageAlertWindow =
-				CssdUtils.getSystemSetConfigByNameBool("enableTousseMaterialStorageAlertWindow");
-		if((hasThisOperation || enableTousseMaterialStorageAlertWindow)
+		//CDSLQYQYYY-97配置项为true时：预警信息类型为"小于最小库存的器械材料"，并且通过配置项控制是否预警；
+		//配置项不配置时：预警信息类型为"小于最小库存材料"，并且通过权限控制是否预警；
+		//配置项为false时：不进行"小于最小库存材料"预警；
+		boolean alertMinStorage = false;
+		String enableTousseMaterialStorageAlertWindowStr = 
+				CssdUtils.getSystemSetConfigByName("enableTousseMaterialStorageAlertWindow");
+		boolean enableTousseMaterialStorageAlertWindow = StringUtils.equals("true", enableTousseMaterialStorageAlertWindowStr);
+		if(enableTousseMaterialStorageAlertWindowStr == null){
+			//配置项不配置时：预警信息类型为"小于最小库存材料"，并且通过权限控制是否预警；
+			alertMinStorage = hasThisOperation;
+		}else{
+			alertMinStorage = StringUtils.equals("true", enableTousseMaterialStorageAlertWindowStr);
+		}
+		if(alertMinStorage
 				&& (CollectionUtils.isEmpty(warningTypeList) 
 				|| CollectionUtils.isNotEmpty(warningTypeList) 
 				&& warningTypeList.contains(SystemWarningItemVO.WARNING_TYPE_MATERIAL_MIN_STOCK))){