Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r15899 -r15902 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15899) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15902) @@ -1455,7 +1455,10 @@ if(data.has("invoicePlanID")){ vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong()); } - vo.setProxyDisinfection_id(data.get("proxyDisinfection_id").getAsLong()); + JsonElement proxyDisinfection_idJsonElement = data.get("proxyDisinfection_id"); + if(!proxyDisinfection_idJsonElement.isJsonNull()){ + vo.setProxyDisinfection_id(proxyDisinfection_idJsonElement.getAsLong()); + } vo.setPrice(String.valueOf(data.get("price").getAsDouble())); vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble())); JsonElement ele = data.get("sterileEndTime"); @@ -1491,7 +1494,10 @@ if(data.has("invoicePlanID")){ vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong()); } - vo.setProxyDisinfection_id(data.get("proxyDisinfection_id").getAsLong()); + JsonElement proxyDisinfection_idJsonElement = data.get("proxyDisinfection_id"); + if(!proxyDisinfection_idJsonElement.isJsonNull()){ + vo.setProxyDisinfection_id(proxyDisinfection_idJsonElement.getAsLong()); + } vo.setPrice(String.valueOf(data.get("price").getAsDouble())); vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble())); JsonElement ele = data.get("sterileEndTime");