Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r14604 -r14621 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14604) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 14621) @@ -9188,7 +9188,7 @@ String startTime = year + "-" + mm + "-01 00:00:00"; String endTime = getNextMonth(year,mm) + " 00:00:00"; String sql = "select distinct po from " + ClassifyBasket.class.getSimpleName() - + " po left join po.washAndDisinfectRecords wr where wr is not null" + + " po inner join fetch po.classfiedItems ci inner join fetch ci.tousseDefinition citd inner join fetch citd.materialInstances left join po.washAndDisinfectRecords wr where wr is not null" + " and po.containerName in (select containerName from Container where departCode = '" + departCoding + "' )" + " and po.recyclingTime between " + dateQueryAdapter.dateAdapter(startTime) + " and " + dateQueryAdapter.dateAdapter(endTime) ; @@ -9203,7 +9203,7 @@ int washMaterialAmount = 0; // 不入框清洗的材料 String washRecordSql = "select distinct po from " + WashAndDisinfectRecord.class.getSimpleName() - + " po where po.orgUnitCoding = '" + departCoding + "'" + + " po inner join fetch po.washAndDisinfectMaterials where po.orgUnitCoding = '" + departCoding + "'" + " and po.endDate between " + dateQueryAdapter.dateAdapter(startTime) + " and " + dateQueryAdapter.dateAdapter(endTime) ; List washRecords = (List)objectDao.findByHql(washRecordSql);