Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jasper
===================================================================
diff -u -r17024 -r18602
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
===================================================================
diff -u -r18189 -r18602
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 18189)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 18602)
@@ -300,7 +300,7 @@
 						displayField : 'value',
 						store : new top.Ext.data.SimpleStore({
 							fields : [ 'value' ],
-								data : [[moduleNameArr[0]],[moduleNameArr[1]],[moduleNameArr[2]],[moduleNameArr[3]],[moduleNameArr[4]],[moduleNameArr[5]]]
+								data : [[moduleNameArr[0]],[moduleNameArr[1]],[moduleNameArr[2]],[moduleNameArr[3]],[moduleNameArr[4]],[moduleNameArr[5]],['全部环节']]
 							}
 						),
 						triggerAction : 'all',
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jrxml
===================================================================
diff -u -r17024 -r18602
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jrxml	(.../QualityMonitoringInspectMonthReportBarChartView.jrxml)	(revision 17024)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportBarChartView.jrxml	(.../QualityMonitoringInspectMonthReportBarChartView.jrxml)	(revision 18602)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="QualityMonitoringInspectMonthReportBarChartView" language="groovy" pageWidth="900" pageHeight="820" columnWidth="860" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a4bd6840-194c-46fe-8578-731e45745c24">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="QualityMonitoringInspectMonthReportBarChartView" language="groovy" pageWidth="1600" pageHeight="820" columnWidth="1560" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="a4bd6840-194c-46fe-8578-731e45745c24">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="540"/>
 	<property name="ireport.y" value="0"/>
 	<field name="month" class="java.lang.String">
 		<fieldDescription><![CDATA[month]]></fieldDescription>
@@ -19,7 +19,7 @@
 		<band height="420" splitType="Stretch">
 			<barChart>
 				<chart evaluationTime="Report" theme="aegean">
-					<reportElement uuid="7ae0bde5-c265-4ae0-b093-9238e548bd3e" x="21" y="14" width="839" height="406"/>
+					<reportElement uuid="7ae0bde5-c265-4ae0-b093-9238e548bd3e" x="21" y="14" width="1500" height="406"/>
 					<chartTitle/>
 					<chartSubtitle/>
 					<chartLegend/>
@@ -32,7 +32,28 @@
 					</categorySeries>
 				</categoryDataset>
 				<barPlot isShowLabels="true" isShowTickLabels="true" isShowTickMarks="false">
-					<plot/>
+					<plot>
+						<seriesColor seriesOrder="0" color="#006666"/>
+						<seriesColor seriesOrder="1" color="#B45D54"/>
+						<seriesColor seriesOrder="2" color="#FFFF66"/>
+						<seriesColor seriesOrder="3" color="#A5BD06"/>
+						<seriesColor seriesOrder="4" color="#4BA45B"/>
+						<seriesColor seriesOrder="5" color="#18E1C8"/>
+						<seriesColor seriesOrder="6" color="#EEACF6"/>
+						<seriesColor seriesOrder="7" color="#BAFEAF"/>
+						<seriesColor seriesOrder="8" color="#C4783A"/>
+						<seriesColor seriesOrder="9" color="#16100B"/>
+						<seriesColor seriesOrder="10" color="#61415D"/>
+						<seriesColor seriesOrder="11" color="#770158"/>
+						<seriesColor seriesOrder="12" color="#F164E8"/>
+						<seriesColor seriesOrder="13" color="#AD0868"/>
+						<seriesColor seriesOrder="14" color="#5BEFA3"/>
+						<seriesColor seriesOrder="15" color="#06A19C"/>
+						<seriesColor seriesOrder="16" color="#9999FF"/>
+						<seriesColor seriesOrder="17" color="#33CCFF"/>
+						<seriesColor seriesOrder="18" color="#999999"/>
+						<seriesColor seriesOrder="19" color="#FFCCCC"/>
+					</plot>
 					<itemLabel/>
 					<categoryAxisLabelExpression><![CDATA["时间"]]></categoryAxisLabelExpression>
 					<categoryAxisFormat>
@@ -41,7 +62,7 @@
 								<font size="11"/>
 							</labelFont>
 							<tickLabelFont>
-								<font size="11"/>
+								<font size="14" isBold="false" isUnderline="false"/>
 							</tickLabelFont>
 						</axisFormat>
 					</categoryAxisFormat>
@@ -51,6 +72,9 @@
 							<labelFont>
 								<font size="14"/>
 							</labelFont>
+							<tickLabelFont>
+								<font size="12"/>
+							</tickLabelFont>
 						</axisFormat>
 					</valueAxisFormat>
 				</barPlot>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jasper
===================================================================
diff -u -r16176 -r18602
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jrxml
===================================================================
diff -u -r16176 -r18602
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jrxml	(.../QualityMonitoringInspectMonthReportLineChartView.jrxml)	(revision 16176)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectMonthReportLineChartView.jrxml	(.../QualityMonitoringInspectMonthReportLineChartView.jrxml)	(revision 18602)
@@ -47,7 +47,26 @@
 				</categoryDataset>
 				<linePlot>
 					<plot>
-						<seriesColor seriesOrder="0" color="#456AFF"/>
+						<seriesColor seriesOrder="0" color="#09F520"/>
+						<seriesColor seriesOrder="1" color="#A51A7B"/>
+						<seriesColor seriesOrder="2" color="#43E5C7"/>
+						<seriesColor seriesOrder="3" color="#3739A5"/>
+						<seriesColor seriesOrder="4" color="#F412CA"/>
+						<seriesColor seriesOrder="5" color="#715590"/>
+						<seriesColor seriesOrder="6" color="#02BA30"/>
+						<seriesColor seriesOrder="7" color="#7039DB"/>
+						<seriesColor seriesOrder="8" color="#61DF21"/>
+						<seriesColor seriesOrder="9" color="#1BB6E8"/>
+						<seriesColor seriesOrder="10" color="#36503A"/>
+						<seriesColor seriesOrder="11" color="#B5CB49"/>
+						<seriesColor seriesOrder="12" color="#C798C5"/>
+						<seriesColor seriesOrder="13" color="#1522E6"/>
+						<seriesColor seriesOrder="14" color="#50398E"/>
+						<seriesColor seriesOrder="15" color="#FA5A42"/>
+						<seriesColor seriesOrder="16" color="#9D8B9E"/>
+						<seriesColor seriesOrder="17" color="#56EE8E"/>
+						<seriesColor seriesOrder="18" color="#215EAC"/>
+						<seriesColor seriesOrder="19" color="#A41ED0"/>
 					</plot>
 					<categoryAxisLabelExpression><![CDATA["年月"]]></categoryAxisLabelExpression>
 					<categoryAxisFormat>
@@ -62,7 +81,7 @@
 					</categoryAxisFormat>
 					<valueAxisLabelExpression><![CDATA["数量"]]></valueAxisLabelExpression>
 					<valueAxisFormat>
-						<axisFormat>
+						<axisFormat labelColor="#000000">
 							<labelFont>
 								<font size="11"/>
 							</labelFont>
@@ -71,6 +90,9 @@
 							</tickLabelFont>
 						</axisFormat>
 					</valueAxisFormat>
+					<domainAxisMinValueExpression><![CDATA[0]]></domainAxisMinValueExpression>
+					<domainAxisMaxValueExpression><![CDATA[0]]></domainAxisMaxValueExpression>
+					<rangeAxisMinValueExpression><![CDATA[0]]></rangeAxisMinValueExpression>
 				</linePlot>
 			</lineChart>
 		</band>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r18595 -r18602
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18595)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 18602)
@@ -13239,11 +13239,15 @@
 		if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(responsibilityType)){
 			String startYear = queryYear + "-01-01 00:00:00";
 			String nextYear = getNextYear(queryYear) + " 00:00:00";
+			String responsSql = "";
+			if(!"全部环节".equals(responsibilityType)){
+				responsSql = " and qmd.responsibilityPart='" + responsibilityType + "' ";
+			}
 			sql = " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fd.formName,sum(qmg.amount) "
 				+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmd ,QualityMonitoringGoods qmg "
 				+ " where qmi.id = fi.id and fi.formDefinition_id=fd.id and fd.id=qmd.id "
 				+ " and qmi.id=qmg.qualityMonitoringInstance_id "
-				+ " and qmd.responsibilityPart='" + responsibilityType + "' "
+				+ responsSql
 				+ " and fd.formType='" + type + "' "
 				+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear)
 				+ " and "+dateQueryAdapter.dateAdapter(nextYear)
@@ -13259,11 +13263,15 @@
 		if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(type) && StringUtils.isNotBlank(responsibilityType)){
 			String startTime = queryYear + "-" + queryMonth + "-01 00:00:00";
 			String endTime = getNextMonth(queryYear,queryMonth) + " 00:00:00";
+			String responsSql = "";
+			if(!"全部环节".equals(responsibilityType)){
+				responsSql = " and qmd.responsibilityPart='" + responsibilityType + "' ";
+			}
 			sql = " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","day") + " ,fd.formName,sum(qmg.amount) "
 					+ "from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmd ,QualityMonitoringGoods qmg "
 				+ " where qmi.id = fi.id and fi.formDefinition_id=fd.id and fd.id=qmd.id "
 				+ " and qmi.id=qmg.qualityMonitoringInstance_id "
-				+ " and qmd.responsibilityPart='" + responsibilityType + "' "
+				+ responsSql
 				+ " and fd.formType='" + type + "' "
 				+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startTime)
 				+ " and "+dateQueryAdapter.dateAdapter(endTime)
@@ -13500,6 +13508,10 @@
 	private List<String> getResultMameList(String monitoringType,String inspectItem,String inspectDetail,String responseType){
 		List<String> nameList = new ArrayList<String>();
 		if(StringUtils.isNotBlank(responseType)){
+			if("全部环节".equals(responseType)){
+				responseType = null;
+			}
+			// 责任环节为空时，会获取到全部环节
 			List<QualityMonitoringDefinition> qmdList = qualityMonitoringDefinitionManager.loadFormDefinitionGroupByTupeAndResponsibilityPart(monitoringType,responseType);
 			if(CollectionUtils.isNotEmpty(qmdList)){
 				for(QualityMonitoringDefinition qmd : qmdList){