Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r16031 -r16033 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16031) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 16033) @@ -6624,7 +6624,14 @@ invoicePrintVo.setSpecification(materialJson.getString("materialStr")); invoicePrintVo.setSterilizerName(tousseInstance.getSterilizerName()); invoicePrintVo.setFrequency(tousseInstance.getSterileFrequency()); - invoicePrintVo.setRecyclingAmount(recycleAmountMap.get(tousseDefinition.getAncestorID())); + + if(tousseDefinition.applyEntireTousse()){ + invoicePrintVo.setRecyclingAmount(recycleAmountMap.get(tousseDefinition.getAncestorID())); + }else{ + int recyclingAmount = MathTools.mul(materialJson.getInt("totalAmout"), recycleAmountMap.get(tousseDefinition.getAncestorID())).intValue(); + invoicePrintVo.setRecyclingAmount(recyclingAmount); + } + invoicePrintVo.setSendDate(invoice.getSendTime()); if(tousseDefinition.applyEntireTousse()){ invoicePrintVo.setPrice(materialJson.getDouble("totalPrice"));