Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r14913 -r14919
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 14913)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 14919)
@@ -910,62 +910,111 @@
 			cellStyle.setFont(font);
 
 			HSSFRow operatingRow1 = sheet.createRow(0);
-			createStringCell(operatingRow1, cellStyle, 0, "包名称");
+			createStringCell(operatingRow1, cellStyle, 0, "器械包名称");
 			createStringCell(operatingRow1, cellStyle, 1, "条码");
-			createStringCell(operatingRow1, cellStyle, 2, "状态");
-			createStringCell(operatingRow1, cellStyle, 3, "失效期");
-			createStringCell(operatingRow1, cellStyle, 4, "装配员");
-			createStringCell(operatingRow1, cellStyle, 5, "装配时间");
-			createStringCell(operatingRow1, cellStyle, 6, "审核员");
-			createStringCell(operatingRow1, cellStyle, 7, "审核时间");
-			createStringCell(operatingRow1, cellStyle, 8, "包装类型");
-			createStringCell(operatingRow1, cellStyle, 9, "灭菌程序");
-			createStringCell(operatingRow1, cellStyle, 10, "灭菌炉");
-			createStringCell(operatingRow1, cellStyle, 11, "炉次");
-			createStringCell(operatingRow1, cellStyle, 12, "灭菌日期");
+			createStringCell(operatingRow1, cellStyle, 2, "标识牌条码");
+			createStringCell(operatingRow1, cellStyle, 3, "状态");
+			createStringCell(operatingRow1, cellStyle, 4, "所属仓库");
+			createStringCell(operatingRow1, cellStyle, 5, "清洗人");
+			createStringCell(operatingRow1, cellStyle, 6, "清洗时间");
+			createStringCell(operatingRow1, cellStyle, 7, "有效期至");
+			createStringCell(operatingRow1, cellStyle, 8, "装配人");
+			createStringCell(operatingRow1, cellStyle, 9, "装配时间");
+			createStringCell(operatingRow1, cellStyle, 10, "审核人");
+			createStringCell(operatingRow1, cellStyle, 11, "审核时间");
+			createStringCell(operatingRow1, cellStyle, 12, "包装类型");
+			createStringCell(operatingRow1, cellStyle, 13, "灭菌员");
+			createStringCell(operatingRow1, cellStyle, 14, "灭菌完成时间");
+			createStringCell(operatingRow1, cellStyle, 15, "灭菌程序");
+			createStringCell(operatingRow1, cellStyle, 16, "灭菌批号");
+			createStringCell(operatingRow1, cellStyle, 17, "发货人");
+			createStringCell(operatingRow1, cellStyle, 18, "发货时间");
+			createStringCell(operatingRow1, cellStyle, 19, "废弃时间");
+			createStringCell(operatingRow1, cellStyle, 20, "废弃原因");
+			createStringCell(operatingRow1, cellStyle, 21, "废弃操作人");
 
 			int row = 1;
 			for (TousseInstance tousseInstance : tousseList) {
+				if(row == 100){
+					break;
+				}
 				HSSFRow operatingRow = sheet.createRow(row);
+				// 器械包名称，条码，标识牌条码，状态，所属仓库
 				createStringCell(operatingRow, cellStyle, 0,
 						tousseInstance.getTousseName());
 				createStringCell(operatingRow, cellStyle, 1,
 						tousseInstance.getBarcode());
 				createStringCell(operatingRow, cellStyle, 2,
+						tousseInstance.getIdCardInstanceBarcode());
+				createStringCell(operatingRow, cellStyle, 3,
 						tousseInstance.getStatus());
-				createStringCell(operatingRow, cellStyle, 3, 
-						tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD));
 				createStringCell(operatingRow, cellStyle, 4,
+						tousseInstance.getWareHouseName());
+				// 清洗人，清洗时间，有效期至，装配人，装配时间
+				createStringCell(operatingRow, cellStyle, 5,
+						tousseInstance.getWashOperator());
+				createStringCell(operatingRow, cellStyle, 6,
+						tousseInstance.getWashStartTime());
+				createStringCell(operatingRow, cellStyle, 7, 
+						tousseInstance.getValidUntilStr(Constants.SIMPLEDATEFORMAT_YYYYMMDD));
+				createStringCell(operatingRow, cellStyle, 8,
 						tousseInstance.getOperator());
 				Date operationTime = tousseInstance.getOperationTime();
 				String operationTimeStr = "";
 				if (operationTime != null) {
-					operationTimeStr = new SimpleDateFormat("yyyy-MM-dd")
+					operationTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS
 							.format(operationTime);
 				}
-				createStringCell(operatingRow, cellStyle, 5, operationTimeStr);
-				createStringCell(operatingRow, cellStyle, 6,
+				createStringCell(operatingRow, cellStyle, 9, operationTimeStr);
+				// 审核人，审核时间，包装类型，灭菌员，灭菌完成时间
+				createStringCell(operatingRow, cellStyle, 10,
 						tousseInstance.getReviewer());
 				Date reviewTime = tousseInstance.getReviewTime();
 				String reviewTimeStr = "";
 				if (reviewTime != null) {
-					reviewTimeStr = new SimpleDateFormat("yyyy-MM-dd")
+					reviewTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS
 							.format(reviewTime);
 				}
-				createStringCell(operatingRow, cellStyle, 7, reviewTimeStr);
-				createStringCell(operatingRow, cellStyle, 8,
+				createStringCell(operatingRow, cellStyle, 11, reviewTimeStr);
+				createStringCell(operatingRow, cellStyle, 12,
 						tousseInstance.getPackageType());
-				createStringCell(operatingRow, cellStyle, 9,
+				createStringCell(operatingRow, cellStyle, 13,
+						tousseInstance.getSterilizationUser());
+				createStringCell(operatingRow, cellStyle, 14,
+						tousseInstance.getSterileEndTime());
+				// 灭菌程序，灭菌批号，发货人，发货时间，废弃时间
+				createStringCell(operatingRow, cellStyle, 15,
 						tousseInstance.getSterilingType());
+				String strilizerMsg = "";
+				if(StringUtils.isNotBlank(tousseInstance.getSterilizerName())){
+					strilizerMsg = tousseInstance.getSterilizerName() + ",第" +tousseInstance.getSterileFrequency()+"炉";
+				}
+				createStringCell(operatingRow, cellStyle, 16,strilizerMsg);
+				createStringCell(operatingRow, cellStyle, 17,
+						tousseInstance.getInvoiceSender());
+				Date invoiceSendTime = tousseInstance.getInvoiceSendTime();
+				String invoiceSendTimeStr = "";
+				if (invoiceSendTime != null) {
+					invoiceSendTimeStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS
+							.format(invoiceSendTime);
+				}
+				createStringCell(operatingRow, cellStyle, 18,
+						invoiceSendTimeStr);
 				
-				createStringCell(operatingRow, cellStyle, 10,
-						tousseInstance.getSterilizerName());
-				createStringCell(operatingRow, cellStyle, 11,
-						tousseInstance.getSterileFrequency());
+				Date waseDate = tousseInstance.getWasteDate();
+				String waseDateStr = "";
+				if (waseDate != null) {
+					waseDateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS
+							.format(waseDate);
+				}
+				createStringCell(operatingRow, cellStyle, 19,
+						waseDateStr);
+				//废弃原因，废弃操作人
+				createStringCell(operatingRow, cellStyle, 20,
+						tousseInstance.getWasteReason());
+				createStringCell(operatingRow, cellStyle, 21,
+						tousseInstance.getOperateUser());
 
-				createStringCell(operatingRow, cellStyle, 12,
-						tousseInstance.getSterileStartTime());
-
 				row++;
 			}
 			wb.write(ops);
Index: forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java
===================================================================
diff -u -r13940 -r14919
--- forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java	(.../ForgonDateUtils.java)	(revision 13940)
+++ forgon-tools/src/main/java/com/forgon/tools/util/ForgonDateUtils.java	(.../ForgonDateUtils.java)	(revision 14919)
@@ -9,6 +9,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.commons.lang3.StringUtils;
+
 /**
  * @author jeffli
  *
@@ -27,6 +29,9 @@
 	
 	public static Date safelyParseDate(String dateStr,SimpleDateFormat sdf) {
 		Date date = null;
+		if(StringUtils.isBlank(dateStr)){
+			return date;
+		}
 		try {
 			date = sdf.parse(dateStr);
 		} catch (ParseException e) {
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp
===================================================================
diff -u -r12331 -r14919
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp	(.../exportQueryTousse.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp	(.../exportQueryTousse.jsp)	(revision 14919)
@@ -57,4 +57,6 @@
 
 tousseInstanceManager.exportQueryTousseInstance(listSql,basketTousseSql,selectAll,response.getOutputStream());
 servletOutputStream.flush();
+out.clear();
+out = pageContext.pushBody();
 %>
\ No newline at end of file