Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js
===================================================================
diff -u -r26161 -r37237
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js	(.../setWorkScoreConfig.js)	(revision 26161)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setWorkScoreConfig.js	(.../setWorkScoreConfig.js)	(revision 37237)
@@ -1,3 +1,12 @@
+//DGSDBZXYY-220：改进
+var showAmountSources = false;
+var isStrengthen = sstsConfig.strengthenStatisticalWorkload;
+var enableScoreByIntegralFieldOfTousseDefinitionInStaffStatisticalWorkloadReport = sstsConfig.enableScoreByIntegralFieldOfTousseDefinitionInStaffStatisticalWorkloadReport;
+if(!enableScoreByIntegralFieldOfTousseDefinitionInStaffStatisticalWorkloadReport && isStrengthen){
+	showAmountSources = true;
+}
+var enableIntegralOfTousseDefinition = sstsConfig.enableIntegralOfTousseDefinition;
+
 function removeGridItem(){
 	var gridPanel = top.Ext.getCmp('configGrid');
 	var rows = gridPanel.getSelectionModel().getSelections();// 返回值为
@@ -9,7 +18,7 @@
 	}
 }
 
-var itemRecord = Ext.data.Record.create([{name : 'name'},{name : 'value'}]);
+var itemRecord = Ext.data.Record.create([{name : 'name'},{name : 'value'},{name : 'dataSources'},{name : 'multiplyIntegralCoefficient'}]);
 function addRecordItem(){
 	var modelType = top.Ext.getCmp("modelType").getValue();
 	var value = top.Ext.getCmp("value").getValue();
@@ -24,6 +33,16 @@
 
 	var gridPanel = top.Ext.getCmp('configGrid');
 	var scoreConfigStore = gridPanel.getStore();
+
+	var dataSources = 0;
+	if(showAmountSources){
+		dataSources = top.Ext.getCmp("dataSources").getValue();
+	}
+
+	var multiplyIntegralCoefficient = 0;
+	if(enableIntegralOfTousseDefinition){
+		multiplyIntegralCoefficient = top.Ext.getCmp("multiplyIntegralCoefficient").getValue();
+	}
 	
 	var isExist = false;  //此物品名称是否已经添加过
 	for (var i = 0; i < scoreConfigStore.getCount(); i++) {
@@ -34,17 +53,18 @@
 		 }
 	}
 	if(!isExist){
-		var record = new itemRecord({name : modelType,value : value});
+		var record = new itemRecord({name : modelType,value : value,dataSources : dataSources,multiplyIntegralCoefficient : multiplyIntegralCoefficient});
 		 scoreConfigStore.add(record);
 		 top.Ext.getCmp('modelType').setValue('');
 		 top.Ext.getCmp('value').setValue('');
+		 top.Ext.getCmp('dataSources').setValue(0);
+		 top.Ext.getCmp('multiplyIntegralCoefficient').setValue(0);
 	}else{
 		showResult(modelType + "已添加！");
 	} 
 }
 
 function setWorkScoreConfig(){
-
 	var scoreConfigStore = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/jasperreports/jasperreportsAction!getWorkScoreConfig.do',
@@ -53,7 +73,9 @@
 		reader : new Ext.data.JsonReader({
 			fields : [
 			   {name : 'name'},
-			   {name : 'value'}
+			   {name : 'value'},
+			   {name : 'dataSources'},
+			   {name : 'multiplyIntegralCoefficient'}
 			]
 		})
 	});
@@ -64,6 +86,22 @@
 		fields : ['value'],
 		data : [ ['预回收数量'],['检查数量'],['回收数量'],['清点数量'],['清洗数量'],['配包数量'],['审核数量'],['灭菌数量'],['发货数量'],['核对数量'],['下送数量']]
 	});
+
+	//DGSDBZXYY-220：数量来源
+	var dataSourceStore = new Ext.data.SimpleStore({
+		fields : ['value','text'],
+		data : [ [0,'件数'],[1,'包数']]
+	});
+
+	var width = 620;
+	if(enableIntegralOfTousseDefinition){
+		width = 820;
+	}
+
+	var multiplyIntegralCoefficientStore = new Ext.data.SimpleStore({
+		fields : ['value','text'],
+		data : [ [0,'否'],[1,'是']]
+	});
 	
 	var cm = new top.Ext.grid.ColumnModel([new top.Ext.grid.RowNumberer({header:"序号",width:50}),
 	{
@@ -76,9 +114,33 @@
 		width:100,
 		dataIndex : 'name'
 	},{
+		header : "数量来源",
+		width:100,
+		hidden:!showAmountSources,
+		dataIndex : 'dataSources',
+		renderer: function(v,p,record){
+			if(v == 1 || v == '1'){
+				return '包数';
+			}else {
+				return '件数';
+			}
+		}
+	},{
 		header : "评分单位",
 		width:80,
 		dataIndex : 'value'
+	},{
+		header : "乘以积分系数",
+		width:100,
+		hidden:!enableIntegralOfTousseDefinition,
+		dataIndex : 'multiplyIntegralCoefficient',
+		renderer: function(v,p,record){
+			if(v == 1 || v == '1'){
+				return '是';
+			}else {
+				return '否';
+			}
+		}
 	},{ 
 		id : 'deleteItem',
 		header:'删除',
@@ -103,8 +165,39 @@
 		editable : false,
 		mode : 'local',
 		triggerAction : 'all',
+		width:100,
 		anchor : '95%'
 	},{
+		text : '数量来源：',
+		hidden:!showAmountSources
+	},{
+		xtype : 'combo',
+		id : 'dataSources',
+		name : 'dataSources',
+		valueField : 'value',
+		displayField : 'text',
+		store : dataSourceStore,
+		hidden:!showAmountSources,
+		forceSelection : true,
+		editable : false,
+		mode : 'local',
+		triggerAction : 'all',
+		width:100,
+		value:0,
+		anchor : '95%',
+		listeners:{
+			select:function(combo, record, index){
+				if(enableIntegralOfTousseDefinition){
+					if(record.data.value == 1){
+						top.Ext.getCmp('multiplyIntegralCoefficient').enable();
+					}else {
+						top.Ext.getCmp('multiplyIntegralCoefficient').disable();
+						top.Ext.getCmp('multiplyIntegralCoefficient').setValue(0);
+					}
+				}
+			}
+		}
+	},{
 		text : '评分单位：'
 	},{
 		xtype : 'numberfield',
@@ -124,6 +217,25 @@
 			}
 		}
 	},{
+		text : '乘以积分系数：',
+		hidden:!enableIntegralOfTousseDefinition
+	},{
+		xtype : 'combo',
+		id : 'multiplyIntegralCoefficient',
+		name : 'multiplyIntegralCoefficient',
+		valueField : 'value',
+		displayField : 'text',
+		store : multiplyIntegralCoefficientStore,
+		hidden:!enableIntegralOfTousseDefinition,
+		forceSelection : true,
+		editable : false,
+		disabled:true,
+		mode : 'local',
+		triggerAction : 'all',
+		width:100,
+		value:0,
+		anchor : '95%'
+	},{
 		text : '添加',
 		iconCls : 'btn_ext_add',
 		handler : function () {
@@ -168,7 +280,9 @@
 					var record = scoreConfigStore.getAt(i);
 					scoreConfigArray.push({
 						name : record.get("name"),
-						value : record.get("value")
+						value : record.get("value"),
+						dataSources : record.get("dataSources"),
+						multiplyIntegralCoefficient : record.get("multiplyIntegralCoefficient")
 					});
 				}
 				JasperreportsTableManager.setWorkScoreConfig(JSON.stringify(scoreConfigArray),function(result){
@@ -193,7 +307,7 @@
 		id : 'deviceMaintenanceWin',
 		layout : 'fit',
 		title : '评分标准配置',
-		width : 620,
+		width : width,
 		modal : true,
 		autoHeight : true,
 		border : false,