Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32743 -r32747
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32743)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32747)
@@ -23534,7 +23534,7 @@
 				+ " csmi on csmi.setting_id=cs.id "
 				+ " left join "
 				+ ChargeSettingSpecItem.class.getSimpleName()
-				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.endStatus is null or ip.endStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
+				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.recyclingStatus is null or ip.recyclingStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
 				+ dateQueryAdapter.dateAdapter(endDay);
@@ -23676,7 +23676,7 @@
 				+ ChargeSettingModeItem.class.getSimpleName()
 				+ " csmi on csmi.setting_id=cs.id left join "
 				+ ChargeSettingSpecItem.class.getSimpleName()
-				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.endStatus is null or ip.endStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
+				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.recyclingStatus is null or ip.recyclingStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
 				+ dateQueryAdapter.dateAdapter(endDay);