Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r12386 -r12506
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 12386)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/service/ForeignProxyDisinfectionManagerImpl.java	(.../ForeignProxyDisinfectionManagerImpl.java)	(revision 12506)
@@ -589,8 +589,8 @@
 			}
 			String packageType = item.getPackageType();
 			String sterilingType = item.getSterilingType();
-			Calendar validUntil = validUntilAndWarningUntilMap.get(item.getTousseName()).get(0);
-			Calendar warningUntil = validUntilAndWarningUntilMap.get(item.getTousseName()).get(1);
+			Calendar validUntil = validUntilAndWarningUntilMap.get(item.getPackageType()).get(0);
+			Calendar warningUntil = validUntilAndWarningUntilMap.get(item.getPackageType()).get(1);
 			
 			createNewListTousseInstanceByParam(item.getTousseName(),
 					packageType, sterilingType, item.getCount(),
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java
===================================================================
diff -u -r12331 -r12506
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java	(.../ForeignProxyDisinfectionAction.java)	(revision 12331)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/action/ForeignProxyDisinfectionAction.java	(.../ForeignProxyDisinfectionAction.java)	(revision 12506)
@@ -113,15 +113,18 @@
 					foreignProxyItem.setTousseName(obj.optString("tousseName"));
 					foreignProxyItem.setCount(obj.optInt("count"));
 					foreignProxyItem.setTousseType(obj.optString("tousseType"));
-					foreignProxyItem.setPackageType(obj.optString("packageType"));
+					
+					String packageType = obj.optString("packageType");
+					
+					foreignProxyItem.setPackageType(packageType);
 					foreignProxyItem.setSterilingType(obj.optString("sterilingType"));
 					foreignProxyItem.setBasketName(obj.optString("basketName"));
 					foreignProxyItem.setBasketBarcode(obj.optString("basketBarcode"));
 
 					
 					// 失效期和预警期计算
 					JSONObject expirationObj = expirationDateInfoManager
-							.getExpirationDate(new Date().getTime() + "", foreignProxyItem.getPackageType());
+							.getExpirationDate(new Date().getTime() + "", packageType);
 					
 					isDefined = expirationObj.optBoolean("isDefined");
 					if (isDefined){
@@ -138,7 +141,7 @@
 						validUntilAndWarningUntil.add(c1);
 						validUntilAndWarningUntil.add(c2);
 						
-						validUntilAndWarningUntilMap.put(foreignProxyItem.getTousseName(), validUntilAndWarningUntil);
+						validUntilAndWarningUntilMap.put(packageType, validUntilAndWarningUntil);
 					}
 					else{
 						break;