Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r31122 -r31123
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31122)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31123)
@@ -1252,8 +1252,9 @@
 		dataJSONObject.put("barcode", tousseInstanceJSONObject.optString("barcode"));
 		dataJSONObject.put("fluctuationPrice", tousseInstanceJSONObject.optDouble("fluctuationPrice"));
 		dataJSONObject.put("price", tousseInstanceJSONObject.optDouble("price"));
-		dataJSONObject.put("location", tousseInstanceJSONObject.optString("location"));
-		dataJSONObject.put("locationForDisplay", tousseInstanceJSONObject.optString("locationForDisplay"));
+		//位置默认取二次发货的两个位置字段,没有二次发货则取一次发货后的位置
+		dataJSONObject.put("location", StringUtils.defaultIfBlank(tousseInstanceJSONObject.optString("location_2"), tousseInstanceJSONObject.optString("location")));
+		dataJSONObject.put("locationForDisplay", StringUtils.defaultIfBlank(tousseInstanceJSONObject.optString("locationForDisplay2"), tousseInstanceJSONObject.optString("locationForDisplay")));
 		dataJSONObject.put("settleAccountsDepart", tousseInstanceJSONObject.optString("settleAccountsDepart"));
 		dataJSONObject.put("settleAccountsDepartCode", tousseInstanceJSONObject.optString("settleAccountsDepartCode"));
 		//因为pda的TousseInstance定义的结算科室字段名为settleAccountsDepartCoding,所以多增加返回一个结算科室编码的属性