Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js
===================================================================
diff -u -r37664 -r41090
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 37664)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/yearWorkloadReportView2.js	(.../yearWorkloadReportView2.js)	(revision 41090)
@@ -109,19 +109,25 @@
 		for (var j = 0; j < titleArr.length; j++) {
 			var amount = 0;
 			var price = 0;
+			var doubleValue = 0;
+			var showDoubleValue = false;
 			var amountMap = {};
 			for (var k = 0; k < dateArray[item].length; k++) {
 				if (titleArr[j].children && titleArr[j].children.length > 0) {
 					if (dateArray[item][k].columnName.split('_')[0] == titleArr[j].title) {
 						amountMap[dateArray[item][k].columnName] = {
 							amount: dateArray[item][k].amount,
-							price: dateArray[item][k].price
+							price: dateArray[item][k].price,
+							doubleValue: dateArray[item][k].doubleValue,
+							showDoubleValue: dateArray[item][k].showDoubleValue
 						};
 					}
 				} else {
 					if (titleArr[j].title == dateArray[item][k].columnName) {
 						amount = dateArray[item][k].amount;
 						price = dateArray[item][k].price;
+						doubleValue = dateArray[item][k].doubleValue;
+						showDoubleValue = dateArray[item][k].showDoubleValue;
 						break;
 					}
 				}
@@ -131,7 +137,12 @@
 					var title = titleArr[j].title + '_' + titleArr[j].children[k];
 					var amount = amountMap[title] ? amountMap[title].amount : 0;
 					var price = amountMap[title] ? amountMap[title].price : 0;
+					var doubleValue = amountMap[title] ? amountMap[title].doubleValue : 0;
+					var showDoubleValue = amountMap[title] ? amountMap[title].showDoubleValue : false;
 					var value = (parseFloat(price) > 0) ? parseFloat(price).toFixed(2) : parseInt(amount);
+					if (showDoubleValue == true) {
+						value = parseFloat(doubleValue).toFixed(2)
+					}
 					html += "<td align='center' style='font-size:12px;border: 1px solid #000;height:30px;'>" + value + "</td>";
 				}
 			} else {
@@ -140,6 +151,9 @@
 					value = amount;
 				} else {
 					value = (parseFloat(price) > 0) ? parseFloat(price).toFixed(2) : parseInt(amount);
+					if (showDoubleValue == true) {
+						value = parseFloat(doubleValue).toFixed(2)
+					}
 				}
 				html += "<td align='center' style='font-size:12px;border: 1px solid #000;height:30px;'>" + value + "</td>";
 			}
@@ -215,9 +229,9 @@
 				type: 'category',
 				data: xAxisData,
 				axisLabel: {
-					show:true,
-					interval:0,
-					rotate:30
+					show: true,
+					interval: 0,
+					rotate: 30
 				},
 				axisPointer: {
 					type: 'shadow'
@@ -415,8 +429,8 @@
 							}
 							var dateArray = {};
 							var obj = {};
-							for (var i = 0; i <  result.data.length; i++) {
-								var month =  result.data[i].month;
+							for (var i = 0; i < result.data.length; i++) {
+								var month = result.data[i].month;
 								if (!dateArray[month]) {
 									if (month == '环比增减' || month == '同比增减') {
 										dateArray[month] = {
@@ -449,11 +463,11 @@
 								} else {
 									amount = parseInt(result.data[i].amount);
 								}
-								if(xAxisData.indexOf(columnName) > -1){
+								if (xAxisData.indexOf(columnName) > -1) {
 									obj[month][xAxisData.indexOf(columnName)] = amount
 								}
 							}
-							for(var item in dateArray){
+							for (var item in dateArray) {
 								if (obj[item]) {
 									dateArray[item].data = obj[item];
 									seriesData.push(dateArray[item]);