Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r15361 -r15431
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 15361)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 15431)
@@ -2,6 +2,7 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -849,8 +850,10 @@
 				JSONObject obj = array.getJSONObject(i);
 				Long id = JSONUtil.optLong(obj, "id", null);
 				String packageType = obj.optString("packageType");
+				
+				ForeignProxyItem foreignProxyItem = null;
 				if (!DatabaseUtil.isPoIdValid(id)) {// 新增
-					ForeignProxyItem foreignProxyItem = new ForeignProxyItem();
+					foreignProxyItem = new ForeignProxyItem();
 					foreignProxyItem.setTousseName(obj.optString("tousseName"));
 					foreignProxyItem.setCount(obj.optInt("count"));
 					foreignProxyItem.setTousseType(obj.optString("tousseType"));
@@ -862,14 +865,22 @@
 					newItems.add(foreignProxyItem);
 				} else {// 已存在的记录项
 					existIdMap.put(id, obj);
-					ForeignProxyItem item = getForeignProxyItemById(id);
-					item.setBasketBarcode(obj.optString("basketBarcode"));
-					item.setBasketName(obj.optString("basketName"));
+					foreignProxyItem = getForeignProxyItemById(id);
+					foreignProxyItem.setBasketBarcode(obj.optString("basketBarcode"));
+					foreignProxyItem.setBasketName(obj.optString("basketName"));
 				}
-				
+				//灭菌日期默认当天，页面可修改灭菌日期
+				Date sterileDate = new Date();
+				if(StringUtils.isNotBlank(foreignProxyItem.getSterileStartDate())){
+					try {
+						sterileDate = Constants.SIMPLEDATEFORMAT_YYYYMMDD.parse(foreignProxyItem.getSterileStartDate());
+					} catch (ParseException e) {
+						e.printStackTrace();
+					}
+				}
 				// 失效期和预警期计算
 				JSONObject expirationObj = expirationDateInfoManager
-						.getExpirationDate(new Date().getTime() + "", packageType);
+						.getExpirationDate(sterileDate.getTime() + "", packageType);
 				
 				Boolean isDefined = expirationObj.optBoolean("isDefined");
 				if (isDefined){