Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r28293 -r28296
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28293)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28296)
@@ -5054,13 +5054,12 @@
      */
     private void setValidUntilAndWarningUntil(TousseInstance ti,  Map<String, ExpirationDateInfo> edsMap, SterilizationRecord sr){
     	if(StringUtils.isNotBlank(ti.getPackageType()) && edsMap.containsKey(ti.getPackageType())){
-        	if(ti.getValidUntil() != null){
-        		ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
+    		ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
+        	if(ed.getValidDate() != null && ed.getValidDate() > 0){
         		Date validUntil = DateTools.addDate(sr.getEndDate(), ed.getValidDate());
         		ti.setValidUntil(validUntil);
         	}
-        	if(ti.getWarningUntil() != null){
-        		ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
+        	if(ed.getWarningDate() != null && ed.getWarningDate() > 0){
         		Date warningUntil = DateTools.addDate(sr.getEndDate(), ed.getWarningDate());
         		ti.setWarningUntil(warningUntil);
         	}