Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_release.apk
===================================================================
diff -u -r31086 -r31103
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r31086 -r31103
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31086)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31103)
@@ -1235,6 +1235,8 @@
 		dataJSONObject.put("locationForDisplay", locationForDisplay);
 		dataJSONObject.put("settleAccountsDepart", settleAccountsDepart);
 		dataJSONObject.put("settleAccountsDepartCode", settleAccountsDepartCode);
+		//因为pda的TousseInstance定义的结算科室字段名为settleAccountsDepartCoding,所以多增加返回一个结算科室编码的属性
+		dataJSONObject.put("settleAccountsDepartCoding", settleAccountsDepartCode);
 		return dataJSONObject;
 	}
 
@@ -3700,7 +3702,7 @@
 	
 	private static final ExclusionStrategy exclusionStrategyForReturnGoodsRecord = new ExclusionStrategy() {
 		// 白名单
-		final String[] includedFieldNames = {"operator", "returnOfPeople", "depart","returnTime","returnGoodsItems"};
+		final String[] includedFieldNames = {"operator", "returnOfPeople", "depart","settleAccountsDepart","returnTime","returnGoodsItems"};
 		final String[] includedFieldNamesOfItem = {"tousseName", "amount", "fluctuationPrice","isDelivery","isPacking","diposableGoodBatchStock", "tousseInstanceList"};
 		final String[] includedFieldNamesOfDiposableGoodBatchStock = {"barcode", "batchNumber"};
 		final String[] includedFieldNamesOfTousseInstance = {"barcode"};
@@ -4103,16 +4105,17 @@
 		for(ReturnGoodsItem item : returnGoodsRecord.getReturnGoodsItems()){
 			List<TousseInstance> newList = new ArrayList<TousseInstance>();
 			int currentAmount = 0;
-			Double definitionPrice  = 0D;
 			Double price  = 0D;
 			Double fluctuationPrice  = 0D;
-			Double settlementFluctuationPrice  = 0D;
 			Integer tousseAmount = 0;
+			BigDecimal settlementFluctuationPrice = new BigDecimal(0.00);
+			BigDecimal settlementPrice = new BigDecimal(0.00);
 			for(TousseInstance originalTi : item.getTousseInstanceList()){
 				TousseInstance tousseInstance = 
 						tousseInstanceManager.getTousseInstanceByBarcode(originalTi.getBarcode());
 				newList.add(tousseInstance);
-				settlementFluctuationPrice += tousseInstance.getFluctuationPrice();
+				settlementFluctuationPrice = settlementFluctuationPrice.add(MathTools.mul(tousseInstance.getFluctuationPrice(), 1));
+				settlementPrice = settlementPrice.add(MathTools.mul(tousseInstance.getPrice(), 1));
 				TousseDefinition td = tousseInstance.getTousseDefinition();
 				tousseAmount = td.getTousseAmount();
 				price = td.getPrice();
@@ -4127,12 +4130,12 @@
 			//数量
 			item.setAmount(currentAmount);
 			//单价
-			item.setPrice(definitionPrice);
+			item.setPrice(settlementPrice.doubleValue()/currentAmount);
 			// 统计方式
 			item.setMaterialAmount(tousseAmount);
 			item.setPrice(price);
 			item.setFluctuationPrice(fluctuationPrice);
-			item.setSettlementPrice(new BigDecimal(settlementFluctuationPrice));
+			item.setSettlementPrice(settlementFluctuationPrice);
 			settlementPriceOfRecord = settlementPriceOfRecord.add(item.getSettlementPrice());
 		}
 		//结算价格
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_6p_release.apk
===================================================================
diff -u -r31086 -r31103
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r31086 -r31103
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 31086)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 31103)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
 	"version":"4.7.18",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_6p_release.apk",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_nologo_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210415_v4_1_nologo_release.apk
===================================================================
diff -u -r31086 -r31103
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ