Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordMergeConvert.js
===================================================================
diff -u -r20256 -r20265
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordMergeConvert.js	(.../useRecordMergeConvert.js)	(revision 20256)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordMergeConvert.js	(.../useRecordMergeConvert.js)	(revision 20265)
@@ -14,104 +14,7 @@
 	return mask;
 }
 
-// 生成申请单按钮被点击，选中的单的状态必须是已审核才能转换
-function convertButtonClicked(grid) {
 
-	var records = grid.getSelectionModel().getSelections();
-
-	if (records.length == 0) {
-		showResult("请选择要生成申请单的" + entityName + "！");
-		return false;
-	}
-	var ids = null;
-	var departMap = new Map();
-	for ( var i = 0, len = records.length; i < len; i++) {
-		if (records[i].data['status'] != '已审核') {
-			showResult('病人名称为“' + records[i].data['patientName']
-					+ '”的使用记录不能生成申请单,请确认使用记录已审核且未转化成申请单');
-			return false;
-		}
-		if (ids == null) {
-			ids = records[i].data['id'];
-		} else {
-			ids = ids + ';' + records[i].data['id'];
-		}
-		departMap.put(records[i].data['depart'], records[i].data['depart']);
-	}
-	
-	if (departMap.size() > 1){
-		Ext.MessageBox.alert("请确认", "所选择的使用记录的录入科室不一致，不能转换！");
-		return false;
-	}
-	var operatorStr = grid.getSelectionModel()
-	.getSelections()[0].data.operator;
-	var departStr = grid.getSelectionModel()
-	.getSelections()[0].data.depart;
-	var departCodingStr = grid.getSelectionModel()
-	.getSelections()[0].data.departCoding;
-	
-	var confirmMessage = "是否确定要将选中的" + entityName + "信息生成申请单？";
-	if(sstsConfig.auditAndConvertUseRecordConfirmMessage){
-		confirmMessage = "手术是否已完成，不需要追加器械包？";
-	}
-	Ext.MessageBox.confirm("请确认",confirmMessage,
-		function(button, text) {
-			if ("yes" == button) {
-				convertUseRecordToApplication(null, ids, operatorStr, departStr, departCodingStr, null);
-			}
-		});
-}
-
-function convertUseRecordToApplication(button, ids, operatorStr, departStr, departCodingStr, win) {
-
-				if (button != null){
-					button.disable(); // 防止重复点击
-				}
-				
-//				var mask = new Ext.LoadMask(Ext.getBody(),
-//                    {msg:'正在生成申请单，请稍候...'}
-//                ); 
-				getMask();
-				mask.msg = '正在生成申请单，请稍候...';
-				mask.show();
-				
-				Ext.Ajax.request({
-					url : WWWROOT
-							+ '/disinfectSystem/useRecordAction!createRecyclingApplicationByUseRecords.do',
-					params : {
-						ids : ids,
-						operator : operatorStr,
-						depart : departStr,
-						departCoding : departCodingStr,
-						applicationFormType : sstsConfig.applicationFormType
-					},
-					success : function(response, options) {
-						mask.hide();
-						var result = Ext.decode(response.responseText);
-						if(result.msg.length!=0){
-							showResult(result.msg);
-							Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
-						}else{
-							showResult("申请成功!");
-							Ext.getCmp("formSubmitResult").setValue(formSubmitResultSucc);
-							// 关闭使用记录的窗口，打开单张使用记录进行审核
-							if (win != null){
-								win.close();
-							}
-							grid.dwrReload();
-						}
-					},
-					failure : function(response, options) {
-						mask.hide();
-						Ext.getCmp("formSubmitResult").setValue(formSubmitResultFail);
-						if (button != null){
-							button.enable();
-						}
-					}
-				});
-				
-}
-
 	var useRecordSm = new Ext.grid.CheckboxSelectionModel({
 		singleSelect : false
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js
===================================================================
diff -u -r20156 -r20265
--- ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js	(.../config.js)	(revision 20156)
+++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js	(.../config.js)	(revision 20265)
@@ -67,5 +67,7 @@
   //启用PDA的器械包签收
   enablePDATousseSign:true,
   //使用记录转申请单备注信息(如使用记录的备注;住院号)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-  useRecordConvertRecyclingApplicationRemark : '@useRecordRemark;@hospitalNumber'
+  useRecordConvertRecyclingApplicationRemark : '@useRecordRemark;@hospitalNumber',
+  //启用使用记录多选合并转换功能
+  enableMultiUseRecordMergeConvert : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r20259 -r20265
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 20259)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 20265)
@@ -480,7 +480,7 @@
 		}
 	},{
 		text : '合并转换申请单',
-		hidden : SSTS_UseRecord_MergeConvert,
+		hidden : SSTS_UseRecord_MergeConvert || sstsConfig.enableMultiUseRecordMergeConvert != true,
 		iconCls : 'btn_ext_refresh',
 		handler : function() {
 			openUseRecordMergeConvertWin();