Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r41194 -r41236 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41194) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 41236) @@ -3017,6 +3017,14 @@ return; } + List steriliPurposeDisposableGoodsList = objectDao.findByHql("select po from " + + SteriliPurposeDisposableGoods.class.getSimpleName() + + " po where sterilizationPurposeId=" + httpOption.getId()); + if(CollectionUtils.isEmpty(steriliPurposeDisposableGoodsList)){ + //没有关联耗材,不需要校验 + return; + } + //灭菌目的耗材管理记录 CDSLQYQYYY-147 SteriliPurposeConsumeMgt steriPurposeConsumeMgt = null; List steriPurposeConsumeMgtList = objectDao.findByProperty(SteriliPurposeConsumeMgt.class.getSimpleName(), "sterilizationPurposeId", httpOption.getId()); @@ -3066,13 +3074,6 @@ } }else if(StringUtils.equals(steriPurposeConsumeMgt.getConsumptionPattern(), SteriliPurposeConsumeMgt.CONSUMPTION_PATTERN_ANY_TYPE_OF_CONSUMABLE)){ //此模式下,用户只需要登记本次灭菌目的中关联的灭菌耗材中,任意一种即可视为登记成功,允许保存灭菌记录。 - List steriliPurposeDisposableGoodsList = objectDao.findByHql("select po from " - + SteriliPurposeDisposableGoods.class.getSimpleName() - + " po where sterilizationPurposeId=" + httpOption.getId()); - if(CollectionUtils.isEmpty(steriliPurposeDisposableGoodsList)){ - //没有关联耗材,不需要校验 - return; - } //已经使用的耗材+新增的耗材,必须包含本次灭菌目的关联的灭菌耗材 List allDisposableGoodsIds = new ArrayList(); if(CollectionUtils.isNotEmpty(addDisposableGoodsIds)){