Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r36997 -r37721
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 36997)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 37721)
@@ -122,6 +122,14 @@
 	}else if(recyclingStatus == '二次回收' || recyclingStatus == '已回收' || recyclingStatus == '已提前归还'){
 		color = '#ffa500';//橙色
 	}
+	//GDSZYY-238：不需要二次回收时字段调整相应的状态显示
+	if(foreignTousseIsSecondRecycle == '否'){
+		if(recyclingStatus == '待回收' || recyclingStatus == '部分回收' || recyclingStatus == '二次回收'){
+			v = '已接收';
+			color = '#fff';
+			fontColor = "";
+		}
+	}
 	return "<p style='background-color:"+color+";color:"+fontColor+"'>" + v + "</p>";
 }
 
@@ -332,6 +340,12 @@
 		}
 	}
 
+	var recyclingStatusName = '回收状态';
+
+	if(foreignTousseIsSecondRecycle == '否'){
+		recyclingStatusName = '接收状态';
+	}
+
 	var columns = [
 	    {header : "紧急度",width : 45,dataIndex : 'urgencyNum', renderer : urgencyIconRender1,hidden:true},
 		{header : applicantName,width : 70,dataIndex : 'applicant', renderer : renderModifyFun}, 
@@ -348,7 +362,7 @@
 	    {header : surgeryName,width : 150,dataIndex : 'surgery'}, 
 		{header : "包状态",width : 100,dataIndex : 'packageStatus'}, 
 		{header : "审核状态",width : 70,dataIndex : 'reviewStatus',renderer:renderReviewStatusColor,hidden : !sstsConfig.enableReviewOfForeignTousseApplicationFunction},
-	    {header : "回收状态",width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
+	    {header : recyclingStatusName,width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
 		{header : "装配状态",width : 70,dataIndex : 'packingState',renderer:renderPackingStateColor,sortable:false,hidden:packingStateHidden},
 		{header : "灭菌状态",width : 70,dataIndex : 'sterilizationState',renderer:renderSterilizationStateColor,sortable:false,hidden:sterilizationStateHidden},
 	    {header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r36430 -r37721
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 36430)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 37721)
@@ -2047,10 +2047,19 @@
 
 function renderColor2(v, p, record){
 	var status = record.data['recyclingStatus'];
+	var type = record.data['type'];
 	var color = "";
 	if(recyclingStatusArr[0] == status){//待回收
 		color = "orange";
 	}
+	//GDSZYY-238：不需要二次回收时字段调整相应的状态显示
+	if(foreignTousseIsSecondRecycle == '否' && type == '外来器械包申请单'){
+		if(status == '待回收' || status == '部分回收' || status == '二次回收'){
+			v = '已接收';
+			color = '';
+		}
+	}
+
 	return "<p style=\"background-color:"+color+"\">" + v + "</p>";
 }
 function renderStatus(v, p, record){
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r37038 -r37721
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 37038)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 37721)
@@ -55,6 +55,9 @@
 	request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
 	boolean isEnableTousseOpRecipient = sysParamsObj.getIsEnableTousseOpRecipient();
 	boolean isEnableTousseOpDestLocation = sysParamsObj.getIsEnableTousseOpDestLocation();
+
+	String foreignTousseIsSecondRecycle = sysParamsObj.getForeignTousseIsSecondRecycle();
+	request.setAttribute("foreignTousseIsSecondRecycle", foreignTousseIsSecondRecycle);
 %>
 <html>
 <head>
@@ -159,6 +162,7 @@
 	var profile = '${profile}';
 	var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>';
 	var isEnableTousseOpRecipient = '<%=isEnableTousseOpRecipient%>';
+	var foreignTousseIsSecondRecycle = '<%=foreignTousseIsSecondRecycle%>';
 </script>
 <%@ include file="/disinfectsystem/print/print.jsp"%>
 <!--[if !IE]><!--> 
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r37063 -r37721
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 37063)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 37721)
@@ -96,6 +96,9 @@
     request.setAttribute("isCssdUser", isCssdUser);
 	boolean isEnableTousseOpDestLocation = sysParamsObj.getIsEnableTousseOpDestLocation();
 	boolean isEnableTousseOpRecipient = sysParamsObj.getIsEnableTousseOpRecipient();
+
+	String foreignTousseIsSecondRecycle = sysParamsObj.getForeignTousseIsSecondRecycle();
+	request.setAttribute("foreignTousseIsSecondRecycle", foreignTousseIsSecondRecycle);
 %>
 <html>
 <head>
@@ -526,6 +529,7 @@
 var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>';
 var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>';
 var isEnableTousseOpRecipient = '<%=isEnableTousseOpRecipient%>';
+var foreignTousseIsSecondRecycle = '<%=foreignTousseIsSecondRecycle%>';
 </script>
 <%--多选下拉框--%>
 <script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js?version=${svnRevision}"></script>