Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r17535 -r19038
Binary files differ
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
===================================================================
diff -u -r17549 -r19038
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 17549)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java	(.../ExportBasedataManagerImpl.java)	(revision 19038)
@@ -377,10 +377,10 @@
 							contentCellStyleArray[tempCellNum++],
 							tousseDefinition.getIsReview());
 					
-					// 是否打印科室
+					// 打印科室来源
 					inertStringValueToCell(row, tempCellNum,
 							contentCellStyleArray[tempCellNum++],
-							tousseDefinition.getIsPrintOrg());
+							tousseDefinition.getPrintOrgSource());
 					
 					//配包注意事项
 					inertStringValueToCell(row, tempCellNum,
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r18203 -r19038
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 18203)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19038)
@@ -1854,7 +1854,7 @@
 			int workLoadStatisticalMethodIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "工作量统计方式");
 			int isCustomPackIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "自定义装配");
 			int isQuickRecycleIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "快速回收");
-			int isPrintOrgIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "打印科室");
+			int isPrintOrgSourceIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "打印科室来源");
 			int noteIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "配包注意事项");
 			for (int i = 1; i <= lastRowNum; i++) {
 				HSSFRow row = tousseSheet.getRow(i);
@@ -2223,22 +2223,22 @@
 					}
 					tousseDefinition.setExpressRecycling(isQuickRecycle);
 					
-					// 是否打印科室
-					String isPrintOrg = ParerUtils.getCellFormatValue(row, isPrintOrgIndex);
-					if(StringUtils.isBlank(isPrintOrg)){
-						isPrintOrg = "否";
-					}else if(!TousseDefinition.STR_YES.equals(isPrintOrg)
-							&& !TousseDefinition.STR_NO.equals(isPrintOrg)){
-						isPrintOrg = "否";
+					// 打印科室来源
+					String isPrintOrgSource = ParerUtils.getCellFormatValue(row, isPrintOrgSourceIndex);
+					if(StringUtils.isBlank(isPrintOrgSource)){
+						isPrintOrgSource = "无";
+					}else if(!TousseDefinition.PRINGORGSOURCE_RECYCLINGDEPART.equals(isPrintOrgSource)
+							&& !TousseDefinition.PRINGORGSOURCE_ASSERTBELONG.equals(isPrintOrgSource)){
+						isPrintOrgSource = "无";
 					}
-					tousseDefinition.setIsPrintOrg(isPrintOrg);
+					tousseDefinition.setPrintOrgSource(isPrintOrgSource);
 					
 					//如果是否打印科室为是,则打印科室来源需要更新为回收科室,否则就是无
-					if(TousseDefinition.STR_YES.equals(isPrintOrg)){
-						tousseDefinition.setPrintOrgSource(TousseDefinition.PRINGORGSOURCE_RECYCLINGDEPART);
-					}else{
-						tousseDefinition.setPrintOrgSource(TousseDefinition.PRINGORGSOURCE_NONE);
-					}
+//					if(TousseDefinition.STR_YES.equals(isPrintOrg)){
+//						tousseDefinition.setPrintOrgSource(TousseDefinition.PRINGORGSOURCE_RECYCLINGDEPART);
+//					}else{
+//						tousseDefinition.setPrintOrgSource(TousseDefinition.PRINGORGSOURCE_NONE);
+//					}
 					
 					//配包注意事项
 					String note = StringTools.defaultString(ParerUtils.getCellFormatValue(row, noteIndex));