Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r14519 -r14529
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14519)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 14529)
@@ -79,6 +79,7 @@
 import com.forgon.tools.GB2WB;
 import com.forgon.tools.excel.ParerUtils;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.string.StringTools;
 
 /**
  * 
@@ -1242,6 +1243,9 @@
 				materialDefinition.setDisinfectionPrice(disinfectorPrice);
 				materialDefinition.setSterilizationPrice(sterilePrice);
 				materialDefinition.setWashClassifyType(washClassifyType);
+				materialDefinition.setNotice(notice);
+				materialDefinition.setWashQualityCheckPoint(washQualityCheckPoint);
+				materialDefinition.setFunctionCheck(functionCheck);
 			}else {
 				// 更新数据 如果导入项为空，不做数据库里面的值.
 				if( maxStorage != null){
@@ -1277,10 +1281,16 @@
 				if( StringUtils.isNotBlank(washClassifyType)){
 					materialDefinition.setWashClassifyType(washClassifyType);
 				}
+				if(StringUtils.isNotBlank(notice)){
+					materialDefinition.setNotice(notice);
+				}
+				if(StringUtils.isNotBlank(washQualityCheckPoint)){
+					materialDefinition.setWashQualityCheckPoint(washQualityCheckPoint);
+				}
+				if(StringUtils.isNotBlank(functionCheck)){
+					materialDefinition.setFunctionCheck(functionCheck);
+				}
 			}
-			materialDefinition.setNotice(notice);
-			materialDefinition.setWashQualityCheckPoint(washQualityCheckPoint);
-			materialDefinition.setFunctionCheck(functionCheck);
 			totalCount = saveOrUpdateAndClearCache(totalCount,
 					materialDefinition);
 			successCount++;
@@ -1376,6 +1386,7 @@
 			int isCustomPackIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "自定义装配");
 			int isQuickRecycleIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "快速回收");
 			int isPrintOrgIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "打印科室");
+			int noteIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "配包注意事项");
 			for (int i = 1; i <= lastRowNum; i++) {
 				HSSFRow row = tousseSheet.getRow(i);
 				int currentRowNum = i + 1;
@@ -1747,6 +1758,12 @@
 					}
 					tousseDefinition.setIsPrintOrg(isPrintOrg);
 					
+					//配包注意事项
+					String note = StringTools.defaultString(ParerUtils.getCellFormatValue(row, noteIndex));
+					if(StringTools.isNotBlank(note)){
+						tousseDefinition.setNote(note);
+					}
+					
 					setTousseDefinitionWithPropertyValue(tousseDefinition,
 							tousseType, taskgroupName, isCleanedEntirely,
 							packageType, size, spelling, wbCode, price,
@@ -2065,6 +2082,9 @@
 		if(StringUtils.isNotBlank(ttd.getIsPrintOrg())){
 			persistenceTousseDefinition.setIsPrintOrg(ttd.getIsPrintOrg());
 		}
+		if(StringUtils.isNotBlank(ttd.getNote())){
+			persistenceTousseDefinition.setNote(ttd.getNote());
+		}
 		//
 		if(StringUtils.isNotBlank(ttd.getSupplierName())){
 			persistenceTousseDefinition.setSupplierName(ttd.getSupplierName());
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r13420 -r14529
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 13420)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 14529)
@@ -365,6 +365,11 @@
 					inertStringValueToCell(row, tempCellNum,
 							contentCellStyleArray[tempCellNum++],
 							tousseDefinition.getIsPrintOrg());
+					
+					//配包注意事项
+					inertStringValueToCell(row, tempCellNum,
+							contentCellStyleArray[tempCellNum++],
+							tousseDefinition.getNote());
 
 					boolean isInsertMaterial = false;
 					// 器械
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r14519 -r14529
Binary files differ