Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r28857 -r28888
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 28857)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 28888)
@@ -3777,7 +3777,7 @@
 
 	@Override
 	public void updateRecyclingStatus(Long useRecordId) {
-		UseRecord useRecord = (UseRecord) objectDao.getByID_ForUpdate(UseRecord.class.getSimpleName(), useRecordId);
+		UseRecord useRecord = (UseRecord) objectDao.getById(UseRecord.class.getSimpleName(), useRecordId);
 		
 		Integer needRecyclingAmount = new Integer(0);  	//需要回收的数量
 		Integer recycledAmount = new Integer(0);  		//已回收的数量
Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r28886 -r28888
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 28886)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 28888)
@@ -1606,7 +1606,7 @@
 			Map<Long, TousseInstance> tousseInstancesMap) {
 		// 锁定并获取器械包
 		List<TousseInstance> lockedTousseInstanceList = objectDao
-				.findByIds_ForUpdate(TousseInstance.class.getSimpleName(),
+				.findByIds(TousseInstance.class.getSimpleName(),
 						tousseInstanceIDList);
 		if (lockedTousseInstanceList == null
 				|| lockedTousseInstanceList.size() != tousseInstanceIDList
@@ -2469,14 +2469,14 @@
 			orginalTousseInstance.setErrorRemark(modifiedTousseInstance.getErrorRemark());
 			orginalTousseInstance.setDamageRemark(modifiedTousseInstance.getDamageRemark());
 		}else{
-			orginalTousseInstance = (TousseInstance)objectDao.getByID_ForUpdate(TousseInstance.class.getSimpleName(), modifiedTousseInstance.getId());
+			orginalTousseInstance = (TousseInstance)objectDao.getById(TousseInstance.class.getSimpleName(), modifiedTousseInstance.getId());
 			orginalTousseInstance.setErrorRemark(modifiedTousseInstance.getErrorRemark());
 			orginalTousseInstance.setDamageRemark(modifiedTousseInstance.getDamageRemark());
 			objectDao.saveOrUpdate(orginalTousseInstance);
 		}
 		//1.查询数据库中该包实例是否存在录使用记录的丢失报损信息
 		List<TousseMaterialErrorDamage> materialErrorDamageListInDb = 
-				objectDao.findBySql_ForUpdate(TousseMaterialErrorDamage.class.getSimpleName(), 
+				objectDao.findBySql(TousseMaterialErrorDamage.class.getSimpleName(), 
 						" where tousseInstanceId=" + modifiedTousseInstance.getId() + " and linkType='"+ TousseMaterialErrorDamage.LINKTYPE_USERECORD +"'");
 		
 		//2.查询出前台传过来的该包实例的丢失报损信息
@@ -2677,7 +2677,7 @@
 				CssdUtils.getSystemSetConfigByNameBool("foreignTousseAndInsideTousseMergeToTheSameComboApplicationAfterUseRecordConvert");
 
 		for (Long id : ids) {
-			UseRecord useRecord = getForUpdate(id);
+			UseRecord useRecord = get(id);
 			useRecordList.add(useRecord);
 			//考虑到要录入一次性物品,上面一行暂时会报错,所以先将上一行注释
 			@SuppressWarnings("unchecked")
@@ -3361,7 +3361,7 @@
 							: " and (deliverStatus is null or deliverStatus = '') ";
 					
 					//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 							"where 1=1 and useRecord is not null and departCoding='"+ departCoding + "'"
 									+ "and (sterilizationMode is null or "+ SqlUtils.getStringFieldNotInCollectionsPredicate("sterilizationMode", lowTempSterilizationModesJSONArray) +")"
 									+ "and type in ('"+ InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM +"') "
@@ -3566,7 +3566,7 @@
 							: " and (deliverStatus is null or deliverStatus = '') ";
 					
 					//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 							"where 1=1 and useRecord is not null and departCoding='"+ departCoding + "'"
 									+ operationRoomSql
 									+ "and type in ('"+ InvoicePlan.TYPE_COMBO_FORM +"') "
@@ -3696,7 +3696,7 @@
 							: " and (deliverStatus is null or deliverStatus = '') ";
 					
 					//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+					RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 							"where 1=1 and useRecord is not null and departCoding='"+ departCoding + "'"
 									+ "and type in ('"+ InvoicePlan.TYPE_COMBO_FORM +"') "
 									+ "and (endStatus is null) " + deliverStatusCondition
@@ -3898,7 +3898,7 @@
 						: " and (deliverStatus is null or deliverStatus = '')";
 				
 				//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-				RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+				RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 						"where 1=1 and useRecord is not null and departCoding='"+ departCoding + "'"
 								+ operationRoomSql
 								+ "and type in ('"+ InvoicePlan.TYPE_COMBO_FORM +"') "
@@ -4027,7 +4027,7 @@
 						: " and (deliverStatus is null or deliverStatus = '')";
 				
 				//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-				RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+				RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 						"where 1=1 and useRecord is not null and departCoding='"+ departCoding + "'"
 								+ "and type in ('"+ InvoicePlan.TYPE_COMBO_FORM +"') "
 								+ "and (endStatus is null) " + deliverStatusCondition
@@ -5314,7 +5314,7 @@
 							: " and (deliverStatus is null or deliverStatus = '') ";
 			
 			//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-			RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+			RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 					"where 1=1 and useRecord is not null and sterilizationMode='"+ sterilizationMode +"' and departCoding='"+ departCoding + "'"
 							+ operationRoomSql
 							+ "and type = '"+ invoicePlanTypeAfterTousseConvert +"' "
@@ -5423,7 +5423,7 @@
 							: " and (deliverStatus is null or deliverStatus = '') ";
 			
 			//查询该科室的手术间与当前使用记录的手术单相同的申请单(且未终止、待回收、未发货),也是使用记录转换的申请单
-			RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql_ForUpdate(RecyclingApplication.class.getSimpleName(), 
+			RecyclingApplication recyclingApplication = (RecyclingApplication)objectDao.getBySql(RecyclingApplication.class.getSimpleName(), 
 					"where 1=1 and useRecord is not null and sterilizationMode='"+ sterilizationMode +"' and departCoding='"+ departCoding + "'"
 							+ "and type = '"+ invoicePlanTypeAfterTousseConvert +"' "
 							+ "and (endStatus is null) " + deliverStatusCondition
@@ -5991,7 +5991,7 @@
 			Collection<String> patientNames = new ArrayList<String>();
 			Collection<String> circuitNurses = new ArrayList<String>();
 			String[] ids = StringUtils.split(userRecordIds, ';');
-			List<UseRecord> useRecordList = getByHqlForUpdate(" id in ("+ StringUtils.join(ids,",") +")");
+			List<UseRecord> useRecordList = getByHql(" id in ("+ StringUtils.join(ids,",") +")");
 			UseRecord lastUseRecord = null;
 			for (UseRecord useRecord : useRecordList) {
 				useRecord.setOperator(applicant);
@@ -6192,7 +6192,7 @@
 	public void saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED(UseRecord modified,String operator, String depart, 
 			String departCoding,Date applicationCreateDate,String applicationFormType){
 		if(DatabaseUtil.isPoIdValid(modified.getId())){
-			modified = (UseRecord)objectDao.getByID_ForUpdate(UseRecord.class.getSimpleName(), modified.getId());
+			modified = (UseRecord)objectDao.getById(UseRecord.class.getSimpleName(), modified.getId());
 		}
 		if(modified.isApplied()){
 			throw new RuntimeException("该使用记录已转换申请单!");
@@ -6210,7 +6210,7 @@
 	public void saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED(UseRecord modified,String operator, String depart, 
 			String departCoding,Date applicationCreateDate,String applicationFormType,String reviewer,String reviewCode) throws Exception{
 		if(DatabaseUtil.isPoIdValid(modified.getId())){
-			modified = (UseRecord)objectDao.getByID_ForUpdate(UseRecord.class.getSimpleName(), modified.getId());
+			modified = (UseRecord)objectDao.getById(UseRecord.class.getSimpleName(), modified.getId());
 		}
 		if(modified.isApplied()){
 			throw new RuntimeException("该使用记录已转换申请单!");