Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r36989 -r36991 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 36989) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 36991) @@ -5361,7 +5361,9 @@ if(recyclingAllowsSaveOfNonBasketDisinfectionTousse && enablePartRecycle && !CollectionUtils.matchesAll(needRecycleTousseItemsExcludeTerminated, recycledPredOfAmount)){ recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE; - if(invoicePlan.isForeignTousseAppliaction() && InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(invoicePlan.getDeliverStatus())){ + if(invoicePlan.isForeignTousseAppliaction() && + (InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(invoicePlan.getDeliverStatus()) + || InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(invoicePlan.getDeliverStatus()))){ //外来器械包申请单回收状态为"部分接收" recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE; } @@ -5380,7 +5382,9 @@ } else { // 其他情况为部分回收 recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE; - if(invoicePlan.isForeignTousseAppliaction() && InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(invoicePlan.getDeliverStatus())){ + if(invoicePlan.isForeignTousseAppliaction() && + (InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(invoicePlan.getDeliverStatus()) + || InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(invoicePlan.getDeliverStatus()))){ //外来器械包申请单回收状态为"部分接收" recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE; }