Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r33009 -r33013
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33009)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 33013)
@@ -3616,7 +3616,14 @@
 				basketJson.put("barcode", basket.getContainer().getBarcode());
 				basketJson.put("basketName", basket.getContainer().getContainerName());
 				JSONArray tousses = new JSONArray();
+				Set<String> sterilizationModeSet = new HashSet<String>();
 				for (TousseInstance tousseInstance : basket.getTousseInstances(objectDao)) {
+					String sterilizationMode = tousseInstance.getSterilingMode();
+					if(StringUtils.isBlank(sterilizationMode)){
+						sterilizationModeSet.add("");
+					}else{
+						sterilizationModeSet.add(sterilizationMode);
+					}
 					JSONObject tousse = new JSONObject();
 					if (tousseInstance.getProxyDisinfection_id() == null)
 						continue;
@@ -3627,10 +3634,13 @@
 					tousse.put("barcode",tousseInstance.getBarcode());
 					tousse.put("name",tousseInstance.getShowTousseName());
 					tousse.put("hasReceived",tousseInstance.hasReceived());
-					tousse.put("sterilingMode",StringUtils.defaultIfBlank(tousseInstance.getSterilingMode(), ""));
+					tousse.put("sterilingMode",StringUtils.defaultIfBlank(sterilizationMode, ""));
 					tousses.add(tousse);
 					tousseBarcodeInBasket += tousseInstance.getBarcode() + ";";// 过滤器械包用，存放在篮筐里的器械包，不需要再出现在toussesInfo信息中
 				}
+				if(CollectionUtils.size(sterilizationModeSet) == 1){
+					basketJson.put("sterilingMode", CollectionUtils.get(sterilizationModeSet, 0));
+				}
 				basketJson.put("tousses",tousses);
 				basketsInfo.add(basketJson);
 			}
@@ -3693,13 +3703,30 @@
 			ReviewedBasket basket = reviewedBasketManager
 					.getReviewedBasketForSterilizeRecord(barcode);
 			List<TousseInstanceVo> tousses = proxyDisinfectionManager.buildReviewedTousseInstanceVos(basket);
+			Set<String> sterilizationModeSet = new HashSet<String>();
+			if(CollectionUtils.isNotEmpty(tousses)){
+				for(TousseInstanceVo tousseInstanceVo : tousses){
+					String sterilizationMode = tousseInstanceVo.getSterilizationMode();
+					if(StringUtils.isBlank(sterilizationMode)){
+						sterilizationModeSet.add("");
+					}else{
+						sterilizationModeSet.add(sterilizationMode);
+					}
+				}
+				if(CollectionUtils.size(sterilizationModeSet) >= 2){
+					throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除");
+				}
+			}
 			JSONObject json = JSONUtil.buildJsonObject(true);
 			JSONObject dataJson = new JSONObject();
 			dataJson.put("barcode", container.getBarcode());
 			dataJson.put("name", container.getContainerName());
 			dataJson.put("produceDeptCode", container.getDepartCode());
 			dataJson.put("produceDeptName", container.getDepartName());
 			dataJson.put("notDeliverTousseAmount", notDeliverTousseAmount);
+			if(CollectionUtils.size(sterilizationModeSet) == 1){
+				dataJson.put("sterilizationMode", CollectionUtils.get(sterilizationModeSet, 0));
+			}
 			json.put("barcode", barcode);
 			json.put("type", "container");
 			json.put("data", dataJson);
@@ -3708,6 +3735,26 @@
 
 			// 器械包
 		} else if (barcodeDevice instanceof TousseInstance) {
+			//篮筐条码
+			String basketBarcode = params.optString("basketBarcode");
+			ReviewedBasket basket = reviewedBasketManager
+					.getReviewedBasketForSterilizeRecord(basketBarcode);
+			List<TousseInstanceVo> tousses = proxyDisinfectionManager.buildReviewedTousseInstanceVos(basket);
+			Set<String> sterilizationModeSet = new HashSet<String>();
+			if(CollectionUtils.isNotEmpty(tousses)){
+				for(TousseInstanceVo tousseInstanceVo : tousses){
+					String sterilizationMode = tousseInstanceVo.getSterilizationMode();
+					if(StringUtils.isBlank(sterilizationMode)){
+						sterilizationModeSet.add("");
+					}else{
+						sterilizationModeSet.add(sterilizationMode);
+					}
+				}
+				if(CollectionUtils.size(sterilizationModeSet) >= 2){
+					throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除");
+				}
+			}
+				
 			TousseInstance tousseInstance = (TousseInstance) barcodeDevice;
 			String departCodeOfTousse = tousseInstance.getOrgUnitCoding();
 			if (StringUtils.isNotEmpty(departCodeOfTousse)