Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r14639 -r14640 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14639) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14640) @@ -9356,7 +9356,7 @@ Map rsMap = new HashMap(); String startTime = year+ "-01-01 00:00:00"; String endTime = getNextYear(year) + " 00:00:00"; - String sql = "select distinct po from " + Invoice.class.getSimpleName() + " po inner join fetch po.invoiceItem where " + String sql = "select distinct po from " + Invoice.class.getSimpleName() + " po inner join fetch po.invoicePlan inner join fetch po.invoiceItem where " + " ( po.invoicePlan.depart like '%" + "手术室" + "%' or po.invoicePlan.depart like '%" + "麻醉" +"%' )" + " and po.invoicePlan.handleDepartCoding = '" + departCoding + "'" + " and po.sendTime between " + dateQueryAdapter.dateAdapter(startTime)