Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r33808 -r33809 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33808) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 33809) @@ -14347,6 +14347,9 @@ boolean enableShowForeignTousseApplicationReportSummaryOfMaterials = CssdUtils.getSystemSetConfigByNameBool("enableShowForeignTousseApplicationReportSummaryOfMaterials", false); String querySummaryOfMaterialsSql = ""; if(enableShowForeignTousseApplicationReportSummaryOfMaterials){ + if(StringUtils.isBlank(joinMaterialInstanceSql)){ + joinMaterialInstanceSql = " left join MaterialInstance mi on mi.tousse_id=td.id "; + } querySummaryOfMaterialsSql = ",sum(case when mi.isImplant='是' then mi.count else 0 end) implantAmount ,sum(case when mi.isImplant='是' then 0 else mi.count end) toolAmount "; } boolean enableTheSizeDisplayOfTheForeignTousseApplicationReport = CssdUtils.getSystemSetConfigByNameBool("enableTheSizeDisplayOfTheForeignTousseApplicationReport", false);