Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java =================================================================== diff -u -r12802 -r13929 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 12802) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java (.../TousseInstanceUtils.java) (revision 13929) @@ -185,6 +185,7 @@ packer = ""; } String packTime = instance.getOperationTime() == null?"":dateFormat.format(instance.getOperationTime()); + String invalidateTime = instance.getValidUntil() == null?"":dateFormat2.format(instance.getValidUntil()); obj.put("tousseName", instance.getTousseName()); obj.put("tousseBarcode", instance.getBarcode()); @@ -198,7 +199,7 @@ obj.put("sterialTime", instance.getSterileEndTime()); obj.put("signedUser", signedUser); obj.put("signedDate", signedDate); - obj.put("invalidateTime", dateFormat2.format(instance.getValidUntil())); + obj.put("invalidateTime", invalidateTime); return obj.toString(); }