Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32738 -r32743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32738)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32743)
@@ -23486,9 +23486,9 @@
 					thirdColumnVo.setThirdColumnName(thirdColumnName);
 					thirdColumnVos.add(thirdColumnVo);
 					foreignTousseAppDetailedVOs = new ArrayList<ForeignTousseAppDetailedVO>();
-					thirdColumnVo.setSthirdColumnDetaileds(foreignTousseAppDetailedVOs);
+					thirdColumnVo.setThirdColumnDetaileds(foreignTousseAppDetailedVOs);
 				}
-				thirdColumnVo.getSthirdColumnDetaileds().add(foreignTousseAppSumVO);
+				thirdColumnVo.getThirdColumnDetaileds().add(foreignTousseAppSumVO);
 				firstColumnVo.setFirstColumnTotalAmount(MathTools.add(foreignTousseAppSumVO.getAmount(), firstColumnVo.getFirstColumnTotalAmount()).intValue());
 				firstColumnVo.setFirstColumnTotalPrice(MathTools.add(foreignTousseAppSumVO.getTotalPrice(), firstColumnVo.getFirstColumnTotalPrice()).doubleValue());
 			}
@@ -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.applicationTime between "
+				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.endStatus is null or ip.endStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
 				+ dateQueryAdapter.dateAdapter(endDay);
@@ -23550,7 +23550,7 @@
 		if(DatabaseUtil.isPoIdValid(specificationId)){
 			sql += " and cssi.foreignTousseSpecID ='" + specificationId + "' ";
 		}
-		sql += " ) tempt group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification order by tempt.supplierName, tempt.foreignTousseChargeModeName,tempt.specification ";
+		sql += " ) tempt where tempt.amount>0 group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification order by tempt.supplierName, tempt.foreignTousseChargeModeName,tempt.specification ";
 		return sql;
 	}
 	@Override
@@ -23628,9 +23628,9 @@
 					thirdColumnVo.setThirdColumnName(thirdColumnName);
 					thirdColumnVos.add(thirdColumnVo);
 					foreignTousseAppDetailedVOs = new ArrayList<ForeignTousseAppDetailedVO>();
-					thirdColumnVo.setSthirdColumnDetaileds(foreignTousseAppDetailedVOs);
+					thirdColumnVo.setThirdColumnDetaileds(foreignTousseAppDetailedVOs);
 				}
-				thirdColumnVo.getSthirdColumnDetaileds().add(foreignTousseAppDetailedVO);
+				thirdColumnVo.getThirdColumnDetaileds().add(foreignTousseAppDetailedVO);
 				firstColumnVo.setFirstColumnTotalAmount(MathTools.add(foreignTousseAppDetailedVO.getAmount(), firstColumnVo.getFirstColumnTotalAmount()).intValue());
 				firstColumnVo.setFirstColumnTotalPrice(MathTools.add(foreignTousseAppDetailedVO.getTotalPrice(), firstColumnVo.getFirstColumnTotalPrice()).doubleValue());
 			}
@@ -23658,7 +23658,7 @@
 		if (StringUtils.isNotBlank(startDay)) {
 			startDay += ":00";
 		}
-		String sql = "select cs.supplierName,td.name,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='"
+		String sql = "select * from (select cs.supplierName,td.name,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='"
 				+ ForeignTousseChargeMode.MODE_RATE
 				+ "' then cssi.foreignTousseSpecName else null end specification,case when csmi.chargeMode='"
 				+ ForeignTousseChargeMode.MODE_RATE
@@ -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.applicationTime between "
+				+ " cssi on cssi.setting_mode_id=csmi.id where (ip.endStatus is null or ip.endStatus<>'"+ InvoicePlan.STATUS_END +"') and ip.applicationTime between "
 				+ dateQueryAdapter.dateAdapter(startDay)
 				+ " and "
 				+ dateQueryAdapter.dateAdapter(endDay);
@@ -23692,7 +23692,7 @@
 		if(DatabaseUtil.isPoIdValid(specificationId)){
 			sql += " and cssi.foreignTousseSpecID ='" + specificationId + "' ";
 		}
-		sql += " order by cs.supplierName";
+		sql += ") tempt where tempt.amount>0 order by tempt.supplierName,tempt.name,tempt.foreignTousseChargeModeName";
 		return sql;
 	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ThirdColumnVo.java
===================================================================
diff -u -r32738 -r32743
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ThirdColumnVo.java	(.../ThirdColumnVo.java)	(revision 32738)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ThirdColumnVo.java	(.../ThirdColumnVo.java)	(revision 32743)
@@ -17,10 +17,10 @@
 	public void setThirdColumnName(String thirdColumnName) {
 		this.thirdColumnName = thirdColumnName;
 	}
-	public List getSthirdColumnDetaileds() {
+	public List getThirdColumnDetaileds() {
 		return thirdColumnDetaileds;
 	}
-	public void setSthirdColumnDetaileds(List sthirdColumnDetaileds) {
+	public void setThirdColumnDetaileds(List sthirdColumnDetaileds) {
 		this.thirdColumnDetaileds = sthirdColumnDetaileds;
 	}