Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r19599 -r19705 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19599) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19705) @@ -1953,17 +1953,19 @@ recyclingApplicationListAfterConvert.addAll(list); } - //使用记录转换申请单后对器械包录入使用记录时登记的丢失/报损记录更新tousseItemId字段值 - updateTousseMaterialErrorDamageTousseItemIdAfterConvert(useRecord , recyclingApplicationListAfterConvert); + //使用记录转换申请单后对器械包实例更新tousseItemId字段值 + updateTousseItemIdForTousseInstanceOfUseRecordAfterConvert(useRecord , recyclingApplicationListAfterConvert); } /** - * 使用记录转换申请单后对器械包录入使用记录时登记的丢失/报损记录更新tousseItemId字段值 + * 使用记录转换申请单后对器械包实例更新tousseItemId字段值 + * 考虑到敷料包及不转换的器械包也需要转换但不需要回收,所以也需要更新tousseItemId * @param useRecord * @param recyclingApplicationList */ - private void updateTousseMaterialErrorDamageTousseItemIdAfterConvert(UseRecord useRecord , List recyclingApplicationList){ - List tousseList = useRecord.getTousseInstanceWillBeConvertedAndWaitRecyclingTousseItemList(objectDao); + private void updateTousseItemIdForTousseInstanceOfUseRecordAfterConvert(UseRecord useRecord , List recyclingApplicationList){ + //查询所有将会被转换至申请单的器械包实例 + List tousseList = useRecord.getTousseInstanceWillBeConvertedTousseItemList(objectDao); if(CollectionUtils.isNotEmpty(tousseList) && CollectionUtils.isNotEmpty(recyclingApplicationList)){ for (TousseInstance tousseInstance : tousseList) { TousseDefinition td = tousseInstance.getTousseDefinition();