Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34084 -r34091
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34084)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34091)
@@ -14551,8 +14551,12 @@
 		if(!"发货时间".equals(timeType) && !"是".equals(used) && showNoInvoie){//此处的数据是装配的数据,不存在发货时间 不存在已使用
 			sqlBuilder.append(" union all select i.applicationtime,null invoiceSendTime,f.receiveTime "
 					+ " ,td.name tousseName,td.price,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus  "
-					+ " ,f.ascriptionDepartment,f.doctor,f.processType,sum(ti.amount) amount,f.bedNumber,null useRecord_id  "
-					+ " ,mi.materialName,sum(mi.count) count from "+
+					+ customColumnName1Sql
+					+ ",f.doctor,f.processType,sum(ti.amount) amount,f.bedNumber,null useRecord_id  "
+					+ queryMaterialNameSql
+					+ querySummaryOfMaterialsSql
+					+ sizeSql
+					+ " from "+
 					ForeignTousseApplication.class.getSimpleName()
 					+" f join "+
 					InvoicePlan.class.getSimpleName()
@@ -14586,6 +14590,7 @@
 		
 		ResultSet rs = null;
 		try {
+			System.out.println(sqlBuilder.toString());
 			rs = objectDao.executeSql(sqlBuilder.toString());
 			Map<Long, ForeignTousseApplicationVO> voMap = new LinkedHashMap<Long, ForeignTousseApplicationVO>();
 			SimpleDateFormat sdf = new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM);