Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r19781 -r19830
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19781)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 19830)
@@ -115,27 +115,6 @@
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
-	public List<IDCardDefinition> findAllIDCardDefinition() {
-
-		List<IDCardDefinition> idCardDefinitions = objectDao.findBySql(
-				IDCardDefinition.class.getSimpleName(), "where 1=1");
-		return idCardDefinitions;
-	}
-
-	@Override
-	public IDCardDefinition getIDCardDefinitionByID(String id) {
-
-		return (IDCardDefinition) objectDao.getByProperty(
-				IDCardDefinition.class.getSimpleName(), "id", Long.valueOf(id));
-	}
-	@Override
-	public IDCardDefinition getIDCardDefinitionById_ForUpdate(String id){
-		return (IDCardDefinition) objectDao.getByProperty_ForUpdate(
-				IDCardDefinition.class.getSimpleName(), "id", Long.valueOf(id));
-	}
-
-	@Override
 	public IDCardDefinition getIDCardDefinitionByIDCardInstanceId(
 			String instanceId) {
 		String sql = "select idCardDefinitionID from idCardInstance where id = "
@@ -145,8 +124,7 @@
 		try {
 			while (rs.next()) {
 				long idCardDefinitionId = rs.getLong("idCardDefinitionID");
-				idCardDefinition = getIDCardDefinitionByID(idCardDefinitionId
-						+ "");
+				idCardDefinition = get(idCardDefinitionId);
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
@@ -168,7 +146,7 @@
 			IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice;
 			try {
 				idCardInstance.isCanUse(objectDao, true);
-				IDCardDefinition idCardDefinition = getIDCardDefinitionByID(idCardInstance.getIdCardDefinitionID().toString());
+				IDCardDefinition idCardDefinition = get(idCardInstance.getIdCardDefinitionID());
 				TousseDefinition tousseDefinition = tousseDefinitionManager
 						.getTousseDefinitionByIDCardInstance(idCardInstance);
 
@@ -314,7 +292,7 @@
 	@Override
 	public JSONArray getIDCardInstanceByIDCardDefinitionId(String id){
 		JSONArray array = new JSONArray();
-		IDCardDefinition idCardDefinition = getIDCardDefinitionByID(id);
+		IDCardDefinition idCardDefinition = get(id);
 		List<IDCardInstance> idCardInstances = idCardDefinition
 				.getIDCardInstances(objectDao);
 		if (idCardInstances.size() > 0) {
@@ -366,7 +344,7 @@
 	@Override
 	public JSONArray getTraceableMaterialByIDCardDefinitionId(String id){
 		JSONArray materialsArr = new JSONArray();
-		IDCardDefinition idCardDefinition = getIDCardDefinitionByID(id);
+		IDCardDefinition idCardDefinition = get(id);
 		List<TraceableMaterial> traceableMaterials = idCardDefinition
 				.getTraceableMaterials(objectDao);
 		if (traceableMaterials.size() > 0) {
@@ -464,7 +442,7 @@
 		}
 
 		// 新建标识牌实例
-		IDCardDefinition idCardDefinition = getIDCardDefinitionByID(idCardDefinitionID);
+		IDCardDefinition idCardDefinition = get(idCardDefinitionID);
 		if (idCardDefinition == null) {
 			throw new RuntimeException("标识牌定义已被删除!");
 		}
@@ -533,7 +511,7 @@
 		}
 		error.setAdditionalAmount(error.getAdditionalAmount() + 1);
 		// 新建标识牌实例
-		IDCardDefinition idCardDefinition = getIDCardDefinitionByID(idCardDefinitionID);
+		IDCardDefinition idCardDefinition = get(idCardDefinitionID);
 		if (idCardDefinition == null) {
 			throw new RuntimeException("标识牌定义已被删除!");
 		}
@@ -676,8 +654,8 @@
 			throw new RuntimeException("器械包定义已被删除!");
 		}
 
-		IDCardDefinition idCardDefinitionFrom = getIDCardDefinitionByID(fromIDCardDefinitionID);
-		IDCardDefinition idCardDefinitionTo = getIDCardDefinitionByID(toIDCardDefinitionID);
+		IDCardDefinition idCardDefinitionFrom = get(fromIDCardDefinitionID);
+		IDCardDefinition idCardDefinitionTo = get(toIDCardDefinitionID);
 		if (idCardDefinitionFrom == null) {
 			throw new RuntimeException("标识牌已被删除!");
 		}
@@ -760,7 +738,7 @@
 	}
 	@Override
 	public void saveTraceableMaterials_TRANS_REQUIRED(String idCardDefinitionId,String originalTraceableMaterialsStr,String traceableMaterialsStr){
-		IDCardDefinition curIDCardDefinition = getIDCardDefinitionById_ForUpdate(idCardDefinitionId);
+		IDCardDefinition curIDCardDefinition = getForUpdate(idCardDefinitionId);
 		if (curIDCardDefinition == null) {
 			throw new RuntimeException("标识牌已被删除!");
 		}
@@ -919,7 +897,7 @@
 		JSONObject idCardDefinition = JSONObject.fromObject(idCardDefinitionStr);
 		
 		Long idCardDefinitionId = JSONUtil.optLong(idCardDefinition, "id", null);
-		IDCardDefinition curIDCardDefinition = getIDCardDefinitionById_ForUpdate(idCardDefinitionId.toString());
+		IDCardDefinition curIDCardDefinition = getForUpdate(idCardDefinitionId);
 		if (curIDCardDefinition == null) {
 			throw new RuntimeException("标识牌已被删除!");
 		}
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
===================================================================
diff -u -r19781 -r19830
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 19781)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 19830)
@@ -9,17 +9,11 @@
 import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition;
 import com.forgon.tools.hibernate.BasePoManager;
 
-public interface IDCardDefinitionManager extends BasePoManager<IDCardDefinition> {
+public interface IDCardDefinitionManager extends BasePoManager<IDCardDefinition> {	
 
-	public IDCardDefinition getIDCardDefinitionByID(String id);
-	public IDCardDefinition getIDCardDefinitionById_ForUpdate(String id);
-	
-
 	public IDCardDefinition getIDCardDefinitionByIDCardInstanceId(
 			String instanceId);
 
-	public List<IDCardDefinition> findAllIDCardDefinition();
-
 	public String getAvailableDefinitionByBarcode(String barcode);
 
 	public boolean isIdCardBarcodeMatchTousseDefinition(String idCardBarcode,
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r19829 -r19830
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19829)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 19830)
@@ -3977,7 +3977,7 @@
 		if(StringUtils.isBlank(idCardDefinitionId)){
 			throw new RuntimeException("标识牌定义id不能为空!");
 		}
-		IDCardDefinition idCardDefinition = idCardDefinitionManager.getIDCardDefinitionById_ForUpdate(idCardDefinitionId);
+		IDCardDefinition idCardDefinition = idCardDefinitionManager.getForUpdate(idCardDefinitionId);
 		if(idCardDefinition == null){
 			throw new RuntimeException("标识牌定义已被删除!");
 		}
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java
===================================================================
diff -u -r19824 -r19830
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 19824)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/action/IDCardDefinitionAction.java	(.../IDCardDefinitionAction.java)	(revision 19830)
@@ -321,8 +321,7 @@
 	public void iniInfo() {
 		String id = StrutsParamUtils.getPraramValue("id", "");
 		if (StringUtils.isNotBlank(id)) {
-			idCardDefinition = idCardDefinitionManager
-					.getIDCardDefinitionByID(id);
+			idCardDefinition = idCardDefinitionManager.get(id);
 		}
 	}
 
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r19829 -r19830
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 19829)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 19830)
@@ -1008,11 +1008,8 @@
 									idCardInstance);
 					if (tousseInstance == null) {
 //						errorMessage = "没有找到和标识牌绑定的器械包!";
-						Long idCardDefinitionId = idCardInstance
-								.getIdCardDefinitionID();
-						IDCardDefinition def = idCardDefinitionManager
-								.getIDCardDefinitionByID(""
-										+ idCardDefinitionId);
+						Long idCardDefinitionId = idCardInstance.getIdCardDefinitionID();
+						IDCardDefinition def = idCardDefinitionManager.get(idCardDefinitionId);
 						if (def != null) {
 							tousseInstance = new TousseInstance();
 							TousseDefinition td = tousseDefinitionManager.get(def.getTousseDefinitionID());