Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r13390 -r13399
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13390)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13399)
@@ -2033,11 +2033,12 @@
 
 	private void importHttpOptionData(HSSFWorkbook wb, Map<String, String> msg,
 			AtomicInteger totalCount) {
-		String[] httpOptionNames = { "材料类型配置", "任务组配置", "包装类型配置", "一次性物品类型配置" };
+		String[] httpOptionNames = { "材料类型配置", "任务组配置", "包装类型配置", "一次性物品类型配置", "清洗分类类型配置" };
 		String[] httpOptionListIds = { HttpOption.SYSTEMSETTING_MATERIALTYPE,
 				HttpOption.SYSTENSETTING_TASKGROUP,
 				HttpOption.SYSTEMSETTING_PACKAGING_TYPE,
-				HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE };
+				HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE,
+				HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY };
 		int lenght = httpOptionNames.length;
 		for (int i = 0; i < lenght; i++) {
 			HSSFSheet httpOptionsheet = wb.getSheet(httpOptionNames[i]);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java
===================================================================
diff -u -r13300 -r13399
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 13300)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialdefinition/MaterialDefinition.java	(.../MaterialDefinition.java)	(revision 13399)
@@ -88,6 +88,10 @@
 		ColumnNameAndPoPropertyNameMap.put("折旧率", "depreciation");
 		ColumnNameAndPoPropertyNameMap.put("单位", "unit");
 		ColumnNameAndPoPropertyNameMap.put("单一器械跟踪", "isTraceble");
+		ColumnNameAndPoPropertyNameMap.put("是否需要月盘点", "isMonthCheck");
+		ColumnNameAndPoPropertyNameMap.put("消毒价格", "disinfectionPrice");
+		ColumnNameAndPoPropertyNameMap.put("灭菌价格", "sterilizationPrice");
+		ColumnNameAndPoPropertyNameMap.put("清洗分类类型", "washClassifyType");
 	}
 
 	@Id
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r12331 -r13399
Binary files differ
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r13300 -r13399
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 13300)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 13399)
@@ -556,12 +556,13 @@
 						+ HttpOption.SYSTEMSETTING_MATERIALTYPE + "'",
 				columnNameAndPoPropertyNameMap);
 
-		// columnNameAndPoPropertyNameMap.clear();
-		// columnNameAndPoPropertyNameMap.put("任务组名称", "optionText");
-		// commonExportManager.printContentWithParams(wb.getSheet("任务组配置"),
-		// clazzHttpOption, "where po.optionListId = '"
-		// + HttpOption.SYSTENSETTING_TASKGROUP + "'",
-		// columnNameAndPoPropertyNameMap);
+		 columnNameAndPoPropertyNameMap.clear();
+		 columnNameAndPoPropertyNameMap.put("分类类型名称", "optionText");
+		 commonExportManager.printContentWithParams(wb.getSheet("清洗分类类型配置"),
+		 clazzHttpOption, "where po.optionListId = '"
+		 + HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY + "'",
+		 columnNameAndPoPropertyNameMap);
+		 
 		columnNameAndPoPropertyNameMap.clear();
 		columnNameAndPoPropertyNameMap.put("包装类型名称", "optionText");
 		commonExportManager.printContentWithParams(wb.getSheet("包装类型配置"),