Index: ssts-expiration/src/main/java/com/forgon/disinfectsystem/expirationdateinfo/dwr/table/ExpirationDateInfoTableManager.java
===================================================================
diff -u -r12331 -r13905
--- ssts-expiration/src/main/java/com/forgon/disinfectsystem/expirationdateinfo/dwr/table/ExpirationDateInfoTableManager.java	(.../ExpirationDateInfoTableManager.java)	(revision 12331)
+++ ssts-expiration/src/main/java/com/forgon/disinfectsystem/expirationdateinfo/dwr/table/ExpirationDateInfoTableManager.java	(.../ExpirationDateInfoTableManager.java)	(revision 13905)
@@ -70,7 +70,7 @@
 		String warningDateStr = "";
 		
 		try{
-			Date sDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(produceDate);
+			Date sDate = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.parse(produceDate);
 			JSONObject json = expirationDateInfoManager.getExpirationDate(sDate.getTime() + "", packageType);
 			boolean isDefined = json.optBoolean("isDefinied");
 			if (isDefined){
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r13898 -r13905
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 13898)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 13905)
@@ -978,6 +978,10 @@
         			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>消毒日期:" + dateStr + "<center>";
         			tableHtml += "</center></td></tr>";
         			
+        			tableHtml += "<tr>";
+        			tableHtml += "<td colspan='4' style='font-size: 12px;;font-weight:bold' align='center'>失效日期:" + validDate + "<center>";
+        			tableHtml += "</center></td></tr>";
+        			
         			//打印材料明细
         			if(materialsJsonArray && materialsJsonArray.length>0){
         				tableHtml += "<tr>";