Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java
===================================================================
diff -u -r35784 -r35785
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java	(.../ForeignTousseApplicationReportHelper.java)	(revision 35784)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseApplicationReportHelper.java	(.../ForeignTousseApplicationReportHelper.java)	(revision 35785)
@@ -2,6 +2,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -11,6 +12,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import com.forgon.tools.date.DateTools;
 import net.sf.json.JSONArray;
 
 import org.apache.commons.lang.StringUtils;
@@ -398,9 +400,10 @@
 		try {
 			rs = objectDao.executeSql(querySql);
 			Map<Long, ForeignTousseApplicationVO> voMap = new LinkedHashMap<Long, ForeignTousseApplicationVO>();
-			SimpleDateFormat sdf = new SimpleDateFormat(Constants.DATEFORMAT_YYYYMMDDHHMM);
+			DateFormat dateFormatYMDHM = DateTools.YMDHMFORMAT.get();
 			Map<String,Integer> materialCountMap = new HashMap<String, Integer>();
 			Map<String, TousseItemVO> tousseItemVOMap = new HashMap<String, TousseItemVO>();
+			StringBuffer totalMaterialDetailsSbf = new StringBuffer();
 			while (rs.next()) {
 				Long id = rs.getLong("id");
 				ForeignTousseApplicationVO vo = null;
@@ -414,14 +417,13 @@
 					}
 					Date receiveTime = rs.getTimestamp("receiveTime");
 					if (receiveTime != null) {
-						String receiveTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM
-								.format(receiveTime);
+						String receiveTimeStr = dateFormatYMDHM.format(receiveTime);
 						vo.setReceiveTime(receiveTime);
 						vo.setReceiveTimeStr(receiveTimeStr);
 					}
 					Date applicationtime = rs.getTimestamp("applicationtime");
 					if(applicationtime != null){
-						vo.setApplicationTimeStr(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(applicationtime));
+						vo.setApplicationTimeStr(dateFormatYMDHM.format(applicationtime));
 					}
 					if(queryReceiveMan){
 						vo.setReceiveMan(StringTools.defaultIfBlank(rs.getString("ReceiveMan"),""));
@@ -432,7 +434,7 @@
 					if(queryReturnTime){
 						Date returnTime = rs.getTimestamp("returnTime");
 						if(returnTime != null){
-							vo.setReturnTimeStr(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(returnTime));
+							vo.setReturnTimeStr(dateFormatYMDHM.format(returnTime));
 						}
 					}
 					if(queryIsUrgent){
@@ -467,7 +469,7 @@
 					Date invoiceSendTime = rs.getTimestamp("invoiceSendTime");
 					String invoiceSendTimeStr = null;
 					if(invoiceSendTime != null){
-						invoiceSendTimeStr = sdf.format(invoiceSendTime);
+						invoiceSendTimeStr = dateFormatYMDHM.format(invoiceSendTime);
 					}
 					double price = rs.getDouble("price");
 					String supplierName = rs.getString("supplierName");
@@ -541,16 +543,18 @@
 				}
 			}
 			if(enableShowForeignTousseApplicationReportMaterials){
-				String totalMaterialDetails = null;
+				totalMaterialDetailsSbf.setLength(0);
 				for (Entry<String, Integer> entry : materialCountMap.entrySet()) {
-					String materialDetails = entry.getKey();
-					if(totalMaterialDetails == null){
-						totalMaterialDetails = "各材料总数：" + materialDetails + "*" + entry.getValue();
+					if(totalMaterialDetailsSbf.length() == 0){
+						totalMaterialDetailsSbf.append("各材料总数：");
 					}else{
-						totalMaterialDetails += "，" + materialDetails + "*" + entry.getValue();
+						totalMaterialDetailsSbf.append("，");
 					}
+					totalMaterialDetailsSbf.append(entry.getKey());
+					totalMaterialDetailsSbf.append("*");
+					totalMaterialDetailsSbf.append(entry.getValue());
 				}
-				parametMap.put("totalMaterialDetails", totalMaterialDetails);
+				parametMap.put("totalMaterialDetails", totalMaterialDetailsSbf.toString());
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();