Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
===================================================================
diff -u -r23434 -r29496
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 23434)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 29496)
@@ -439,6 +439,10 @@
 					basketId = basket.getId();
 				}
 				List<TousseInstanceVo> tousses = proxyDisinfectionManager.buildReviewedTousseInstanceVos(basket);
+				int count = objectDao.countBySql("select count(0) from "+ TousseInstance.class.getSimpleName()
+						+" po where po.status='" + TousseInstance.STATUS_STERILED 
+						+ "' and po.reviewBasket_id in (select id from ReviewedBasket where container_id=" + container.getId() + ")");
+				json.put("notDeliverTousseAmount", count);
 				json.put("containerName", container.getContainerName());
 				json.put("purpose", container.getPurpose());
 				json.put("produceDeptCode", container.getDepartCode());
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
===================================================================
diff -u -r27042 -r29496
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 27042)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 29496)
@@ -159,6 +159,17 @@
 					if(container.isVirtualBasket()){
 						tousseInstanceManager.getVirtualBasketTousse(json, barcode, barcodeEnd);
 					}else{
+						//判断篮筐中是否有未发货(已灭菌)的器械包,如果有则进行提示
+						int count = objectDao.countBySql("select count(0) from "+ TousseInstance.class.getSimpleName()
+								+" po where po.status='" + TousseInstance.STATUS_STERILED 
+								+ "' and po.reviewBasket_id in (select id from ReviewedBasket where container_id=" + container.getId() + ")");
+						if(count > 0){
+							JSONUtil.addProperty(json, "returnType", "scanBasketFoundNotDeliverTousseInContainer");//扫描篮筐时发现有未发货的器械包
+							JSONUtil.addProperty(json, "notDeliverTousseAmount", count);//扫描篮筐时发现有未发货的器械包数量
+							JSONUtil.addProperty(json, "containerName", container.getContainerName());
+							JSONUtil.addProperty(json, "basketBarcode", container.getBarcode());
+							return JSONUtil.addProperty(json, "containerType", container.getPurpose()).toString();
+						}
 						barcodeManager.getContainerResult(json, barcode, barcodeEnd, container);
 					}		
 				}else if(barcodeDevice instanceof IDCardInstance){
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java
===================================================================
diff -u -r28802 -r29496
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java	(.../SterileLoadingTableManager.java)	(revision 28802)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/dwr/table/SterileLoadingTableManager.java	(.../SterileLoadingTableManager.java)	(revision 29496)
@@ -377,10 +377,12 @@
 					return json.toString();
 				}
 				//判断篮筐中是否有未发货(已灭菌)的器械包,如果有则进行提示
-				if(objectDao.countBySql("select count(0) from "+ TousseInstance.class.getSimpleName()
+				int count = objectDao.countBySql("select count(0) from "+ TousseInstance.class.getSimpleName()
 						+" po where po.status='" + TousseInstance.STATUS_STERILED 
-						+ "' and po.reviewBasket_id in (select id from ReviewedBasket where container_id=" + container.getId() + ")") > 0){
+						+ "' and po.reviewBasket_id in (select id from ReviewedBasket where container_id=" + container.getId() + ")");
+				if(count > 0){
 					JSONUtil.addProperty(json, "returnType", "scanBasketFoundNotDeliverTousseInContainer");//扫描篮筐时发现有未发货的器械包
+					JSONUtil.addProperty(json, "notDeliverTousseAmount", count);//扫描篮筐时发现有未发货的器械包数量
 					JSONUtil.addProperty(json, "containerName", container.getContainerName());
 					JSONUtil.addProperty(json, "basketBarcode", container.getBarcode());
 					return JSONUtil.addProperty(json, "containerType", container.getPurpose()).toString();