Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java =================================================================== diff -u -r14169 -r14196 --- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 14169) +++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java (.../ReturnGoodsRecordManagerImpl.java) (revision 14196) @@ -1475,11 +1475,11 @@ String isNullFunction = DatabaseUtil.getSqlIsNullFunctionName(dbConnection); sql.append(String - .format("select d.price as price,min(d.fluctuationPrice) as fluctuationPrice, sum(%s(d.amount,0)) as sumAmount, sum(%s(d.returnedAmount,0)) as sumReturnedAmount from invoice i,DiposableGoodsItem d" + .format("select d.price as price,d.fluctuationPrice as fluctuationPrice, sum(%s(d.amount,0)) as sumAmount, sum(%s(d.returnedAmount,0)) as sumReturnedAmount from invoice i,DiposableGoodsItem d" + " where i.id = d.invoice_id and d.disposableGoodsBatchStockID=%s and %s(d.amount,0)>%s(d.returnedAmount,0) and d.identificationID is not null ", isNullFunction, isNullFunction,disposableGoodsBatchStockID,isNullFunction,isNullFunction)); sql.append(" and i.settleAccountsDepart = '" + depart + "'");// 限定部门 - sql.append(" group by d.price "); + sql.append(" group by d.price, d.fluctuationPrice"); ResultSet resultSet = objectDao.executeSql(sql.toString()); try { while (resultSet.next()) {