Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
===================================================================
diff -u -r25591 -r26277
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 25591)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 26277)
@@ -45,24 +45,40 @@
 			return date;
 		}
 		switch (tousseInstance.getStatus()) {
-		case TousseInstance.STATUS_REVIEWED:// 审核时间
-			date = tousseInstance.getReviewTime();
-			break;
-		case TousseInstance.STATUS_STERILED:// 审核时间
-			date = safelyGetSterileEndDate(tousseInstance);
-			break;
-		case TousseInstance.STATUS_SHIPPED:// 发货时间
-			date = tousseInstance.getInvoiceSendTime();
-			break;
-		case TousseInstance.STATUS_DISCARD:// 废弃时间
-			date = tousseInstance.getWasteDate();
-			break;
-		case TousseInstance.STATUS_SIGNED:// 签收时间
-			date = tousseInstance.getSignedDate();
-			break;
-		default:
-			date = tousseInstance.getOperationTime();
-			break;
+			case TousseInstance.STATUS_REVIEWED:// 审核时间
+				date = tousseInstance.getReviewTime();
+				break;
+			case TousseInstance.STATUS_STERILED:// 灭菌结束时间
+				date = safelyGetSterileEndDate(tousseInstance);
+				break;
+			case TousseInstance.STATUS_SHIPPED:// 发货时间
+				date = tousseInstance.getInvoiceSendTime();
+				break;
+			case TousseInstance.STATUS_DISCARD:// 废弃时间
+				date = tousseInstance.getWasteDate();
+				break;
+			case TousseInstance.STATUS_SIGNED:// 签收时间
+				date = tousseInstance.getSignedDate();
+				break;
+			case TousseInstance.STATUS_RECYCLED://回收时间
+				date = ForgonDateUtils.safelyParseDate(
+						tousseInstance.getRecyclingTime(),
+						TousseInstance.STERILE_START_TIME_FMT);
+				break;
+			case TousseInstance.STATUS_DISINFECTED://清洗结束时间
+				date = ForgonDateUtils.safelyParseDate(
+						tousseInstance.getWashEndTime(),
+						TousseInstance.STERILE_START_TIME_FMT);
+				break;
+			case TousseInstance.STATUS_USED://使用时间
+				date = tousseInstance.getUseTime();
+				break;
+			case TousseInstance.STATUS_STERILING://灭菌开始时间
+				date = safelyGetSterileStartDate(tousseInstance);
+				break;
+			default:
+				date = tousseInstance.getOperationTime();
+				break;
 		}
 		return date;
 	}
@@ -86,18 +102,59 @@
 			SimpleDateFormat dateFormat) {
 		String statusAndTime = "";
 		if (format == null) {
-			format = "%s %s";
+			format = "%s %s %s";
 		}
 		if (dateFormat == null) {
 			dateFormat = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS;
 		}
 		String dateString = getDateStringByTousseInstanceStatus(tousseInstance,
 				dateFormat);
-		statusAndTime = String.format(format, tousseInstance.getStatus(),
+		String status = tousseInstance.getStatus();
+		statusAndTime = String.format(format, status, getTimeTypeByStatus(status),
 				dateString);
 		return statusAndTime;
 	}
-
+	/**
+	 * 根据包实例的状态获取需要的时间类型，便于客户区分显示的时间是什么时间。
+	 * @param status
+	 * @return
+	 */
+	public static String getTimeTypeByStatus(String status){
+		String timeType = null;
+		switch (status) {
+			case TousseInstance.STATUS_REVIEWED:
+				timeType = "审核时间";
+				break;
+			case TousseInstance.STATUS_STERILED:
+				timeType = "菌结束时间";
+				break;
+			case TousseInstance.STATUS_SHIPPED:
+				timeType = "发货时间";
+				break;
+			case TousseInstance.STATUS_DISCARD:
+				timeType = "废弃时间";
+				break;
+			case TousseInstance.STATUS_SIGNED:
+				timeType = "签收时间";
+				break;
+			case TousseInstance.STATUS_RECYCLED:
+				timeType = "回收时间";
+				break;
+			case TousseInstance.STATUS_DISINFECTED:
+				timeType = "清洗结束时间";
+				break;
+			case TousseInstance.STATUS_USED:
+				timeType = "使用时间";
+				break;
+			case TousseInstance.STATUS_STERILING:
+				timeType = "灭菌开始时间";
+				break;
+			default:
+				timeType = "装配时间";
+				break;
+		}
+		return timeType;
+	}
 	// 根据发货单获取结算科室
 	public static String getSettleAccountsDepartFromInvoice(
 			String tousseInstanceID, ObjectDao objectDao) {