Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r22039 -r22091 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22039) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22091) @@ -1347,6 +1347,19 @@ } /** + * 灭完菌以后,更新包的失效日期 (灭菌时间+包定义的过期时间=失效日期) + * @param tousseInsId 包ID + * @param sterilizationDate 灭菌日期 + * @return + */ + @SuppressWarnings("unused") + private Date updateTousseInsValidUntil(Long tousseInsId,Date sterilizationDate){ + return null; + } + + + + /** * 计算并更新灭菌记录的器械统计信息.. * @param sterilizationRecord 灭菌记录 * @param tis 器械包实例集合 @@ -2773,7 +2786,7 @@ if (isReviewed) { boolean isOutBasket = tousseInstanceManager.isTousseInstanceOutOfBasket(tousseInstance.getId()); //没入灭菌篮筐 - if (isOutBasket) { + if (isOutBasket || tousseInstanceManager.isCountBarcode(barcode)) { //不追溯的器械包(含普通器械包、敷料包、外部代理灭菌包) if (!StringUtils.equals(Constants.STR_YES, tousseInstance.getTousseDefinition().getIsTraceable())) { //if (tousseInstance.getUnTraceableTousse()) { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r22084 -r22091 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22084) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 22091) @@ -1142,7 +1142,7 @@ //增加空对象或空集合的判断,防止空指针异常报错 if(CollectionUtils.isNotEmpty(excludeBarcodes)){ tousseInstanceBarcodes = CollectionUtils.subtract( - tousseInstanceBarcodes, excludeBarcodes); + bList, excludeBarcodes); } if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){