Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r19425 -r19577
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 19425)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 19577)
@@ -1349,5 +1349,4 @@
 		this.hidePackingTask = hidePackingTask;
 	}
 	
-	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r19445 -r19577
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19445)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 19577)
@@ -452,7 +452,7 @@
 	 * 器械交接明细项的id(预回收中扫描条码,记录扫描的包实例的条码)
 	 */
 	private Long tousseTransitionItemId;
-	/*
+	/**
 	 * 是否被重新替换的包的条码，这个字段不为空时，是包需要重新装配。
 	 */
 	private String  insteadTiBarcode;
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r19287 -r19577
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19287)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19577)
@@ -402,7 +402,7 @@
 		String sql = "select td.name from barcodeDevice b,idCardInstance wci,"
 				+ "idCardDefinition wcd,tousseDefinition td "
 				+ "where b.id = wci.id and wci.idCardDefinitionID = wcd.id"
-				+ " and wcd.tousseDefinitionID = td.id and wcd.deleted = 0 and b.barcode = '"
+				+ " and wcd.tousseDefinitionID = td.id and wcd.deleted != 1 and b.barcode = '"
 				+ idCardBarcode + "' and td.name = '" + tousseName + "'";
 		ResultSet rs = objectDao.executeSql(sql);
 		try {