Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29578 -r29605 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29578) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29605) @@ -2597,7 +2597,10 @@ containTousseInstance = true; invoice.setUrgent(Constants.STR_YES); } - totalPrice = MathTools.add(totalPrice, td.getPrice()).doubleValue(); + //包实例价格及折扣价 + Double tousseInstancePrice = tousseInstance.getPrice(); + Double tousseInstanceDiscountPrice = tousseInstance.getDiscountPrice(); + totalPrice = MathTools.add(totalPrice, tousseInstance.getPrice()).doubleValue(); InvoiceItem item = map.get(tousseInstance.getTousseName()); if (item == null) { item = new InvoiceItem(); @@ -2607,9 +2610,13 @@ item.setDiposable("否"); item.setTousseType(td.getTousseType()); item.setAmount(1); + item.setSettlementPrice(tousseInstancePrice); + item.setSettlementDiscountPrice(tousseInstanceDiscountPrice); map.put(item.getTousseName(), item); } else { item.setAmount(item.getAmount() + 1); + item.setSettlementPrice(MathTools.add(item.getSettlementPrice(), tousseInstancePrice).doubleValue()); + item.setSettlementDiscountPrice(MathTools.add(item.getSettlementDiscountPrice(), tousseInstanceDiscountPrice).doubleValue()); } // 普通器械包 if (TousseDefinition.PACKAGE_TYPE_INSIDE.equals(tousseInstance