Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r32583 -r32708
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 32583)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 32708)
@@ -1556,6 +1556,23 @@
 			String foreignTousseName = StrutsParamUtils.getPraramValue("foreignTousseName", null);
 			String timeType = StrutsParamUtils.getPraramValue("timeType", null);
 			return jasperReportManager.getForeignTousseApplicationReport(timeType, startDay, endDay, goodsName, deptName , patientName , deliverStatus, companyName, departOfPatient, noDisplayTerminatedIP, customColumnName1FieldName, parametMap, materialId, showNoInvoie, foreignTousseName, used);
+		}else if("foreignTousseSupplierChargeReport".equals(reportName)){//外来器械包供应商收费报表
+			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
+			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
+			if(StringUtils.isBlank(startDay) && StringUtils.isBlank(endDay)){
+				return null;
+			}
+			String queryType = StrutsParamUtils.getPraramValue("queryType", "");
+			parametMap.put("title", "外来器械包供应商收费"+ queryType +"报表("+startDay+" ~ "+endDay+")");
+			
+			String companyName = StrutsParamUtils.getPraramValue("companyName", "");
+			String foreignTousseName = StrutsParamUtils.getPraramValue("foreignTousseName", "");
+			Long chargingModeId = StrutsParamUtils.getPraramLongValue("chargingModeId", null);
+			Long specificationId = StrutsParamUtils.getPraramLongValue("specificationId", null);
+			if("明细".equals(queryType)){
+				return jasperReportManager.queryForeignTousseApplicationDetailedReport(startDay, endDay, companyName, foreignTousseName, chargingModeId, specificationId);
+			}
+			return jasperReportManager.queryForeignTousseApplicationSummaryReport(startDay, endDay, companyName, foreignTousseName, chargingModeId, specificationId);
 		}else if("foreignTousseApplicationReport-xjjqzyy".equals(reportName)){//xjjqzyy定制的外来器械申请统计报表
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");