Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r16916 -r16980
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16916)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16980)
@@ -4923,12 +4923,18 @@
 						if(warningUntilCalendar != null){
 							warningDate = warningUntilCalendar.getTime();
 						}
-//						if(validDate != null){
-							tousseInstance.setValidUntil(validDate);
-//						}
-//						if(warningDate != null){
-							tousseInstance.setWarningUntil(warningDate);
-//						}
+						tousseInstance.setValidUntil(validDate);
+						tousseInstance.setWarningUntil(warningDate);
+						//聚合包内普通器械包跟着修改
+						TousseDefinition tousseDefinition = tousseInstance
+								.getTousseDefinition();
+						if (tousseDefinition != null && TousseDefinition.PACKAGE_TYPE_COMBO
+										.equals(tousseDefinition.getTousseType())) {
+							String updateSql = String.format("update %s set packageType = '%s',validUntil = %s,warningUntil = %s where comboTousseInstanceId = %s",
+											TousseInstance.class.getSimpleName(),packageType, StringUtils.defaultIfEmpty(dateQueryAdapter.dateAdapter(validDate), "null"),
+											StringUtils.defaultIfEmpty(dateQueryAdapter.dateAdapter(warningDate),"null"),tousseInstance.getId());
+							objectDao.excuteSQL(updateSql);
+						}
 					}
 				}
 			}
Index: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
===================================================================
diff -u -r16117 -r16980
--- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 16117)
+++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 16980)
@@ -3,12 +3,10 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-
 import org.apache.commons.lang.StringUtils;
-
-import com.forgon.tools.db.DatabaseUtil;
-import com.forgon.tools.db.InitDbConnection;
 import org.apache.commons.lang3.time.DateUtils;
+import com.forgon.Constants;
+import com.forgon.tools.db.InitDbConnection;
 
 /**
  * @author WangYi 2012-09-10 下午14:13:03 sql查询语句 date适配器服务类
@@ -136,16 +134,16 @@
 	 * @return
 	 */
 	public String dateAdapter(Date date) {
-		SimpleDateFormat dateFormat = new SimpleDateFormat(
-				"yyyy-MM-dd HH:mm:ss");
-		String dateStr = dateFormat.format(date);
-		if (StringUtils.isNotBlank(dateStr)) {
-			if (dbConnection.isSqlServer()) {
-				return "'" + dateStr + "'";
-			} else if (dbConnection.isOracle()) {
-				return "to_date('" + dateStr + "','yyyy-mm-dd HH24:MI:SS')";
-			} else if (dbConnection.isMySQL()) {
-				return "'" + dateStr + "'";
+		if(date != null){
+			String dateStr = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(date);
+			if (StringUtils.isNotBlank(dateStr)) {
+				if (dbConnection.isSqlServer()) {
+					return "'" + dateStr + "'";
+				} else if (dbConnection.isOracle()) {
+					return "to_date('" + dateStr + "','yyyy-mm-dd HH24:MI:SS')";
+				} else if (dbConnection.isMySQL()) {
+					return "'" + dateStr + "'";
+				}
 			}
 		}
 		return "";