Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r15820 -r15825
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 15820)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 15825)
@@ -69,11 +69,11 @@
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem;
 import com.forgon.disinfectsystem.exception.ImportDataException;
 import com.forgon.disinfectsystem.expirationdateinfo.service.ExpirationDateInfoManager;
+import com.forgon.disinfectsystem.labeltemplate.service.LabelTemplateManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.excel.service.CommonImportManager;
 import com.forgon.excel.service.ExcelUtils;
-import com.forgon.log.model.Log;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.systemsetting.model.HttpOption;
@@ -134,6 +134,12 @@
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private LabelTemplateManager labelTemplateManager;
+	
+	public void setLabelTemplateManager(LabelTemplateManager labelTemplateManager) {
+		this.labelTemplateManager = labelTemplateManager;
+	}
+
 	public void setSupplyRoomConfigManager(
 			SupplyRoomConfigManager supplyRoomConfigManager) {
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
@@ -2065,8 +2071,8 @@
 							row, tousseBarcodePageTypeIndex);
 					// 录入的大小的值必须要先存在该字符串中
 					if (StringUtils.isNotBlank(tousseBarcodePageType)) {
-						if (barcodePageType.indexOf(";" + tousseBarcodePageType
-								+ ";") == -1) {
+						List<String> strArray = labelTemplateManager.getAllLabelTemplate();
+						if(!strArray.contains(tousseBarcodePageType)){
 							failureCount = appendFailureRowNumAndRecordFailureNum(
 									failureCount, sb, currentRowNum,tousseBarcodePageTypeIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED);
 							tousseDefinition = null;
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
===================================================================
diff -u -r15473 -r15825
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 15473)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 15825)
@@ -111,4 +111,21 @@
 		JSONObject jsonObject = JSONObject.fromObject(labeTemplate);
 		return jsonObject.toString();
 	}
+	/**
+	 * 获取所有的标签模板
+	 */
+	public List<String> getAllLabelTemplate(){
+		List<String> nameList = getAllTemplateFullNames();
+		if(nameList == null){
+			nameList = new ArrayList<String>();
+		}
+		nameList.add("加大标签");
+		nameList.add("大标签");
+		nameList.add("中标签");
+		nameList.add("中标签2");
+		nameList.add("小标签");
+		nameList.add("小标签2");
+
+		return nameList;
+	}
 }
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
===================================================================
diff -u -r15473 -r15825
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java	(.../LabelTemplateManager.java)	(revision 15473)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java	(.../LabelTemplateManager.java)	(revision 15825)
@@ -2,10 +2,6 @@
 
 import java.util.List;
 
-import javax.persistence.Transient;
-
-import net.sf.json.JSONObject;
-
 import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate;
 /**
  * 标签打印模板的Manager类
@@ -24,5 +20,10 @@
 	public List<String> getAllExcludeForeignTousseTemplateFullNames();
 	public String getAllTemplateInfoJsonStr();
 	public String toJsonStr(LabelTemplate labeTemplate);
+	/**
+	 * 获取所有的标签模板
+	 * @return
+	 */
+	public List<String> getAllLabelTemplate();
 	
 }
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
===================================================================
diff -u -r15780 -r15825
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 15780)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 15825)
@@ -127,19 +127,12 @@
 	}
 	public void getAllBarcodePaperType(){
 		JSONArray array = new JSONArray();
-		List<String> nameList = labelTemplateManager.getAllTemplateFullNames();
+		List<String> nameList = labelTemplateManager.getAllLabelTemplate();
 		if(nameList!=null){
 			for (String name : nameList) {
 				addName(array, name);
 			}
 		}
-		addName(array, "加大标签");
-		addName(array, "大标签");
-		addName(array, "中标签");
-		addName(array, "中标签2");
-		addName(array, "小标签");
-		addName(array, "小标签2");
-		
 		StrutsResponseUtils.output(array);
 	}