Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java =================================================================== diff -u -r26281 -r26283 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 26281) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 26283) @@ -47,7 +47,7 @@ } String status = tousseInstance.getStatus(); if(invoicePlan == null && TousseInstance.STATUS_RECYCLED.equals(status)){ - return tousseInstance.getOperationTime(); + return date; } switch (status) { case TousseInstance.STATUS_REVIEWED:// 审核时间 @@ -79,9 +79,12 @@ case TousseInstance.STATUS_STERILING://灭菌开始时间 date = safelyGetSterileStartDate(tousseInstance); break; - default: + case TousseInstance.STATUS_PACKED: date = tousseInstance.getOperationTime(); break; + default: + date = null; + break; } return date; } @@ -105,16 +108,15 @@ SimpleDateFormat dateFormat, InvoicePlan invoicePlan) { String statusAndTime = ""; if (format == null) { - format = "%s %s %s"; + format = "%s %s"; } if (dateFormat == null) { dateFormat = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS; } String dateString = getDateStringByTousseInstanceStatusAndInvoicePlan(tousseInstance, dateFormat, invoicePlan); String status = tousseInstance.getStatus(); - statusAndTime = String.format(format, status, getTimeTypeByStatus(status), - dateString); + statusAndTime = String.format(format, status, dateString); return statusAndTime; } /**