Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r20076 -r20196 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20076) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 20196) @@ -5404,13 +5404,14 @@ date = sdf.parse(disinfectionDate); } catch (ParseException e1) { e1.printStackTrace(); + date = new Date(); } Date validUntil = null; Date warningUntil = null; // 失效期和预警期计算 JSONObject expirationObj = expirationDateInfoManager.getExpirationDate( - new Date().getTime() + "", packageType); + date.getTime() + "", packageType); String packageTypeAbbreviation = TousseInstanceUtils .getPackageTypeAbbreviation(objectDao, packageType);