Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java
===================================================================
diff -u -r20377 -r20379
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 20377)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java	(.../DisposableGoods.java)	(revision 20379)
@@ -572,6 +572,13 @@
 		}
 		return false;
 	}
+	@Transient
+	public String getUnitForDisplay() {
+		if(StringUtils.isNotBlank(middlePackageUnit)){
+			return middlePackageUnit;
+		}
+		return unit;
+	}
 	public String getMiddlePackageUnit() {
 		return middlePackageUnit;
 	}
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r19154 -r20379
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 19154)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 20379)
@@ -452,7 +452,7 @@
 		diposableGood.put("goodsType", DisposableGoods.TYPE_DIPOSABLEGOODS);
 		diposableGood.put("barcode", barcode);
 		diposableGood.put("showName", showName);
-		diposableGood.put("unit", disposableGoodsBatchStock.getDiposableGoods().getUnit());
+		
 		diposableGood.put("batchNumber", batchNumber);
 		diposableGood.put("cost", cost);
 		diposableGood.put("expDate", FastDateFormat.getInstance("yyyy-MM-dd")
@@ -466,6 +466,7 @@
 		if(disposableGoods == null){
 			throw new RuntimeException("一次性物品定义已被删除!");
 		}
+		diposableGood.put("unit", disposableGoods.getUnitForDisplay());
 		storage = Long.valueOf(ApplicationSpecificationHelper.calculateApplicationSpecificationAmount(storage, disposableGoods.getTransferScale()));
 		diposableGood.put("storage", storage);
 		// 价格列表
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r20183 -r20379
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 20183)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 20379)
@@ -1599,8 +1599,15 @@
 		ResultSet resultSet = objectDao.executeSql(sql.toString());
 		try {
 			while (resultSet.next()) {
+				Long disposableGoodsId = resultSet.getLong("disposableGoodsId");
+				DisposableGoods disposableGoods = diposableGoodsManager.get(disposableGoodsId);
+				if(disposableGoods == null){
+					throw new RuntimeException("一次性物品定义已被删除!");
+				}
 				Long sumAmount = resultSet.getLong("sumAmount");
 				Long sumReturnedAmount = resultSet.getLong("sumReturnedAmount");
+				sumAmount = Long.valueOf(ApplicationSpecificationHelper.calculateApplicationSpecificationAmount(sumAmount, disposableGoods.getTransferScale()));
+				sumReturnedAmount = Long.valueOf(ApplicationSpecificationHelper.calculateApplicationSpecificationAmount(sumReturnedAmount, disposableGoods.getTransferScale()));
 				Double price = resultSet.getDouble("price");
 				Double fluctuationPrice = resultSet.getDouble("fluctuationPrice");
 				long amountCanReturn = sumAmount - sumReturnedAmount;
@@ -1610,12 +1617,13 @@
 				String name = resultSet.getString("name");
 				String specification = resultSet.getString("specification");
 				String applicationSpecification = resultSet.getString("applicationSpecification");
-				String unit = resultSet.getString("unit");
+//				String unit = resultSet.getString("unit");
+				String unit = disposableGoods.getUnitForDisplay();
 				String showName = DisposableGoodsUtils.getDisposableGoodsFullName(name, specification,applicationSpecification);
 				String barcode = resultSet.getString("barcode");
 				String batchNumber = resultSet.getString("batchNumber");
 				Date expDate = resultSet.getTimestamp("expDate");
-				Long disposableGoodsId = resultSet.getLong("disposableGoodsId");
+				
 				Long disposableGoodsStockId = resultSet.getLong("disposableGoodsStockId");
 				Long disposableGoodsBatchId = resultSet.getLong("disposableGoodsBatchId");
 				Long disposableGoodsBatchStockId = resultSet.getLong("disposableGoodsBatchStockId");