Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r15906 -r15910
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15906)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 15910)
@@ -86,6 +86,7 @@
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.DateJsonValueProcessor;
+import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.json.JsonPropertyFilter;
 import com.forgon.tools.string.StringTools;
 import com.google.gson.Gson;
@@ -1450,13 +1451,8 @@
 			if(vo.getTousseFixedBarcode()){
 				vo.setStorage(data.get("stockForFixedBarcode").getAsString());
 			}
-			if(data.has("invoicePlanID")){
-				vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong());
-			}
-			JsonElement proxyDisinfection_idJsonElement = data.get("proxyDisinfection_id");
-			if(!proxyDisinfection_idJsonElement.isJsonNull()){
-				vo.setProxyDisinfection_id(proxyDisinfection_idJsonElement.getAsLong());
-			}
+			vo.setInvoicePlanID(JSONUtil.optLong(data,"invoicePlanID",null));
+			vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
 			vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
 			vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble()));
 			JsonElement ele = data.get("sterileEndTime");
@@ -1489,13 +1485,8 @@
 				vo.setShowTousseName(data.get("showTousseName").getAsString());
 				vo.setStorage("1");
 				vo.setTousseType(data.get("tousseType").getAsString());
-				if(data.has("invoicePlanID")){
-					vo.setInvoicePlanID(data.get("invoicePlanID").getAsLong());
-				}
-				JsonElement proxyDisinfection_idJsonElement = data.get("proxyDisinfection_id");
-				if(!proxyDisinfection_idJsonElement.isJsonNull()){
-					vo.setProxyDisinfection_id(proxyDisinfection_idJsonElement.getAsLong());
-				}
+				vo.setInvoicePlanID(JSONUtil.optLong(data,"invoicePlanID",null));
+				vo.setProxyDisinfection_id(JSONUtil.optLong(data,"proxyDisinfection_id",null));
 				vo.setPrice(String.valueOf(data.get("price").getAsDouble()));
 				vo.setFluctuationPrice(String.valueOf(data.get("fluctuationPrice").getAsDouble()));
 				JsonElement ele = data.get("sterileEndTime");