Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r38446 -r38556
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 38446)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 38556)
@@ -1298,6 +1298,7 @@
 			    	index++;
 				}*/
 				Date nowDate = new Date();
+				int expirationDateValueMode = ConfigUtils.getSystemSetConfigByNameInt("expirationDateValueMode", 0);
 				jdbcTemplate.batchUpdate("update TousseInstance set status=?,sterileFrequency=?,sterilizationUser=?,sterilizerName=?,"
 			    				+ "sterileStartTime=?,sterileEndTime=?,SterilingType=?,sterilizationRecord_id=?,warehouseId=?,warehouseName=?,validUntil=?,warningUntil=?"
 			    				+ (Constants.STR_YES.equals(rapidFurnace)?",price=?,discountPrice=?,fluctuationPrice=? ":" ")
@@ -1340,6 +1341,14 @@
 		                    }else{//否则当做天处理
 		                    	validUntil = DateTools.addDate(nowDate,expirationDateInfo.getValidDate());  
 		                    }
+		                    if(expirationDateValueMode == 1){
+			    				if(tousseInstance.getValidUntil() != null){
+			    					if(tousseInstance.getValidUntil().before(validUntil)){
+			    						//装配失效期早于灭菌失效期，则不修改失效期NYSY-68
+			    						validUntil = tousseInstance.getValidUntil();
+			    					}
+			    				}
+			    			}
 		                }
 		                
 		                //预警日期
@@ -1352,6 +1361,14 @@
 		                	}else{//否则当做天处理
 		                		warningUntil = DateTools.addDate(nowDate,expirationDateInfo.getWarningDate());  
 		                	}
+		                	if(expirationDateValueMode == 1){
+			    				if(tousseInstance.getWarningUntil() != null){
+			    					if(tousseInstance.getWarningUntil().before(warningUntil)){
+			    						//装配预警期早于灭菌预警期，则不修改预警期NYSY-68
+			    						warningUntil = tousseInstance.getWarningUntil();
+			    					}
+			    				}
+			    			}
 		                }
 				    	
 						ps.setString(1, status);
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r38531 -r38556
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 38531)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 38556)
@@ -3713,6 +3713,7 @@
 		Map<Long, JSONObject> toolAndImplantAmountMap = tousseDefinitionManager.getToolAndImplantAmountMap(tdIdsOfForeignTousse);
 		Map<Long, JSONObject> idCardInstanceInfoMap = getIdCardInstanceInfoMap(idCardInstanceIDs);
 		Map<String, Integer> increaseStockByTousseNameMap = new HashMap<String, Integer>();
+		int expirationDateValueMode = ConfigUtils.getSystemSetConfigByNameInt("expirationDateValueMode", 0);
 		for (TousseInstance tousseInstance : tousses) {
 			if(DatabaseUtil.isPoIdValid(tousseInstance.getPackingRecord_id())){
 				idsForUpdateReviewer.add(tousseInstance.getPackingRecord_id());
@@ -3905,6 +3906,20 @@
 				Date validUntil = (Date)JSONObject.toBean(expirationObj.optJSONObject("validUntil"), Date.class);
 				Date warningUntil = (Date)JSONObject.toBean(expirationObj.optJSONObject("warningUntil"), Date.class);
 				
+				if(expirationDateValueMode == 1){
+    				if(tousseInstance.getValidUntil() != null){
+    					if(tousseInstance.getValidUntil().before(validUntil)){
+    						//装配失效期早于审核失效期，则不修改失效期NYSY-68
+    						validUntil = tousseInstance.getValidUntil();
+    					}
+    				}
+    				if(tousseInstance.getWarningUntil() != null){
+    					if(tousseInstance.getWarningUntil().before(warningUntil)){
+    						//装配预警期早于审核预警期，则不修改预警期NYSY-68
+    						warningUntil = tousseInstance.getWarningUntil();
+    					}
+    				}
+    			}
 				tousseInstance.setValidUntil(validUntil);
 				tousseInstance.setWarningUntil(warningUntil);