Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r26611 -r26616
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26611)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26616)
@@ -3457,7 +3457,7 @@
 				RecyclingApplication recyclingApplication = (RecyclingApplication)invoicePlan;
 				if(recyclingApplication.getUseRecord() != null){
 					Long useId = recyclingApplication.getUseRecord().getId();
-					vo.setUserecordId(useId);
+					vo.setUseRecordId(useId);
 				}
 				vo.setOperationRoom(recyclingApplication.getOperationRoom());
 				
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r26611 -r26616
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26611)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26616)
@@ -1275,7 +1275,7 @@
                         }else{
                         	var ti = msg.tousseInstance;
 	   	                   	var td = ti.tousseDefinition;
-	   	                   	if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() != ''){
+	   	                   	if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#useRecordId').val() != ''){
 	   	                   		var existRow = tousseItemExists(td.id, td.name, td.tousseType);
 		   	                   	if(existRow == -1){
 		   	                   		alertDiv("不能添加申请单以外的物品 ");
@@ -2118,7 +2118,7 @@
         var recycleAmount = parseInt($('#recycleAmount'+row).val(),10);
         var applicationAmount = parseInt($('#applicationAmount'+row).val(),10);
         //是否开启限制使用记录转换的申请单不能添加别的物品
-        if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() !='' && recycleAmount > applicationAmount){
+        if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#useRecordId').val() !='' && recycleAmount > applicationAmount){
         	alertDiv("回收数量不能超过申请数量");
         	return false;
         }
@@ -3622,7 +3622,7 @@
 		return false;
 	}
 	//是否开启限制使用记录转换的申请单不能添加别的物品
-	if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#userecordId').val() != ''){
+	if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#useRecordId').val() != ''){
 		alertDiv("使用记录转换的申请单不能添加器械包");
 		return false;
 	}
@@ -4135,8 +4135,8 @@
             if(application == null)
             	return;
             recyclingStatus = application.recyclingStatus;
-            if(application.userecordId != null){
-            	$("#userecordId").val(application.userecordId);
+            if(application.useRecordId != null){
+            	$("#useRecordId").val(application.useRecordId);
             }
            	if(application.recyclingRecordId != null && application.type != TYPE_FOREIGNTOUSSEAPPLIACTION){//外来器械申请单二次回收,会有历史回收记录
            		loadRecyclingRecordById(application.recyclingRecordId);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r26611 -r26616
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 26611)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 26616)
@@ -287,7 +287,7 @@
             <input type="hidden" id="invoicePlanVersion" name="invoicePlanVersion"/>
             <input type="hidden" id="departCode" name="departCode"/>
             <input type="hidden" id="recyclingStatus" name="recyclingStatus"/>
-            <input type="hidden" id="userecordId" name="userecordId"/>
+            <input type="hidden" id="useRecordId" name="useRecordId"/>
             <input type="hidden" id="communicationUserCode" name="communicationUserCode"/>
             <div class="name">回收人&nbsp;&nbsp;<input id="recyclingUser" name="recyclingUser" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
             <div class="operator">清点人&nbsp;&nbsp;<input id="operator" name="operator" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java
===================================================================
diff -u -r26611 -r26616
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 26611)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/RecyclingApplicationVo.java	(.../RecyclingApplicationVo.java)	(revision 26616)
@@ -61,7 +61,7 @@
 	/**
 	 * 使用记录id
 	 */
-	private Long userecordId;
+	private Long useRecordId;
 	public Long getId() {
 		return id;
 	}
@@ -230,12 +230,12 @@
 		this.version = version;
 	}
 
-	public Long getUserecordId() {
-		return userecordId;
+	public Long getUseRecordId() {
+		return useRecordId;
 	}
 
-	public void setUserecordId(Long userecordId) {
-		this.userecordId = userecordId;
+	public void setUseRecordId(Long useRecordId) {
+		this.useRecordId = useRecordId;
 	}
 	
 }