Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r40600 -r40646
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40600)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40646)
@@ -9,7 +9,6 @@
 var lastSelectVedioName;
 var lastSelectTdId;
 var lastSelectTaskId;
-var lastPackingTaskInfo;
 var sterilizerTypeStore;
 var waitPackingJsonObj;
 var packingTousseBtnClick_mask = null;
@@ -196,6 +195,29 @@
 
 }
 
+//ZSYY-435：获取默认加急级别
+function getDefaultUrgents(){
+	var id = '';
+	Ext4.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
+		async:false,
+		success: function (response, options) {
+			var result = Ext4.decode(response.responseText);
+			if (result.success) {
+				if(result.data.length > 0){
+					for(var i=0;i<result.data.length;i++){
+						if(result.data[i].urgentDefaultValue == '是'){
+							id = result.data[i].id;
+							break;
+						}
+					}
+				}
+			}
+		}
+	});
+	return id;
+}
+
 //ZSWY-246：显示配包注意事项
 function showTousseDefinitionNote(tousseName, tousseID){
 	var buttons = Ext4.MessageBox.YESNO;
@@ -1280,6 +1302,7 @@
 	Ext4.getCmp('idCardBarcode').setValue();
 	Ext4.getCmp('idCardName').setValue();
 	Ext4.getCmp('idCardUseAmount').setValue();
+	Ext4.getCmp('idCardTaskId').setValue('');
 
 	showOrHideErrorAndDamageBtn();
 }
@@ -1697,6 +1720,7 @@
 				showMultipleResult(result.errorMsg, null, sstsConfig.messagePauseTimeOnPackingPage);
 				Ext4.getCmp('idCardName').setValue();
 				Ext4.getCmp('idCardUseAmount').setValue();
+				Ext4.getCmp('idCardTaskId').setValue('');
 			}
 		});
 	}
@@ -1748,7 +1772,6 @@
 			lastSelectimageTypeTousse = imageType_tousse;
 			lastSelectVedioName = vedioName;
 			lastSelectTdId = td_id;
-			lastPackingTaskInfo = taskList[0];
 			var tousseType = idCardTaskNode.data.tousseType;
 			var isPrint = idCardTaskNode.data.isPrint;
 			var isReview = idCardTaskNode.data.isReview;
@@ -1771,6 +1794,7 @@
 			Ext4.getCmp('idCardBarcode').setValue(barcode);
 			Ext4.getCmp('idCardName').setValue(tousseName + "（条码：" + barcode + "）");
 			Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount);
+			Ext4.getCmp('idCardTaskId').setValue(taskList[0].taskId);
 			idCardBarcode = barcode;
 			idCardInstanceID = result.idCard.id;
 			idCardDefinitionId = result.idCard == null ? '' : result.idCard.idCardDefinition.id;
@@ -3174,6 +3198,10 @@
 				name: 'oldPackageType'
 			}, {
 				xtype: 'hidden',
+				id: 'idCardTaskId',
+				name: 'idCardTaskId'
+			}, {
+				xtype: 'hidden',
 				id: 'note'
 			}, {
 				columnWidth: .5,
@@ -3832,29 +3860,49 @@
 					xtype: 'button',
 					id: "urgentOfPackin",
 					hidden: !sstsConfig.enableSetUrgentOfPackin,
-					text: '<span style="font-weight: bold;">加急</span>',
+					text: '<span style="font-weight: bold;">快速加急</span>',
 					handler: function () {
-						var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
-						var selNodes = basketTreeGrid.getView().getChecked();
-						var arr = [];
-						Ext4.each(selNodes, function (pNode) {
-							if (pNode.childNodes.length == 0) {
-								arr.push(pNode.data)
+						var urgentLevelId = '';
+						if(sstsConfig.enableTousseVoluntarilyUrgent && sstsConfig.enableUrgentFunction){
+							if(urgentItemsObj){
+								urgentLevelId = urgentItemsObj.id;
+							}else {
+								urgentLevelId = getDefaultUrgents();
 							}
-						});
-						if (arr.length == 0) {
-							if(lastPackingTaskInfo){
-								updateUrgentLevelOfPackingTask(lastPackingTaskInfo, 'idCard');
-								return
-							}
-							showMultipleResult('请选择需要加急的待装配物品。');
-							return;
+						}else {
+							urgentLevelId = getDefaultUrgents();
 						}
-						if (arr.length > 1) {
-							showMultipleResult('不支持多选操作，请修改后再操作。');
-							return;
+						if(urgentLevelId == ''){
+							showResult('操作失败，没有设置默认的加急等级。');
+							return
 						}
-						updateUrgentLevelOfPackingTask(arr[0], 'basketTreeGrid');
+						var idCardTaskId = Ext4.getCmp('idCardTaskId').getValue();
+						if(idCardTaskId !== ''){
+							Ext.Ajax.request({
+								url: WWWROOT + '/disinfectSystem/packingAction!updateUrgentLevelOfPackingTask.do',
+								params:{
+									packingTaskId:idCardTaskId,
+									urgentLevelId:urgentLevelId,
+									urgentAmount:1
+								},
+								success: function (response, options) {
+									var result = Ext.decode(response.responseText);
+									if (result.success) {
+										showMultipleResult('设置成功');
+										var idCardBarcode = Ext4.getCmp('idCardBarcode').getValue();
+										loadIdCardByBarcode(idCardBarcode, true, true, 'scan');
+									}else {
+										showMultipleResult(result.message);
+									}
+								},
+								failure: function (response, options) {
+									var result = Ext.decode(response.responseText);
+									showMultipleResult(result.message);
+								}
+							});
+						}else {
+							showResult('当前仅允许含有标识牌的物品进行快速加急。');
+						}
 					}
 				},{
 					xtype: 'button',
@@ -5249,6 +5297,7 @@
 		scanScanIDCardBarcode.hide();
 		idCardName.hide();
 		Ext4.getCmp('idCardUseAmount').hide();
+		Ext4.getCmp('idCardTaskId').setValue('');
 
 		clearInputedIDCardInfo();
 	}
@@ -7682,7 +7731,6 @@
 		}else {
 			Ext4.getCmp('weight').hide();
 		}
-
 		if (record.childNodes.length == 1) {
 			taskId = record.childNodes[0].get('taskId');
 		} else if (record.childNodes.length == 0) {
@@ -7708,7 +7756,6 @@
 		lastSelectimageTypeTousse = imageType_tousse;
 		lastSelectVedioName = vedioName;
 		lastSelectTdId = td_id;
-		lastPackingTaskInfo = null;
 		if (packingPageAutoSetSterilizationProgramAfterSelectTousse) {
 			sterilizerTypeStore.reload();
 			Ext4.getCmp('sterilingType').setValue(sterilingMethod);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r40302 -r40646
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 40646)
@@ -15,6 +15,7 @@
 <%@page import="java.util.Date"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="java.util.List"%>
+<%@page import="net.sf.json.JSONArray"%>
 <%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.systemsetting.model.HttpOption"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -23,6 +24,7 @@
 <%@page import="com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication"%>
 <%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %>
 <%@page import="com.forgon.log.model.Log"%>
+<%@page import="com.forgon.disinfectsystem.entity.urgent.UrgentLevel"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
@@ -52,6 +54,10 @@
 	request.setAttribute("projectName", projectName);
 	request.setAttribute("fontSize",(loginUser == null || loginUser.getFontSize() == null) ? "12" : loginUser.getFontSize());
 	request.setAttribute("getPrintUserFullName",supplyRoomConfigManager.getSystemParamsObj().isPrintUserFullName());
+
+	UrgentLevel getUrgentLevelObj = supplyRoomConfigManager.getSystemParamsObj().getUrgentLevel();
+	String urgentItems = JSONArray.fromObject(getUrgentLevelObj).toString();
+	request.setAttribute("urgentItems", urgentItems);
 	String supplyRoomCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 	String supplyRoomName = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitName();
     request.setAttribute("supplyRoomCoding", supplyRoomCoding);
@@ -288,6 +294,8 @@
 	</operation:authorize>
 	//httpOption的optionListId:丢失报损备注
 	var errorDamageRemark = '<%=HttpOption.SYSTEMSETTING_ERROR_DAMAGE_REMARK %>';
+	var urgentItems = $.parseJSON('<%=urgentItems%>');
+	var urgentItemsObj = urgentItems[0];
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js?version=${svnRevision}"></script>
 <script>