Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r34886 -r34888 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34886) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 34888) @@ -3419,7 +3419,8 @@ } if(foreignTousseApplication != null){ - if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){ + if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus()) + || InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE.equals(foreignTousseApplication.getRecyclingStatus())){ String recyclingStatus = calculateForeignTousseTwoRecyclingtimesRecyclingStatus(foreignTousseApplication); foreignTousseApplication.setRecyclingStatus(recyclingStatus); foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_RECYCLED); @@ -3455,7 +3456,8 @@ //转换申请单后不做二次回收时,外来器械包包状态由“已使用”转换为“待归还”HBTSGRYY-11 tousseItem.setPackageStatus(ForeignTousseApplication.APPLICATION_STATUS_TOBERETURNED); } - if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){ + if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus()) + || InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE.equals(foreignTousseApplication.getRecyclingStatus())){ String recyclingStatus = calculateForeignTousseTwoRecyclingtimesRecyclingStatus(foreignTousseApplication); foreignTousseApplication.setRecyclingStatus(recyclingStatus); foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_RECYCLED);