Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33019 -r33020
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33019)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33020)
@@ -651,8 +651,13 @@
 	@Override
 	public ProxyDisinfection getProxyDisinfectionBySerialNumber(String serialNumber){
 		if(StringUtils.isNotBlank(serialNumber)){
-			return (ProxyDisinfection) objectDao.getByProperty(
-					ProxyDisinfection.class.getSimpleName(), "serialNumber", serialNumber);
+			String sql = " where (po.handleDepartCoding='" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode() 
+					+ "' or (po.departCoding = '" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode() + "' and po.isConvertPackingRecord = '" + Constants.STR_YES + "'))"
+							+ " and po.serialNumber = '" + serialNumber + "'";
+			List<ProxyDisinfection> list = objectDao.findBySql(ProxyDisinfection.class.getSimpleName(), sql);
+			if(CollectionUtils.isNotEmpty(list)){
+				return list.get(0);
+			}
 		}
 		return null;
 	}