Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java
===================================================================
diff -u -r16512 -r18869
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 16512)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/action/ProxyDisinfectionAction.java	(.../ProxyDisinfectionAction.java)	(revision 18869)
@@ -388,6 +388,10 @@
 					// 验证器械包状态（已装配或已审核）
 					message = "只能录入已装配或者已审核的器械包";
 					success = false;
+				}else if(DatabaseUtil.isPoIdValid(tousseInstance.getReviewBasket_id())){
+					// 验证器械包是否已经进入灭菌筐
+					message = String.format("器械包[%s]已经进入灭菌筐，请将其从灭菌筐移除", tousseInstance.getTousseName());
+					success = false;
 				}else{
 					boolean isProxyed = false;
 					if (tousseInstance.getProxyDisinfection_id() != null) {
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r18819 -r18869
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 18819)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 18869)
@@ -878,7 +878,7 @@
 		List<TousseSimpleVO> vos = new ArrayList<TousseSimpleVO>();
 		String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
 		//普通器械包、消毒物品、敷料包
-		String sql = " select t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
+		String sql = " select distinct t.id id, t.depart depart, t.departCoding departCoding, t.tousseName name, td.tousseType, t.tousseName, b.barcode, t.validUntil, t.sterilingType,"
 				+ "t.orgUnitCoding, t.orgUnitName, t.foreignProxyItem_Id, t.proxyDisinfection_Id,t.reviewTime,t.isUrgentTousse  "
 				+ "from tousseinstance t, barcodedevice b , cssdHandleTousses tt , TousseDefinition td "
 				+ "where t.id = b.id and tt.tousseDefinitionId=td.ancestorID and t.tousseDefinition_id=td.id and t.reviewBasket_id ="