Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r39353 -r39396
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 39353)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 39396)
@@ -87,7 +87,7 @@
 	</operation:authorize>
 	var SSTS_ForeignTousseApplication_Update = true;
 	<operation:authorize ifAnyGranted="SSTS_ForeignTousseApplication_Update">
-	SSTS_ForeignTousseApplication_Update = false;
+	SSTS_ForeignTousseApplication_Update = true;
 	if('${isBeApplication}'=='false'){
 		SSTS_ForeignTousseApplication_Update =true;
     }
@@ -109,7 +109,9 @@
 	//外来器械申请单收费设置
 	var SSTS_ShowForeignTousseApplication_ChargeSet = true;
 	<operation:authorize ifAnyGranted="SSTS_ShowForeignTousseApplication_ChargeSet">
-		SSTS_ShowForeignTousseApplication_ChargeSet = false;
+		if(sstsConfig.enableForeignTousseChargingMode2){
+			SSTS_ShowForeignTousseApplication_ChargeSet = false
+		}
 	</operation:authorize>
 	
 	var SSTS_ForeignTousseApplication_Terminate = true;
@@ -118,9 +120,9 @@
 	</operation:authorize>
 
 	//显示加急级别和加急数量
-	var SSTS_ShowUrgentLevelAndUrgentAmount = false;
+	var SSTS_ShowUrgentLevelAndUrgentAmount = true;
 	<operation:authorize ifAnyGranted="SSTS_ShowUrgentLevelAndUrgentAmount">
-		SSTS_ShowUrgentLevelAndUrgentAmount = true;
+		SSTS_ShowUrgentLevelAndUrgentAmount = false;
 	</operation:authorize>
 
 	//外来器械单审核管理
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r39395 -r39396
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 39395)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 39396)
@@ -400,7 +400,7 @@
 		{ header: patientName, width: 70, dataIndex: 'patient' },
 		{ header: doctorName, width: 70, dataIndex: 'doctor' },
 		{ header: "外来器械包名称", width: 150, dataIndex: 'tousseName' },
-		{ header: "收费状态", width: 150, dataIndex: 'chargeStatus', renderer: renderChargeStatusColor, hidden: !SSTS_ShowForeignTousseApplication_ChargeSet },
+		{ header: "收费状态", width: 150, dataIndex: 'chargeStatus', renderer: renderChargeStatusColor, hidden: SSTS_ShowForeignTousseApplication_ChargeSet },
 		{ header: "外来器械包条码", width: 150, dataIndex: 'barcodes', hidden: !sstsConfig.showForeignTousseApplicationBarcode, sortable: false },
 		{ header: "供应商", width: 150, dataIndex: 'supplierName' },
 		{ header: surgeryName, width: 150, dataIndex: 'surgery' },
@@ -722,7 +722,7 @@
 			text: '收费设置',
 			iconCls: 'btn_ext_chargeSetting',
 			id: 'chargeSetting',
-			hidden: !SSTS_ShowForeignTousseApplication_ChargeSet,
+			hidden: SSTS_ShowForeignTousseApplication_ChargeSet,
 			handler: function () {
 				var records = grid.getSelectionModel().getSelections();
 
@@ -1606,7 +1606,7 @@
     	align:'center',
         sortable: true,
         dataIndex: 'urgentLevel',
-		hidden:!SSTS_ShowUrgentLevelAndUrgentAmount,
+		hidden:SSTS_ShowUrgentLevelAndUrgentAmount,
         editor: {
 			xtype : 'combo',
 			valueField : 'urgentLevel',
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r39378 -r39396
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 39378)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 39396)
@@ -1535,7 +1535,7 @@
 			if(result.success){
 				var urgentLevel = '';
 				var urgentLevelId = '';
-				if(SSTS_ShowUrgentLevelAndUrgentAmount){
+				if(!SSTS_ShowUrgentLevelAndUrgentAmount){
 					urgentLevel = top.Ext4.getCmp('urgentLevel1').getRawValue();
 					urgentLevelId = top.Ext4.getCmp('urgentLevel1').getValue();
 				}
@@ -2060,7 +2060,7 @@
 			}
 		},{
 			text: "加急级别:",
-			hidden: !SSTS_ShowUrgentLevelAndUrgentAmount
+			hidden: SSTS_ShowUrgentLevelAndUrgentAmount
 		},{
 			xtype : 'combo',
 			width : 60,
@@ -2069,7 +2069,7 @@
 			store : urgentLevelStore,
 			valueField : 'id',
 			displayField : 'urgentLevel',
-			hidden: !SSTS_ShowUrgentLevelAndUrgentAmount,
+			hidden: SSTS_ShowUrgentLevelAndUrgentAmount,
 			minChars : 0,
 			forceSelection : true,
 			lazyInit : true,
@@ -2090,7 +2090,7 @@
 					tousseDefinitionId = "";
 				}
 				var suppler = top.Ext4.getCmp('suppler1').getValue();
-				if(SSTS_ShowUrgentLevelAndUrgentAmount){
+				if(!SSTS_ShowUrgentLevelAndUrgentAmount){
 					var urgentLevel = top.Ext4.getCmp('urgentLevel1').getRawValue();
 					var urgentLevelId = top.Ext4.getCmp('urgentLevel1').getValue();
 				}
@@ -2303,7 +2303,7 @@
 			id : 'foreignTousseUsedAgainBtn',
 			hidden:true,
 			handler : function() {
-				foreignTousseUsedAgainFun(id, formType,ismodify,recyclingStatus,serialNumber);
+				foreignTousseUsedAgainFun(id, formType, ismodify, recyclingStatus, serialNumber);
 			}
 		},{
 			text : '打印包外标签',
@@ -2819,7 +2819,7 @@
     	align:'center',
         sortable: true,
         dataIndex: 'urgentLevel',
-		hidden:!SSTS_ShowUrgentLevelAndUrgentAmount,
+		hidden:SSTS_ShowUrgentLevelAndUrgentAmount,
         editor: {
 			xtype : 'combo',
 			id : 'urgentLevel',