Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/importbasedata/basedataDemo.xls
===================================================================
diff -u -r19740 -r19911
Binary files differ
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r19821 -r19911
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19821)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 19911)
@@ -1862,6 +1862,7 @@
 			int isPrintOrgSourceIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "打印科室来源");
 			int limitInvoiceDepartIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "是否限制发货科室");
 			int noteIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "配包注意事项");
+			int isConvertApplyGoodsIndex = ExcelUtils.getColumnIndex(nameToIndexMap, "是否转换申请物品");
 			for (int i = 1; i <= lastRowNum; i++) {
 				HSSFRow row = tousseSheet.getRow(i);
 				int currentRowNum = i + 1;
@@ -2277,6 +2278,13 @@
 //								failureCount, sb, currentRowNum,useBasketCountIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_VALUE_INVALID);
 //						continue;
 //					}
+					//是否转换申请物品
+					String isConvertApplyGoods = ParerUtils.getCellFormatValue(row, isConvertApplyGoodsIndex);
+					if(!yesNoSet.contains(isConvertApplyGoods)){
+						isConvertApplyGoods = TousseDefinition.STR_YES;
+					}
+					tousseDefinition.setIsConvertApplyGoods(isConvertApplyGoods);
+					
 					// 是否装配
 					String isPacking = ParerUtils.getCellFormatValue(row, isPackingIndex);
 					if(!yesNoSet.contains(isPacking)){