Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java =================================================================== diff -u -r38336 -r38337 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java (.../DepartmentMonthDetailHelper.java) (revision 38336) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java (.../DepartmentMonthDetailHelper.java) (revision 38337) @@ -1134,9 +1134,9 @@ + instrumentSetTypesSql + tiSterilingTypesSql +" and "+returnGoodsItemPredicate - + " and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' and exists (select 1 from "+ InvoiceItem.class.getSimpleName() +" ii join "+ TousseInstance.class.getSimpleName() - +" ti on ti.id=ii.comboTousseInstanceId and ti.returnGoodsItem_ID=ri.id ) " - + " group by rr.depart" + + " and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_COMBO + //+"' and exists (select 1 from "+ InvoiceItem.class.getSimpleName() +" ii join "+ TousseInstance.class.getSimpleName() +" ti on ti.id=ii.comboTousseInstanceId and ti.returnGoodsItem_ID=ri.id ) " + + "' group by rr.depart" + tdcTousseGroupNameSQL + fluctuationPriceOfTi; if(queryUnit){ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java =================================================================== diff -u -r38105 -r38337 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java (.../MonthReportHelper.java) (revision 38105) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MonthReportHelper.java (.../MonthReportHelper.java) (revision 38337) @@ -644,9 +644,9 @@ + " where "+returnGoodsItemPredicate+ tiSterilingTypesSql +tousseTypeReturnSql + rDepartCodingWhereSql + " and " + dataIndex.getHandleDeptCodeSql("r.handleDepartCode", isSupplyRoomUserOrIsExpensiveGoodsSupplyRoomUser, orgUnitCoding) + departmentSql - + " and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' and exists (select 1 from "+ InvoiceItem.class.getSimpleName() +" ii join "+ TousseInstance.class.getSimpleName() - +" ti on ti.id=ii.comboTousseInstanceId and ti.returnGoodsItem_ID=i.id ) " - +" and r.returnTime " + betweenSql; + + " and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_COMBO + //+"' and exists (select 1 from "+ InvoiceItem.class.getSimpleName() +" ii join "+ TousseInstance.class.getSimpleName() +" ti on ti.id=ii.comboTousseInstanceId and ti.returnGoodsItem_ID=i.id ) " + +"' and r.returnTime " + betweenSql; } ResultSet rs5 = null; try {