Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r33220 -r33221 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33220) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33221) @@ -886,11 +886,6 @@ boolean receiveTousseNotCheckSterilizationMode = false; ProxyDisinfection proxyDisinfection = this.get(proxyDisinfectionId); - // 代理灭菌单是否待接收 - boolean isAwaitReceive = false; - if(proxyDisinfection != null){ - isAwaitReceive = !proxyDisinfection.hasReceived(); - } if (StringUtils.isNotBlank(barcode)) { BarcodeDevice barcodeDevice = barcodeManager @@ -906,8 +901,7 @@ } if(proxyDisinfection != null - && StringUtils.equals(proxyDisinfection.getHandleDepartCoding(), AcegiHelper.getCurrentOrgUnitCode()) - && isAwaitReceive){ + && StringUtils.equals(proxyDisinfection.getHandleDepartCoding(), AcegiHelper.getCurrentOrgUnitCode())){ if(isProxyed){ if(tousseInstance.getProxyDisinfection_id().equals(Long.valueOf(proxyDisinfectionId))){ // 核对器械包实例GDSZYY-102(一级供应室用户登录,打开待接收的代理灭菌,扫描了单上已经存在的物品时,就是审核物品) @@ -954,11 +948,6 @@ // 验证器械包状态(已装配或已审核) message = "只能录入已装配或者已审核的器械包"; throw new SystemException(message); - }else if(proxyDisinfection != null && StringUtils.equals(proxyDisinfection.getIsConvertPackingRecord(), Constants.STR_YES) - && proxyDisinfection.hasReceived()){ - // “装配记录生成”的代理灭菌单,接收状态为已接收时,二级供应室不可以再对单据进行修改GDSZYY-102 - message = "代理灭菌单的接收状态为已接收,不可以对单据进行修改"; - throw new SystemException(message); }else{ if(isProxyed){ message = "该器械包已经申请代理灭菌,不能重复申请。";