Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r34097 -r34651
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 34097)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 34651)
@@ -1938,6 +1938,49 @@
 							}]
 						}
 					]
+				},{
+					xtype: "fieldset",
+					title: '可追溯器械参数设置',
+					layout: 'column',
+					width: itemWidth,
+					height: 80,
+					labelWidth: 95,
+					hidden:!sstsConfig.enableInstrumentLifeCycleTraceabilityManagement,
+					items: [
+						{
+							layout: 'form',
+							labelWidth: 220,
+							columnWidth: .25,
+							items: [{
+								xtype: 'numberfield',
+								fieldLabel: "器械使用率工作天数系数配置",
+								allowBlank: true,
+								allowNegative: false,
+								allowDecimals:false,
+								minValue: 1,
+								name: 'instrumentUseRateWorkingDay',
+								id: 'instrumentUseRateWorkingDay',
+								anchor: '100%'
+							}]
+						},
+						{
+							layout: 'form',
+							labelWidth: 220,
+							columnWidth: .25,
+							items: [{
+								xtype: 'button',
+								text: "为启用标识牌的包绑定器械实例",
+								style:'margin-left:10px',
+								handler:function(){
+									top.Ext.Msg.confirm('请确认', '是否为所有未添加器械实例的标识牌绑定实例？', function (btn) {
+										if (btn == 'yes') {
+											
+										}
+									})
+								}
+							}]
+						}
+					]
 				}, {
 					xtype: "fieldset",
 					title: '发货参数设置',
@@ -3197,6 +3240,16 @@
 						ftApplyDepartmentCode = Ext.getCmp("ftApplyDepartmentCode").getValue();
 					}
 
+					var instrumentUseRateWorkingDay = '';
+
+					if(sstsConfig.enableInstrumentLifeCycleTraceabilityManagement){
+						instrumentUseRateWorkingDay = Ext.getCmp("instrumentUseRateWorkingDay").getValue();
+						if(instrumentUseRateWorkingDay == '' || instrumentUseRateWorkingDay == 0){
+							showResult('器械使用率工作天数系数不能为空或0！');
+							return false;
+						}
+					}
+
 					var mergeApplicationDepartNameAndCodeArr = "";
 					if (autoMergeApplication == "否" || autoMergeApplication == "") {
 						mergeApplicationDepartNameAndCodeArr = "";
@@ -3301,6 +3354,7 @@
 							supplierCertificationExpTime: supplierCertificationExpTime, //供应商注册证预警期
 							expensiveGoodsBillWarningTime: expensiveGoodsBillWarningTime,//高值耗材发票预警期
 							noMergeApplicationTypes: noMergeApplicationTypes,
+							instrumentUseRateWorkingDay:instrumentUseRateWorkingDay,
 							mergeApplicationDepartArr: mergeApplicationDepartNameAndCodeArr, //自动合并申请单的科室编码和科室名称
 							receiptor: receiptor //自动签收发货单的签收人名字
 						},
@@ -3391,6 +3445,9 @@
 			if (supplyRoomConfig.ctPrintOrgSource != null) {//自定义器械包打印科室来源
 				Ext.getCmp('ctPrintOrgSource').setValue(supplyRoomConfig.ctPrintOrgSource);
 			}
+			if (supplyRoomConfig.instrumentUseRateWorkingDay != null && sstsConfig.enableInstrumentLifeCycleTraceabilityManagement) {//器械使用率工作天数系数配置
+				Ext.getCmp('instrumentUseRateWorkingDay').setValue(supplyRoomConfig.instrumentUseRateWorkingDay);
+			}
 			if (supplyRoomConfig.invoiceOrigin != null) {
 				Ext.getCmp('invoiceOrigin').setValue(supplyRoomConfig.invoiceOrigin);
 			}