Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r31420 -r31606
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 31420)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 31606)
@@ -339,6 +339,7 @@
     <input type="hidden" id="parm_s_treatmentNum" name="parm_s_treatmentNum">
     <input type="hidden" id="parm_s_hospitalNum" name="parm_s_hospitalNum">
     <input type="hidden" id="parm_s_patientName" name="parm_s_patientName">
+    <input type="hidden" id="parm_s_isDisableIDCard" name="parm_s_isDisableIDCard">
     <input type="hidden" id="ids" name="ids">
     
     
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r30977 -r31606
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 30977)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 31606)
@@ -22,6 +22,15 @@
 	reviewViewText = "审核";
 }
 
+var isDisableIDCardStore = new Ext.data.SimpleStore({
+	fields: ['key', 'val'],
+	data: [
+		['全部', '全部'],
+		['是', '是'],
+		['否', '否']
+	]
+});
+
 //grid数据的总数据量,非表格行数,而是右下角的总记录数
 var totalDataCount = 0;
 
@@ -159,8 +168,8 @@
 	$Id('parm_s_patientName').value = Ext.getCmp('patientName').getValue();						//病人姓名
 	$Id('parm_s_hospitalNum').value = Ext.getCmp('hospitalNum').getValue(); 						//住院号
 	$Id('parm_s_treatmentNum').value = Ext.getCmp('treatmentNum').getValue();					//诊疗号
+	$Id('parm_s_isDisableIDCard').value = Ext.getCmp('isDisableIDCard').getValue();
 	
-	
 	Ext.getCmp('barcodeSearch').setValue('');
 	grid.getStore().lastOptions.params['start'] = 0;
 	grid.dwrReload();
@@ -232,6 +241,7 @@
 	queryCondition['patientName'] = Ext.getCmp('patientName').getValue();						//病人姓名
 	queryCondition['hospitalNum'] = Ext.getCmp('hospitalNum').getValue(); 						//住院号
 	queryCondition['treatmentNum'] = Ext.getCmp('treatmentNum').getValue();					//诊疗号
+	queryCondition['isDisableIDCard'] = Ext.getCmp('isDisableIDCard').getValue();	
 	//位置
 	queryCondition['locationForDisplay'] = $Id('id_locationForDisplay').value;
 	//回收人
@@ -603,6 +613,7 @@
 		{header : "来源科室",width : 80,dataIndex : 'depart'},
 		{header : "条码",width : 70,dataIndex : 'barcode'},
 		{header : "标识牌条码",width : 70,dataIndex : 'idCardInstanceBarcode'},
+		{header : "禁用标识牌",width : 70,dataIndex : 'tousseDefinition.isDisableIDCard'},
 		{header : "状态",width : 80,dataIndex : 'status',renderer : statusFun},
 		{header : "灭菌交接状态",width : 85,hidden: !sstsConfig.enableSterilizationTransition,dataIndex : 'sterilizationTransition',renderer : sterilizationTransitionFun},
 		{header : "回收状态",width : 80,dataIndex : 'recyclingStatus',sortable: false,renderer : recyclingStatusFun, hidden : !sstsConfig.enableRecyclingStatusOfTousseInstance},
@@ -670,7 +681,8 @@
 	    {name : 'barcode'},
 	    {name : 'depart'},
 	    {name : 'idCardInstanceBarcode'},
-	    {name : 'idCardUseAmount'},
+	    {name : 'tousseDefinition.isDisableIDCard'},
+		{name : 'idCardUseAmount'},
 	    {name : 'taskGroup'},
 	    {name : 'operator'},
 	    {name : 'operationTime'},
@@ -1337,6 +1349,25 @@
             }
         }
     
+	},{
+        columnWidth : .2,
+        layout : 'form',
+        labelWidth : labelWidth,
+        labelAlign:"right",
+        items : {
+            id: 'isDisableIDCard',
+			name: 'isDisableIDCard',	
+			xtype: 'combo',
+			fieldLabel: '禁用标识牌',
+			store: isDisableIDCardStore,
+			anchor : '100%',
+			mode: 'local',
+			triggerAction: 'all',
+			valueField : 'key',
+			displayField : 'val',
+			forceSelection: true,
+			editable: false
+        }
 	}]
 	
 	var form = new Ext.Panel({