Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r33014 -r33018 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33014) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33018) @@ -1010,7 +1010,8 @@ // “装配记录生成”的代理灭菌单,状态为待发货时,二级供应室不可以对单据进行修改GDSZYY-102 String message = "代理灭菌单的状态为待发货,不可以对单据进行修改"; throw new SystemException(message); - }else if(tousseInstance.getProxyDisinfection_id() != null){ + }else if(proxyDisinfection != null && tousseInstance.getProxyDisinfection_id() != null + && !tousseInstance.getProxyDisinfection_id().equals(proxyDisinfection.getId())){ String message = "该器械包已经申请代理灭菌,不能重复申请。"; throw new SystemException(message); }