Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r32991 -r32993 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32991) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 32993) @@ -947,6 +947,11 @@ // 本科室装配的器械包,无需录入代理灭菌记录;代理灭菌单的申请科室和处理科室不能一样 String message = "此器械包为本科室装配,无需录入代理灭菌记录"; throw new SystemException(message); + }else if(proxyDisinfection != null && StringUtils.isNotEmpty(tousseInstance.getOrgUnitCoding()) + && !StringUtils.equals(proxyDisinfection.getDepartCoding(), tousseInstance.getOrgUnitCoding())){ + // 只能录入属于代理灭菌单申请科室的器械包 + String message = "该器械包属于" + tousseInstance.getOrgUnitName() + ",只能录入属于" + proxyDisinfection.getDepart() + "的器械包"; + throw new SystemException(message); }else if(!tousseInstance.isPacked() && !tousseInstance.isReviewed()){ // 验证器械包状态(已装配或已审核) String message = "只能录入已装配或者已审核的器械包";