Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r22332 -r22342 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22332) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 22342) @@ -3515,9 +3515,13 @@ ExpirationDateInfo expirationDateInfo = new ExpirationDateInfo(); //根据包类型,拿到“保质期” expirationDateInfo = (ExpirationDateInfo) objectDao.getByProperty(ExpirationDateInfo.class.getSimpleName(), "packageType", ti.getPackageType()); - //灭菌完成时间 + “保质期 ” - ti.setValidUntil(addDate(new Date(),expirationDateInfo.getValidDate())); - objectDao.update(ti); + + //只有当失效日期不为空和0的情况下,才去更新包的失效日期 + if(null!=expirationDateInfo.getValidDate() || 0!=expirationDateInfo.getValidDate()){ + //灭菌完成时间 + “保质期 ” + ti.setValidUntil(addDate(new Date(),expirationDateInfo.getValidDate())); + objectDao.update(ti); + } } return true; }catch(Exception e){