Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
===================================================================
diff -u -r14866 -r16018
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 14866)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 16018)
@@ -61,8 +61,9 @@
 
 	public void loadIDCardInfo() {
 		String id = StrutsParamUtils.getPraramValue("id", "");
+		String viewAll = StrutsParamUtils.getPraramValue("viewAll", "");
 		String data = idCardDefinitionManager
-				.getIDCardDefinitionInfoByTousseID(id);
+				.getIDCardDefinitionInfoByTousseID(id,viewAll);
 		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 		try {
 			StrutsParamUtils.getResponse().getWriter().println(data);
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r15775 -r16018
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 15775)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 16018)
@@ -253,14 +253,17 @@
 	}
 
 	@Override
-	public String getIDCardDefinitionInfoByTousseID(String tousseDefinitionId) {
+	public String getIDCardDefinitionInfoByTousseID(String tousseDefinitionId,String viewAll) {
 
 		JSONArray array = new JSONArray();
 		if (StringUtils.isNotBlank(tousseDefinitionId)) {
-
+			boolean includeDiscardDefinitions = false;
+			if("true".equals(viewAll)){
+				includeDiscardDefinitions = true;
+			}
 			// 不包含已废弃的标识牌定义
 			List<IDCardDefinition> idCardDefinitions = getIDCardDefinitionsOfTousseDefinition(
-					tousseDefinitionId, false);
+					tousseDefinitionId, includeDiscardDefinitions);
 
 			if (idCardDefinitions != null && idCardDefinitions.size() > 0) {
 //				Set<Long> idCardDefinitionIds
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r14874 -r16018
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 14874)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js	(.../idCardForm.js)	(revision 16018)
@@ -469,7 +469,24 @@
 				handler : function() {
 					printAllIdCard();
 				}
-			},{
+			}, '-',{
+                xtype : 'checkbox',
+                id : 'checkbox_viewAll',
+                name : 'checkbox_viewAll',
+                boxLabel : '查看所有',
+                checked :false,
+                value :false,
+                labelStyle:'',
+                listeners :{
+    		    	'check':function(cbox,checked){
+    		    		reLoadIDCardDefinitions();
+    		    	},
+    		    	'render':function(cbox){
+    		    		cbox.setValue(false);
+    		    	}
+    		    	
+    		    }
+            }, '-',{
 				text : '标识牌标签:',
 				hidden:forSupplement
 			},{
@@ -1226,7 +1243,13 @@
 	}
 	
 	function loadIDCardDefinitions(){
+		var checkbox_viewAll = top.Ext.getCmp('checkbox_viewAll');
+		var viewAll = '';
+		if(checkbox_viewAll){
+			viewAll = checkbox_viewAll.getValue();
+		}
 		idCardDefinitionStore.baseParams['id'] = tousseDefinitionID;
+		idCardDefinitionStore.baseParams['viewAll'] = viewAll;
 		idCardDefinitionStore.load({
 			callback:function(records,options,success){
 				if(success){
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
===================================================================
diff -u -r15775 -r16018
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 15775)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 16018)
@@ -24,7 +24,7 @@
 	public boolean isIdCardBarcodeMatchTousseDefinition(String idCardBarcode,
 			String tousseName);
 
-	public String getIDCardDefinitionInfoByTousseID(String id);
+	public String getIDCardDefinitionInfoByTousseID(String id,String viewAll);
 	public JSONArray getIDCardInstanceByIDCardDefinitionId(String id);
 	public JSONArray getTraceableMaterialByIDCardDefinitionId(String id);