Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r29357 -r29442 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 29357) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 29442) @@ -9356,8 +9356,8 @@ if (tempVo != null) { tempVo.setAmount(tempVo.getAmount() + 1); - tempVo.setTotalPrice(tempVo.getTotalPrice() - + tousseInstance.getPrice()); + tempVo.setTotalPrice((tempVo.getTotalPrice() == null ? 0 : tempVo.getTotalPrice()) + + (tousseInstance.getPrice() == null ? 0 : tousseInstance.getPrice())); } else { String expireDateStr = tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD); @@ -9374,7 +9374,7 @@ tempVo.setBatchNumber(sterilizationdate); tempVo.setExpireDate(expireDateStr); tempVo.setSterilizerName(sterilizerName); - tempVo.setTotalPrice(tousseInstance.getPrice()); + tempVo.setTotalPrice(tousseInstance.getPrice() == null ? 0 : tousseInstance.getPrice()); tempVo.setSupplierName(tousseDefinition.getSupplierName()); voList.add(tempVo); }