Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r26915 -r26920
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 26915)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 26920)
@@ -6137,7 +6137,8 @@
 								}
 							}else{
 								//判断包实例所在位置与当前用户所在科室是否一致
-								if(StringUtils.equals(currentOrgUnitCode, ti.getLocation())){
+								String location_2 = ti.getLocation_2();
+								if(StringUtils.equals(currentOrgUnitCode, ti.getLocation()) || StringUtils.equals(currentOrgUnitCode, location_2)){
 									String validUntilStr = ti.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD);
 									String tousseDefinitionName = "";
 									String tousseType = "";
@@ -6154,8 +6155,13 @@
 									obj.put("packageType", ti.getPackageType());
 									obj.put("validUntil", validUntilStr);
 									obj.put("status", ti.getStatus());
-									obj.put("location",ti.getLocation());
-									obj.put("locationForDisplay",ti.getLocationForDisplay());
+									if(StringUtils.isNotBlank(location_2)){
+										obj.put("location",ti.getLocation_2());
+										obj.put("locationForDisplay",ti.getLocationForDisplay2());
+									}else{
+										obj.put("location",ti.getLocation());
+										obj.put("locationForDisplay",ti.getLocationForDisplay());
+									}
 									obj.put("materials", null);
 									obj.put("foreignTousseApp_id",ti.getForeignTousseApp_id());
 									obj.put("tousseType", tousseType);