Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java
===================================================================
diff -u -r19658 -r21221
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 19658)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java	(.../LabelTemplateManagerImpl.java)	(revision 21221)
@@ -1,18 +1,22 @@
 package com.forgon.disinfectsystem.labeltemplate.service;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.labeltemplate.LabelTemplate;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.util.SqlUtils;
 /**
  * 
  * @author Terry, 2016-09-16
@@ -124,6 +128,16 @@
 		List<String> names = objectDao.findByHql(sql);
 		return names;
 	}
+	public List<String> getTemplateFullNamesByDataSource(String dataSourceName){
+		String sql = String.format("select po.fullName from %s po where %s ", LabelTemplate.class.getSimpleName(),SqlUtils.getStringFieldPredicate("po.dataSourceName", dataSourceName));
+		List<String> names = objectDao.findByHql(sql);
+		return names;
+	}
+	public List<String> getTemplateFullNamesByDataSourceSet(Collection<String> dataSourceName){
+		String sql = String.format("select po.fullName from %s po where %s ", LabelTemplate.class.getSimpleName(),SqlUtils.getStringFieldInCollectionsPredicate("po.dataSourceName", dataSourceName));
+		List<String> names = objectDao.findByHql(sql);
+		return names;
+	}
 	public List<String> getAllExcludeForeignTousseTemplateFullNames(){
 		String sql = String.format("select po.fullName from %s po where po.dataSourceName='%s'", LabelTemplate.class.getSimpleName(),LabelTemplate.OBJECTDATASOURCE_FOREIGNTOUSSE);
 		List<String> names = objectDao.findByHql(sql);
@@ -145,8 +159,12 @@
 	/**
 	 * 获取所有的标签模板
 	 */
-	public List<String> getAllLabelTemplate(){
-		List<String> nameList = getAllTemplateFullNames();
+	public List<String> getAllTousseLabelName(){
+		Set<String> names = new HashSet<String>();
+		names.add(LabelTemplate.OBJECTDATASOURCE_TOUSSE);
+		names.add(LabelTemplate.OBJECTDATASOURCE_FOREIGNTOUSSE);
+		names.add(LabelTemplate.OBJECTDATASOURCE_FOREIGNPROXYDISINFECTIONTOUSSE);
+		List<String> nameList = getTemplateFullNamesByDataSourceSet(names);
 		if(nameList == null){
 			nameList = new ArrayList<String>();
 		}
@@ -190,7 +208,7 @@
 	 * 获取所有的标签模板
 	 */
 	public List<String> getAllIdCardLabelTemplate(){
-		List<String> nameList = getAllTemplateFullNames();
+		List<String> nameList = getTemplateFullNamesByDataSource(LabelTemplate.OBJECTDATASOURCE_IDCARD);
 		if(nameList == null){
 			nameList = new ArrayList<String>();
 		}
@@ -212,11 +230,13 @@
 				nameList.add("大标签");
 				nameList.add("中标签");
 				nameList.add("小标签");
+				nameList.add("标识牌和图片");
 			}
 		}else{
 			nameList.add("大标签");
 			nameList.add("中标签");
 			nameList.add("小标签");
+			nameList.add("标识牌和图片");
 		}
 
 		return nameList;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java
===================================================================
diff -u -r15476 -r21221
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java	(.../LabelTemplate.java)	(revision 15476)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/labeltemplate/LabelTemplate.java	(.../LabelTemplate.java)	(revision 21221)
@@ -28,6 +28,7 @@
 	public final static String OBJECTDATASOURCE_TOUSSE = "普通器械包";
 	public final static String OBJECTDATASOURCE_FOREIGNTOUSSE = "外来器械包";
 	public final static String OBJECTDATASOURCE_FOREIGNPROXYDISINFECTIONTOUSSE = "外部代理灭菌包";
+	public final static String OBJECTDATASOURCE_IDCARD = "标识牌";
 	private Long id;
 
 	/**
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java
===================================================================
diff -u -r18964 -r21221
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java	(.../LabelTemplateManager.java)	(revision 18964)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManager.java	(.../LabelTemplateManager.java)	(revision 21221)
@@ -26,7 +26,7 @@
 	 * 获取所有的标签模板
 	 * @return
 	 */
-	public List<String> getAllLabelTemplate();
+	public List<String> getAllTousseLabelName();
 	/**
 	 * 获取所有的标识牌标签模板
 	 * @return
Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java
===================================================================
diff -u -r19521 -r21221
--- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 19521)
+++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/action/LabelTemplateAction.java	(.../LabelTemplateAction.java)	(revision 21221)
@@ -143,14 +143,24 @@
 	}
 	public void getAllBarcodePaperType(){
 		JSONArray array = new JSONArray();
-		List<String> nameList = labelTemplateManager.getAllLabelTemplate();
+		List<String> nameList = labelTemplateManager.getAllTousseLabelName();
 		if(nameList!=null){
 			for (String name : nameList) {
 				addName(array, name);
 			}
 		}
 		StrutsResponseUtils.output(array);
 	}
+	public void getTousseBarcodePaperType(){
+		JSONArray array = new JSONArray();
+		List<String> nameList = labelTemplateManager.getAllTousseLabelName();
+		if(nameList!=null){
+			for (String name : nameList) {
+				addName(array, name);
+			}
+		}
+		StrutsResponseUtils.output(array);
+	}
 	
 	public void getAllIdCardLabelTemplate(){
 		JSONArray array = new JSONArray();
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r20722 -r21221
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 20722)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 21221)
@@ -2157,7 +2157,7 @@
 							row, tousseBarcodePageTypeIndex);
 					// 录入的大小的值必须要先存在该字符串中
 					if (StringUtils.isNotBlank(tousseBarcodePageType)) {
-						List<String> strArray = labelTemplateManager.getAllLabelTemplate();
+						List<String> strArray = labelTemplateManager.getAllTousseLabelName();
 						if(!strArray.contains(tousseBarcodePageType)){
 							failureCount = appendFailureRowNumAndRecordFailureNum(
 									failureCount, sb, currentRowNum,tousseBarcodePageTypeIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED);
@@ -4443,7 +4443,7 @@
 							row, tousseBarcodePageTypeIndex);
 					// 录入的大小的值必须要先存在该字符串中
 					if (StringUtils.isNotBlank(tousseBarcodePageType)) {
-						List<String> strArray = labelTemplateManager.getAllLabelTemplate();
+						List<String> strArray = labelTemplateManager.getAllTousseLabelName();
 						if(!strArray.contains(tousseBarcodePageType)){
 							failureCount = appendFailureRowNumAndRecordFailureNum(
 									failureCount, sb, currentRowNum,tousseBarcodePageTypeIndex,com.forgon.disinfectsystem.common.Constants.ERROR_TYPE_NOT_DEFINED);