Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33159 -r33167
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33159)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33167)
@@ -1195,7 +1195,13 @@
 			throw new SystemException("请扫描器械包条码！");
 		}
 		TousseInstance tousseInstance = (TousseInstance) barcodeDevice;
-		ProxyDisinfection proxyDisinfection = this.get(tousseInstance.getProxyDisinfection_id());
+		if(!DatabaseUtil.isPoIdValid(tousseInstance.getProxyDisinfection_id())){
+			throw new SystemException("未找到" + tousseInstance.getTousseDefinitionName() + "（条码" + tousseInstance.getBarcode() + "）所属的代理灭菌单");
+		}
+		String sql = " where (po.handleDepartCoding='" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode()
+				+ "' or (po.departCoding = '" + AcegiHelper.getLoginUser().getCurrentOrgUnitCode() + "' and po.isConvertPackingRecord = '" + Constants.STR_YES + "')) "
+				+ " and po.id = " + tousseInstance.getProxyDisinfection_id();
+		ProxyDisinfection proxyDisinfection = (ProxyDisinfection) this.objectDao.getBySql(ProxyDisinfection.class.getSimpleName(), sql);
 		if(proxyDisinfection == null){
 			throw new SystemException("未找到" + tousseInstance.getTousseDefinitionName() + "（条码" + tousseInstance.getBarcode() + "）所属的代理灭菌单");
 		}