Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r33814 -r33941
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 33941)
@@ -1950,40 +1950,45 @@
 function renderModifyFun(v, p, record){
 	var cell;
 	var type = record.get('type');
+	var specialInfection = record.get('specialInfection') || '';
+	var warningImg = '';
+	if(specialInfection !== ''){
+		warningImg = "<img src='"+WWWROOT+"/images/web/warning.png' style='vertical-align: middle;width:16px;height:16px;margin-right:2px;'/>";
+	}
 	if(type==customTousseApplicationForm) {//自定义器械包申请单
-		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = warningImg + "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
 		if(sstsConfig.enableUrgentFunction && record.json.urgentLevel != "" ){//有背景色，白色图标加急级别
 			var colorCode = record.json.urgentLevel.colorCode;
-			cell = "<div style='background-color:"+colorCode+";'><img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a></div>";
+			cell = "<div style='background-color:"+colorCode+";'>"+warningImg+"<img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a></div>";
 		}else if(sstsConfig.enableUrgentFunction && record.json.urgent =="是" && record.json.urgentLevel == ""){//无背景色,只有黑色加急图标
-			cell = "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
+			cell = warningImg + "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 		}else{
-			cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
+			cell = warningImg + "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 		}
 	
 	
 		//cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 	} else if(type == tousseLeaseApplicationForm){//借物单
-		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = warningImg + "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else if(type == foreignPorxyApplicationForm){//外部代理灭菌单
 		//cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 		if(sstsConfig.enableUrgentFunction && record.json.urgentLevel != "" ){//有背景色，白色图标加急级别
 			var colorCode = record.json.urgentLevel.colorCode;
-			cell = "<div style='background-color:"+colorCode+";'><img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a></div>";
+			cell = "<div style='background-color:"+colorCode+";'>"+warningImg+"<img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a></div>";
 		}else if(sstsConfig.enableUrgentFunction && record.json.urgent =="是" && record.json.urgentLevel == ""){//无背景色,只有黑色加急图标
-			cell = "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
+			cell = warningImg + "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 		}else{
-			cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
+			cell = warningImg + "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 		}
 	} else {
 		if(sstsConfig.enableUrgentFunction && record.json.urgentLevel != "" ){//有背景色，白色图标加急级别
 			var colorCode = record.json.urgentLevel.colorCode;
-			cell = "<div style='background-color:"+colorCode+";'><img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a></div>";
+			cell = "<div style='background-color:"+colorCode+";'>"+warningImg+"<img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a></div>";
 		}else if(sstsConfig.enableUrgentFunction && record.json.urgent =="是" && record.json.urgentLevel == ""){//无背景色,只有黑色加急图标
-			cell = "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+			cell = warningImg + "<img src='"+WWWROOT+"/images/web/urgent-black.png' style='vertical-align: middle;width:18px;height:18px;margin-left: -5px;margin-right:2px;'/><a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 		}else{
-			cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+			cell = warningImg + "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 		}
 	}
 	return cell;
@@ -3817,7 +3822,7 @@
     top.Ext4.tip.QuickTipManager.init();
 	
 	var columns = [
-	     {header : "流水号",width : 90 * fontSizeScale,dataIndex : 'serialNumber', renderer : renderModifyFun},
+	     {header : "流水号",width : 110 * fontSizeScale,dataIndex : 'serialNumber', renderer : renderModifyFun},
 	     {header : "申请科室",width : 120 * fontSizeScale,dataIndex : 'depart',hidden:sstsConfig.hideApplyDepartColumn || isCssdUser != 'true'},
 	     {header : "结算科室",width : 120 * fontSizeScale,dataIndex : 'settleAccountsDepart',hidden:sstsConfig.hideSettleDepartColumn}, 
 	     {header : "申请人",width : 60 * fontSizeScale,dataIndex : 'applicant'},
@@ -3927,6 +3932,7 @@
 	     {name : 'id'}, 
 	     {name : 'serialNumber'}, 
 	     {name : 'applicant'},
+		 {name : 'specialInfection'},
 	     {name : 'applicationTime'}, 
 	     {name : 'submitTime'}, 
 	     {name : 'printTime'}, 
Index: ssts-web/src/main/webapp/images/web/warning.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r33909 -r33941
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 33909)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 33941)
@@ -2059,6 +2059,17 @@
 					allowBlank : true,
 					readOnly : true,
 					fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+				},{
+					xtype : 'textfield',
+					fieldLabel : '特殊感染类型',
+					flex : 1,
+					id : 'specialInfection',
+					name : 'specialInfection',
+					allowBlank : true,
+					readOnly : true,
+					hidden:true,
+					fieldCls : 'fieldReadOnlyNoRemoveAndTop',
+					anchor: '96%'
 				}]
 			},{  // 申请科室、结算科室、处理的供应室、还有一个显示修改记录按钮
 				xtype : 'container',
@@ -2619,6 +2630,12 @@
 			top.Ext4.getCmp('returnBtn').hide();
 		}
 
+		var specialInfection = recyclingApplication.specialInfection || '';
+		if(specialInfection !== ''){
+			top.Ext4.getCmp("specialInfection").setValue(specialInfection);
+			top.Ext4.getCmp('specialInfection').show();
+		}
+
 		/*appDepartJsonStore.load({
 			params: {spell: recyclingApplication.depart, departmentCode: recyclingApplication.departCoding},
 			callback: function(records, operation, success) {