Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r34867 -r34879 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34867) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34879) @@ -4947,8 +4947,11 @@ }else{ recyclingStatus = InvoicePlan.RECYCLINGSTATUS_RECYCLED; if(invoicePlan.isForeignTousseAppliaction()){ - //外来器械包申请单回收状态为"已接收" - recyclingStatus = InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED; + //外来器械包申请单回收状态为"已接收","待接收"、"部分接收"的外来器械包申请单需要修改回收状态 + if(StringUtils.equals(invoicePlan.getRecyclingStatus(), InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE) + || StringUtils.equals(invoicePlan.getRecyclingStatus(), InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE)){ + recyclingStatus = InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED; + } } } } else { @@ -4959,6 +4962,7 @@ recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE; } } + invoicePlan.setRecyclingStatus(recyclingStatus); } /*计算回收状态*/