Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r36327 -r36332
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 36327)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 36332)
@@ -2589,6 +2589,10 @@
                     		"化学监测结果","外来器械归还时间"
                     		};
                     Label label;
+                    //位置科室名称map
+                    Map<String, String> locationMap = this.loadLocationCodeAndNameMap(tousseList);
+                    //仓库名称map
+                    Map<Long, String> wareHouseMap = this.loadWareHouseIdAndNameMap(tousseList);
                     //循环sheet数量
                     for(int kk=0;kk<sheetNum;kk++){
                         // 生成名为"器械包信息"的工作表，参数0表示这是第一页
@@ -2631,10 +2635,6 @@
                            ws.addCell(label);
                        }
                        
-                       //位置科室名称map
-                       Map<String, String> locationMap = this.loadLocationCodeAndNameMap(tousseList);
-                       //仓库名称map
-                       Map<Long, String> wareHouseMap = this.loadWareHouseIdAndNameMap(tousseList);
                        for(int i = kk*sheetSize; i< (kk+1)*sheetSize ; i++ ){
                              if(i<length ){
                                  TousseInstance tousseInstance = tousseList.get(i);
@@ -3475,12 +3475,11 @@
     	}*/
     	//有二次发货，验证二次发货的位置
     	String location = tousseInstance.getFinalLocation();
-    	String locationForDisplay = tousseInstance.loadFinalLocationForDisplay(objectDao);
     	
     	boolean notValidateLocationWhenSignTousse = ConfigUtils.getSystemSetConfigByNameBool("notValidateLocationWhenSignTousse");
     	if (StringUtils.isNotBlank(location) && 
     			!StringUtils.equals(signerOrgUnitCoding , location) && !notValidateLocationWhenSignTousse) {
-    		throw new RuntimeException(tousseInstance.getTousseName() + "属于" + locationForDisplay + "，不能被签收");
+    		throw new RuntimeException(tousseInstance.getTousseName() + "属于" + tousseInstance.loadFinalLocationForDisplay(objectDao) + "，不能被签收");
     	} else {
     		if (StringUtils.isNotBlank(tousseInstance
     				.getSignedUser())) {