Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16059 -r16068 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16059) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16068) @@ -235,7 +235,7 @@ //状态为已装配或已审核的器械包实例将不扣减库存,包实例关联的篮筐实例属性清空 if(tousseInstance.isPacked() || tousseInstance.isReviewed() || tousseInstance.isSteriling()){ - tousseInstance.setReviewBasket_id(null); +// tousseInstance.setReviewBasket_id(null); tousseInstance.setStatus(TousseInstance.STATUS_DISCARD); objectDao.saveOrUpdate(tousseInstance); continue; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16066 -r16068 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16066) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16068) @@ -1104,14 +1104,17 @@ continue; } TousseInstance tousseInstance = (TousseInstance) barcodeDevice; - // 设置器械包位置 - if(barcodePositionMap != null){ - String positoin = barcodePositionMap.get(barcode); - if(StringUtils.isNotBlank(positoin)){ - tousseInstance.setSterilizerPosition(positoin); + //只有已审核的包才能入到灭菌记录中 + if(tousseInstance.isReviewed()){ + // 设置器械包位置 + if(barcodePositionMap != null){ + String positoin = barcodePositionMap.get(barcode); + if(StringUtils.isNotBlank(positoin)){ + tousseInstance.setSterilizerPosition(positoin); + } } + tousseInstanceList.add(tousseInstance); } - tousseInstanceList.add(tousseInstance); } sterilizationRecord.setTousseInstanceList(tousseInstanceList);