Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16305 -r16307
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16305)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16307)
@@ -701,21 +701,21 @@
 					String reviewerCode = tousseInstance.getReviewerCode();
 					String sterileUserName = tousseInstance.getSterilizationUser();
 					String sterileUserCode = tousseInstance.getSterilizationUserCode();
-					Date sterileStartTime = TousseInstanceUtils.safelyGetSterileStartDate(tousseInstance);
-					if(sterileStartTime == null){
+					Date sterileEndTime = TousseInstanceUtils.safelyGetSterileEndDate(tousseInstance);
+					if(sterileEndTime == null){
 						throw new RuntimeException(String.format("%s的灭菌时间为空!", tousseInstance.getTousseName()));
 					}
-					String validUntilDateToPrint = "";
-					String sterileDateToPrint = "";
+					Date validUntil = tousseInstance.getValidUntil();
+					String validUntilDateToPrint = Constants.SIMPLEDATEFORMAT_YYYYMMDD
+							.format(validUntil);
+					String sterileDateToPrint = tousseInstance.getSterileStartDate();
 					boolean markTousse = false;
-					
 					// 失效期和预警期计算
 					JSONObject expirationObj = expirationDateInfoManager
-							.getExpirationDate(sterileStartTime.getTime() + "", packageType);
+							.getExpirationDate(sterileEndTime.getTime() + "", packageType);
 					
 					boolean isDefined = expirationObj.optBoolean("isDefined");
 					if (isDefined){
-						validUntilDateToPrint = expirationObj.optString("expirationDate");
 						sterileDateToPrint = expirationObj.optString("sterileDate");
 						markTousse = expirationObj.optBoolean("markTousse");
 					}