Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.jsp
===================================================================
diff -u -r12331 -r27105
--- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.jsp	(.../recallRecordView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.jsp	(.../recallRecordView.jsp)	(revision 27105)
@@ -25,6 +25,7 @@
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"></link>
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="recallRecordView.js"></script>
 <script type="text/javascript" src="recallDiposableGoods.js"></script>
 
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
===================================================================
diff -u -r26738 -r27105
--- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java	(.../RecallRecordManagerImpl.java)	(revision 26738)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java	(.../RecallRecordManagerImpl.java)	(revision 27105)
@@ -426,7 +426,8 @@
 					tousseInstanceJsonObject.put("sterileEndTime",tousseVOGroupByBarcode.getSterileEndTime());
 					tousseInstanceJsonObject.put("sterileFrequency",tousseVOGroupByBarcode.getSterileFrequency());
 					tousseInstanceJsonObject.put("objAmount",tousseVOGroupByBarcode.getTousseAmount());
-					
+					//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+					tousseInstanceJsonObject.put("location2",tousseVOGroupByBarcode.getLocation2());
 					//(GGSRMYY-94 器械包召回功能的改进)
 					tousseInstanceJsonObject.put("patientName",tousseVOGroupByBarcode.getPatientName());
 					tousseInstanceJsonObject.put("patientNumber",tousseVOGroupByBarcode.getPatientNumber());
@@ -483,6 +484,8 @@
 						tousseInstanceVO.setStatus(instance.getStatus());
 						tousseInstanceVO.setSterileEndTime(instance.getSterileEndTime());
 						tousseInstanceVO.setSterileFrequency(instance.getSterileFrequency());
+						//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+						tousseInstanceVO.setLocation2(instance.getLocation2());
 						tousseInstanceMap.put(instance.getBarcode(), tousseInstanceVO);
 						//设置使用的病人信息(GGSRMYY-94 器械包召回功能的改进)
 						if(useRecord != null){
@@ -500,6 +503,8 @@
 						tousseInstanceVO.setStatus(instance.getStatus());
 						tousseInstanceVO.setSterileEndTime(instance.getSterileEndTime());
 						tousseInstanceVO.setSterileFrequency(instance.getSterileFrequency());
+						//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+						tousseInstanceVO.setLocation2(instance.getLocation2());
 						//设置使用的病人信息(GGSRMYY-94 器械包召回功能的改进)
 						if(useRecord != null){
 							tousseInstanceVO.setPatientName(useRecord.getPatientName());
@@ -520,6 +525,8 @@
 						tousseInstanceVO.setStatus(instance.getStatus());
 						tousseInstanceVO.setSterileEndTime(instance.getSterileEndTime());
 						tousseInstanceVO.setSterileFrequency(instance.getSterileFrequency());
+						//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+						tousseInstanceVO.setLocation2(instance.getLocation2());
 						//设置使用的病人信息(GGSRMYY-94 器械包召回功能的改进)
 						if(useRecord != null){
 							tousseInstanceVO.setPatientName(useRecord.getPatientName());
@@ -537,6 +544,8 @@
 						tousseInstanceVO.setStatus(instance.getStatus());
 						tousseInstanceVO.setSterileEndTime(instance.getSterileEndTime());
 						tousseInstanceVO.setSterileFrequency(instance.getSterileFrequency());
+						//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+						tousseInstanceVO.setLocation2(instance.getLocation2());
 						//设置使用的病人信息(GGSRMYY-94 器械包召回功能的改进)
 						if(useRecord != null){
 							tousseInstanceVO.setPatientName(useRecord.getPatientName());
Index: ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js
===================================================================
diff -u -r26738 -r27105
--- ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 26738)
+++ ssts-web/src/main/webapp/disinfectsystem/recallRecord/recallRecordView.js	(.../recallRecordView.js)	(revision 27105)
@@ -148,13 +148,19 @@
 	        dataIndex : 'departName'
 	    },{
 	        header : '状态',
-	        width : 150,
+	        width : 100,
 	        dataIndex : 'status'
 	    },{
 	    	header : '数量',
-	    	width : 90,
+	    	width : 50,
 	    	dataIndex : 'objAmount'
 	    },{
+	    	header : '流转位置',
+	    	width : 90,
+	    	dataIndex : 'location2',
+	    	//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+	    	hidden : !sstsConfig.enableSurgicalInstrumentsManagement
+	    },{
 	    	header : '病人名称',
 	    	width : 110,
 	    	dataIndex : 'patientName'
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r26914 -r27105
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 26914)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 27105)
@@ -210,7 +210,7 @@
 	 */
 	private String departCoding2;
 	/**
-	 * 手术仪器管理位置,仓库或者手术间名称
+	 * 手术仪器管理位置,仓库或者手术间名称.即器械包信息页面的流转位置
 	 */
 	private String location2;
 	/**
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recall/RecallTousseInstanceVO.java
===================================================================
diff -u -r26738 -r27105
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recall/RecallTousseInstanceVO.java	(.../RecallTousseInstanceVO.java)	(revision 26738)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recall/RecallTousseInstanceVO.java	(.../RecallTousseInstanceVO.java)	(revision 27105)
@@ -1,7 +1,5 @@
 package com.forgon.disinfectsystem.entity.recall;
 
-import org.apache.commons.lang.StringUtils;
-
 import com.forgon.security.tools.CssdUtils2;
 
 /**
@@ -61,6 +59,12 @@
 	 */
 	private String operationTime;
 
+	/**
+	 * GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+	 * 器械包实例流转位置-手术仪器功能
+	 */
+	private String location2;
+
 	public String getBarcode() {
 		return barcode;
 	}
@@ -145,4 +149,12 @@
 		this.operationTime = operationTime;
 	}
 
+	public String getLocation2() {
+		return location2;
+	}
+
+	public void setLocation2(String location2) {
+		this.location2 = location2;
+	}
+
 }
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java
===================================================================
diff -u -r26738 -r27105
--- ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java	(.../RecallRecordAction.java)	(revision 26738)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java	(.../RecallRecordAction.java)	(revision 27105)
@@ -39,6 +39,7 @@
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
@@ -396,24 +397,34 @@
 	            	    sheetNum=length/sheetSize;
 	            	}
 	            	//需导出的列头定义(与器械包信息页面列表保持一致)-(GGSRMYY-94 器械包召回功能的改进)
-	            	String ss[] = {"科室名称","器械包名称","条码","状态","病人名称","住院号/诊疗号","手术时间"};
+	            	String[] ss = new String[]{"科室名称","器械包名称","条码","状态","病人名称","住院号/诊疗号","手术时间"};
+	            	//如果启用了手术仪器管理配置项,则增加导出流转位置列(GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示)
+	            	if(CssdUtils.getSystemSetConfigByNameBool("enableSurgicalInstrumentsManagement")){
+	            		ss = new String[]{"科室名称","器械包名称","条码","状态","流转位置","病人名称","住院号/诊疗号","手术时间"};
+	            	}
 	            	Label label;
-	            	//循环sheet数量
+	            	//循环sheet数量(每个工作簿最多只存放60000条数据)
 	            	for(int kk=0;kk<sheetNum;kk++){
 	            	   // 生成名为"器械包信息"的工作表，参数0表示这是第一页
 	                   WritableSheet ws=book.createSheet(("sheet"+(kk+1)),kk); 
 	                   //设定第一行的行高
 	                   ws.setRowView(0,320);
+	                   //列头的列序号
+	                   int headColumnIndex = 0;
 	                   //将第一列的宽度设为20
-	                   ws.setColumnView(0,30);
-	                   ws.setColumnView(1,40);
-	                   ws.setColumnView(2,20);
-	                   ws.setColumnView(3,20);
+	                   ws.setColumnView(headColumnIndex++,30);
+	                   ws.setColumnView(headColumnIndex++,40);
+	                   ws.setColumnView(headColumnIndex++,20);
+	                   ws.setColumnView(headColumnIndex++,20);
+	                   //GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+	                   if(CssdUtils.getSystemSetConfigByNameBool("enableSurgicalInstrumentsManagement")){
+	                	   ws.setColumnView(headColumnIndex++,20);
+	                   }
 	                   
 	                   //(GGSRMYY-94 器械包召回功能的改进)
-	                   ws.setColumnView(4,20);
-	                   ws.setColumnView(5,20);
-	                   ws.setColumnView(6,20);
+	                   ws.setColumnView(headColumnIndex++,20);
+	                   ws.setColumnView(headColumnIndex++,20);
+	                   ws.setColumnView(headColumnIndex++,20);
 	                   
 	                   //增加召回条件说明的行
 	                   WritableFont arial14pt = new WritableFont(WritableFont.ARIAL,11, WritableFont.BOLD);
@@ -431,7 +442,7 @@
 			               label = new Label(i, 1, ss[i], arial12format);
 			               ws.addCell(label);
 		               }
-		               
+		               //循环取每个sheet对应的每个包实例
 		               for(int i = kk*sheetSize; i< (kk+1)*sheetSize ; i++ ){
 		                     if(i<length ){
 		                    	TousseInstance tousseInstance = (TousseInstance) tousseList.get(i);
@@ -448,20 +459,39 @@
 		         						operationTime = useRecord.getOperationTimeStr();
 		         					}
 		         				}
-		                    	 for (int j = 0; j < 8; j++) {
+
+		                    	 for (int j = 0; j < ss.length; j++) {
+		                    		 //是否已匹配
+		                    		 boolean matched = false;
 			                        switch(j){
-			                        	case 0:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getLocationForDisplay());break;
-			                            case 1:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getTousseName());break;
-			                            case 2:label=new  Label(j,i+2-(kk*sheetSize), tousseInstance.getBarcode());break;
-			                            case 3:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getStatus());break;
-			                            
-			                            //使用记录相关的的三个字段(GGSRMYY-94 器械包召回功能的改进)
-			                            case 4:label=new  Label(j, i+2-(kk*sheetSize), patientName);break;
-			                            case 5:label=new  Label(j,i+2-(kk*sheetSize), patientNumber);break;
-			                            case 6:label=new  Label(j, i+2-(kk*sheetSize), operationTime);break;
-			                            default:label=new Label(j,i+2-(kk*sheetSize),"");
-			                           
+			                        	case 0:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getLocationForDisplay());matched = true;break;
+			                            case 1:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getTousseName());matched = true;break;
+			                            case 2:label=new  Label(j,i+2-(kk*sheetSize), tousseInstance.getBarcode());matched = true;break;
+			                            case 3:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getStatus());matched = true;break;
+			                            default:break;
 			                        }
+			                        if(!matched){
+			                        	//GGSRMYY-109 召回信息模块召回物品列表增加流转位置显示
+				                        if(CssdUtils.getSystemSetConfigByNameBool("enableSurgicalInstrumentsManagement")){
+				                        	switch(j){
+				                        		case 4:label=new  Label(j, i+2-(kk*sheetSize), tousseInstance.getLocation2());break;
+					                            //使用记录相关的的三个字段(GGSRMYY-94 器械包召回功能的改进)
+					                            case 5:label=new  Label(j, i+2-(kk*sheetSize), patientName);break;
+					                            case 6:label=new  Label(j,i+2-(kk*sheetSize), patientNumber);break;
+					                            case 7:label=new  Label(j, i+2-(kk*sheetSize), operationTime);break;
+					                            default:label=new Label(j,i+2-(kk*sheetSize),"");
+					                           
+					                        }
+				                        }else{
+				                        	switch(j){
+					                            //使用记录相关的的三个字段(GGSRMYY-94 器械包召回功能的改进)
+					                            case 4:label=new  Label(j, i+2-(kk*sheetSize), patientName);break;
+					                            case 5:label=new  Label(j,i+2-(kk*sheetSize), patientNumber);break;
+					                            case 6:label=new  Label(j, i+2-(kk*sheetSize), operationTime);break;
+					                            default:label=new Label(j,i+2-(kk*sheetSize),"");
+					                        }
+				                        }
+			                        }
 			                        ws.addCell(label);
 		                    	}
 		                     }else{