Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r32277 -r33897
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 32277)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 33897)
@@ -362,6 +362,8 @@
     <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="parm_s_urgentLevel" name="parm_s_urgentLevel">
+    <input type="hidden" id="parm_s_videoAndPictureRecording" name="parm_s_videoAndPictureRecording">
     <input type="hidden" id="ids" name="ids">
     
     
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r33891 -r33897
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 33891)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 33897)
@@ -27,6 +27,25 @@
 	reviewViewText = "审核";
 }
 
+var hideUrgentLevelQuery = true;
+var urgentLevelQueryName = '加急级别';
+var hideVideoAndPictureRecordingQuery = true;
+var videoAndPictureRecordingQueryName = '影像记录';
+
+if(sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery && sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery.length > 0){
+	var expandQueryFieldsConfigOfTousseInfoQuery = sstsConfig.expandQueryFieldsConfigOfTousseInfoQuery;
+	for(var i=0;i<expandQueryFieldsConfigOfTousseInfoQuery.length;i++){
+		if(expandQueryFieldsConfigOfTousseInfoQuery[i].fieldName == 'urgentLevel'){
+			hideUrgentLevelQuery = false;
+			urgentLevelQueryName = expandQueryFieldsConfigOfTousseInfoQuery[i].QueryName;
+		}
+		if(expandQueryFieldsConfigOfTousseInfoQuery[i].fieldName == 'videoAndPictureRecording'){
+			hideVideoAndPictureRecordingQuery = false;
+			videoAndPictureRecordingQueryName = expandQueryFieldsConfigOfTousseInfoQuery[i].QueryName;
+		}
+	}
+}
+
 var isDisableIDCardStore = new Ext.data.SimpleStore({
 	fields: ['key', 'val'],
 	data: [
@@ -36,6 +55,15 @@
 	]
 });
 
+var videoAndPictureRecordingStore = new Ext.data.SimpleStore({
+	fields: ['key', 'val'],
+	data: [
+		['', '全部'],
+		['有', '有'],
+		['无', '无']
+	]
+});
+
 //grid数据的总数据量,非表格行数,而是右下角的总记录数
 var totalDataCount = 0;
 
@@ -45,6 +73,7 @@
 function onAllChoosedOrNot(combo, record,index,nameOfFiled){
 	var choose = record.get(combo.checkField);
 	var fristRecord = combo.store.getAt(0);
+	console.log(index)
 	if(index != 0){
 		if(!choose) {
 			fristRecord.set(combo.checkField, false);
@@ -98,6 +127,32 @@
 	},[{name : 'sterilizerGroupName',mapping : 'value'}])
 });
 
+var testRecord = Ext.data.Record.create([
+	{name: 'id', type: 'long'},
+	{name: 'urgentLevel', type: 'string'}
+]);
+
+//加急级别store
+var urgentLevelStore = new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
+		method : "POST"
+	}),
+	reader: new Ext.data.JsonReader({  
+		root: 'data'
+	},[
+		{name: 'id'},
+		{name: 'urgentLevel'}
+	]),
+	listeners : {
+		load :function (thiz,records,options ){
+			if(urgentLevelStore.getCount() > 1){
+				urgentLevelStore.insert(0 , new testRecord({'id':'全部','urgentLevel':'全部'}));
+			}
+		}
+	}
+});
+
 var departmentComboBoxStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
@@ -144,8 +199,10 @@
 	//$Id('parm_s_barcodes').value = (barcodes.length == 9 ? '' : barcodes);  	//barcodes长度为9说明用户启用多次扫描模式，并且是第一次扫描
 	$Id('parm_s_barcodes').value = (barcodes);									//多次扫描模式下的条码
 	$Id('parm_s_idNumberSearch').value = $Id('idNumberSearch').value; 			//标识牌编号
-	$Id('parm_s_sterilizationTransitionStart').value = $Id('sterilizationTransitionStart').value;	//灭菌交接开始时间
-	$Id('parm_s_sterilizationTransitionEnd').value = $Id('sterilizationTransitionEnd').value;		//灭菌交接结束时间
+	if(sstsConfig.enableSterilizationTransition){
+		$Id('parm_s_sterilizationTransitionStart').value = $Id('sterilizationTransitionStart').value;	//灭菌交接开始时间
+		$Id('parm_s_sterilizationTransitionEnd').value = $Id('sterilizationTransitionEnd').value;		//灭菌交接结束时间
+	}
 
 	$Id('parm_s_taskGroup').value = $Id('taskGroup').value;				 		//装配任务组
 	$Id('parm_s_operationStart').value = $Id('operationStart').value;			//装配开始时间
@@ -174,7 +231,10 @@
 	$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();
-	
+	//加急级别
+	$Id('parm_s_urgentLevel').value = (Ext.getCmp('urgentLevel').getValue() == '全部')?'':Ext.getCmp('urgentLevel').getValue();
+	//影像记录
+	$Id('parm_s_videoAndPictureRecording').value = Ext.getCmp('videoAndPictureRecording').getValue();
 	Ext.getCmp('barcodeSearch').setValue('');
 	grid.getStore().lastOptions.params['start'] = 0;
 	grid.dwrReload();
@@ -210,8 +270,10 @@
 	queryCondition['barcodes'] = (barcodes)
 	//标识牌编号									
 	queryCondition['idNumberSearch'] = ($Id('id_idNumberSearch').value == '')?$Id('idNumberSearch').value:$Id('id_idNumberSearch').value;
-	queryCondition['sterilizationTransitionStart'] = $Id('sterilizationTransitionStart').value;	//灭菌交接开始时间
-	queryCondition['sterilizationTransitionEnd'] = $Id('sterilizationTransitionEnd').value;		//灭菌交接结束时间
+	if(sstsConfig.enableSterilizationTransition){
+		queryCondition['sterilizationTransitionStart'] = $Id('sterilizationTransitionStart').value;	//灭菌交接开始时间
+		queryCondition['sterilizationTransitionEnd'] = $Id('sterilizationTransitionEnd').value;		//灭菌交接结束时间
+	}
 
 	//装配任务组
 	queryCondition['taskGroup'] = ($Id('id_taskGroup').value == '')?$Id('taskGroup').value:$Id('id_taskGroup').value;				 		
@@ -247,6 +309,10 @@
 	queryCondition['hospitalNum'] = Ext.getCmp('hospitalNum').getValue(); 						//住院号
 	queryCondition['treatmentNum'] = Ext.getCmp('treatmentNum').getValue();					//诊疗号
 	queryCondition['isDisableIDCard'] = Ext.getCmp('isDisableIDCard').getValue();	
+	//加急级别
+	queryCondition['urgentLevel'] = (Ext.getCmp('urgentLevel').getValue() == '全部')?'':Ext.getCmp('urgentLevel').getValue();
+	//影像记录
+	queryCondition['videoAndPictureRecording'] = Ext.getCmp('videoAndPictureRecording').getValue();	
 	//位置
 	queryCondition['locationForDisplay'] = $Id('id_locationForDisplay').value;
 	//回收人
@@ -1716,7 +1782,63 @@
 			forceSelection: true,
 			editable: false
         }
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign: "right",
+		hidden:hideUrgentLevelQuery,
+		items : [{
+			xtype : 'multiSelect',
+			triggerAction : 'all',
+			fieldLabel : urgentLevelQueryName,
+			store: urgentLevelStore,
+			id : 'urgentLevel',
+			name : 'urgentLevel',
+			valueField : 'id',
+			displayField : 'urgentLevel',
+			mode : 'remote',
+			forceSelection : false,
+			allowBlank : true,
+			editable : true,
+			listeners : {
+				select : function(combo, record, index){
+					onAllChoosedOrNot(combo, record,index,'urgentLevel');
+				}
+			},
+			anchor : '100%'
+		 }]
+	},{
+        columnWidth : .2,
+        layout : 'form',
+        labelWidth : labelWidth,
+        labelAlign:"right",
+		hidden:hideVideoAndPictureRecordingQuery,
+        items : [{
+            id: 'videoAndPictureRecording',
+			name: 'videoAndPictureRecording',	
+			xtype: 'combo',
+			fieldLabel: videoAndPictureRecordingQueryName,
+			store: videoAndPictureRecordingStore,
+			anchor : '100%',
+			mode: 'local',
+			triggerAction: 'all',
+			valueField : 'key',
+			displayField : 'val',
+			forceSelection: true,
+			editable: false
+        }]
 	}]
+
+	var formHeight = 0;
+	if(fontSize == 12){
+		formHeight = 200;
+	}else {
+		formHeight = 235;
+	}
+	if(!hideUrgentLevelQuery && !hideVideoAndPictureRecordingQuery){
+		formHeight += 20;
+	}
 	
 	var form = new Ext.Panel({
 		title : '器械包查询条件',
@@ -1729,7 +1851,7 @@
 //		paddings:'50 20 20 20',
 //		autoHeight : true,
 //        autoScroll : true,
-		height : (fontSize == 12 ? 210 : 245),
+		height : formHeight,
         items : {
         	layout : 'column',
 			width: fontSize == 12 ? 1100 : 1300,
@@ -1761,8 +1883,10 @@
 						$Id('scanPattern').value = singleScanLabel;		//扫描模式
 						$Id('barcodeSearch').value = "";				//条码
 						$Id('idNumberSearch').value = "";				//标识牌编号
-						$Id('sterilizationTransitionStart').value = "";	//灭菌交接开始时间
-						$Id('sterilizationTransitionEnd').value = "";	//灭菌交接结束时间
+						if(sstsConfig.enableSterilizationTransition){
+							$Id('sterilizationTransitionStart').value = "";	//灭菌交接开始时间
+							$Id('sterilizationTransitionEnd').value = "";	//灭菌交接结束时间
+						}
 
 
 						$Id('taskGroup').value="";						//装配任务组
@@ -1788,6 +1912,8 @@
 						$Id('sterilizerGroup').value = "";				//灭菌炉分组
 						$Id('sterilizerName').value = "";				//灭菌炉
 						$Id('frequency').value = "";					//炉次
+						$Id('urgentLevel').value = "";
+						$Id('videoAndPictureRecording').value = "";
 
 						$Id('id_locationForDisplay').value = "";			
 						$Id('id_recyclingUser').value = "";			
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r33891 -r33897
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33891)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 33897)
@@ -236,6 +236,8 @@
   enableTableColumnCustomizationForTheHistoryRecyclingRecordList :["科室","手术间","患者","物品清单","包数","清点人","申请单号"],
   //器械包信息列表扩展列配置
   expandColoumnsConfigOfTousseInfoList: [{"fieldName":"urgentLevel","coloumnName":"加急级别"},{"fieldName":"videoAndPictureRecording","coloumnName":"影像记录"}],
+  //器械包信息模块扩展查询项配置
+  expandQueryFieldsConfigOfTousseInfoQuery:[{"fieldName":"urgentLevel","QueryName":"加急级别"},{"fieldName":"videoAndPictureRecording","QueryName":"影像记录"}],
   //外部代理灭菌单的表单字段自定义名称配置
   customNameConfigurationForFormFieldsOfForeignProxyDisinfection: [{"fieldName":"applicant","displayName":"接收人"},{"fieldName":"maker","displayName":"装配人"}]
   }
\ No newline at end of file