Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29584 -r29585 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29584) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29585) @@ -12246,7 +12246,7 @@ } StringBuilder sqlBuilder = new StringBuilder(); String sql = String - .format("select f.receiveTime,tit.tousseName,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType,count(tit.id) amount from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id where (f.receiveTime between %s and %s) ", + .format("select f.receiveTime,tit.tousseName,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType,count(distinct tit.id) amount from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id where (f.receiveTime between %s and %s) ", ForeignTousseApplication.class.getSimpleName(), InvoicePlan.class.getSimpleName(), TousseItem.class.getSimpleName(), @@ -12280,7 +12280,6 @@ sqlBuilder.append(" group by f.receiveTime,tit.tousseName,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.ascriptionDepartment,f.doctor,f.processType order by f.id asc "); ResultSet rs = null; try { - String sr = sqlBuilder.toString(); rs = objectDao.executeSql(sqlBuilder.toString()); Map voMap = new LinkedHashMap(); while (rs.next()) {