Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringInspectMonthReportHelper.java
===================================================================
diff -u -r38286 -r38287
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringInspectMonthReportHelper.java	(.../QualityMonitoringInspectMonthReportHelper.java)	(revision 38286)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringInspectMonthReportHelper.java	(.../QualityMonitoringInspectMonthReportHelper.java)	(revision 38287)
@@ -110,7 +110,9 @@
 			}else{
 				resultNameList = getResultNameList(monitoringType,inspectItem,inspectDetail,null, startTime, endTime);
 				// 查询细则的统计结果 单选和多选
-				sql = "select monthstr,answer, sum(count) count from ( select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") +" monthstr,fiOption.answer,sum(qmd.amount) count "
+				sql = ""
+						//+ "select monthstr,answer, sum(count) count from ( "
+						+ "select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") +" monthstr,fiOption.answer,sum(qmd.amount) count "
 						+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmdf,FormInstanceItem fiItem,FormDefinitionItem fdi,FormInstanceOptionValue fiOption,QualityMonitoringGoods qmd "
 						+ " where qmdf.id=fd.id and qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id and fiOption.formInstanceItem_id = fiItem.id "
 						+ " and qmi.id=qmd.qualityMonitoringInstance_id "
@@ -124,7 +126,7 @@
 						+ "and "+dateQueryAdapter.dateAdapter(endTime)
 						+ " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") + " ,fiOption.answer ";
 				//不是单选和多选
-				sql += " union all select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") +" monthstr,fiItem.answer,sum(qmd.amount) count "
+/*				sql += " union all select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") +" monthstr,fiItem.answer,sum(qmd.amount) count "
 						+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmdf,FormInstanceItem fiItem,FormDefinitionItem fdi,QualityMonitoringGoods qmd "
 						+ " where qmdf.id=fd.id and qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id  and fiItem.formDefinitionItem_id = fdi.id  "
 						+ " and qmi.id=qmd.qualityMonitoringInstance_id "
@@ -135,7 +137,8 @@
 						+ " and not exists (select 1 from FormInstanceOptionValue fov where fov.formInstanceItem_id=fiItem.id) and fiItem.answer is not null and fiItem.answer<>'' and fdi.isReportDisplay='是' and fdi.name = '" + inspectDetail + "'"
 						+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startTime)
 						+ "and "+dateQueryAdapter.dateAdapter(endTime)
-						+ " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") + " ,fiItem.answer) t group by monthstr,answer ";
+						+ " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","dd") + " "
+								+ ",fiItem.answer) t group by monthstr,answer ";*/
 			}
 		}
 		if(StringUtils.isNotBlank(sql)){
@@ -310,8 +313,10 @@
 								+ " group by "  + " fdi.name ";
 					}else{
 						resultNameList = getResultNameList(monitoringType,inspectItem,inspectDetail,null, startDay, endDay);
-						// 查询细则的统计结果
-						sql = "select answer,sum(count) count from (select fiOption.answer,sum(qmg.amount) count "
+						// 查询细则的统计结果(单选和多选)
+						sql = 	""
+								//+ "select answer,sum(count) count from ("
+								+ "select fiOption.answer,sum(qmg.amount) count "
 								+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmdf,FormInstanceItem fiItem"
 								+ " ,FormDefinitionItem fdi,FormInstanceOptionValue fiOption,QualityMonitoringGoods qmg "
 								+ " where qmdf.id=fd.id and qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id "
@@ -325,7 +330,8 @@
 								+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay)
 								+ "and "+dateQueryAdapter.dateAdapter(endDay)
 								+ " group by "+ " fiOption.answer ";
-						sql += " union all select fiItem.answer,sum(qmg.amount) count "
+						//非单选和多选
+/*						sql += " union all select fiItem.answer,sum(qmg.amount) count "
 								+ " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmdf,FormInstanceItem fiItem"
 								+ " ,FormDefinitionItem fdi,QualityMonitoringGoods qmg "
 								+ " where qmdf.id=fd.id and qmi.id=fi.id and fd.id = fi.formDefinition_id and fi.id = fiItem.formInstance_id "
@@ -339,7 +345,7 @@
 								+ " and fdi.isReportDisplay='是' and fdi.name = '" + inspectDetail + "'"
 								+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startDay)
 								+ "and "+dateQueryAdapter.dateAdapter(endDay)
-								+ " group by "+ " fiItem.answer) t group by answer ";
+								+ " group by "+ " fiItem.answer) t group by answer ";*/
 					}
 					ResultSet rs = objectDao.executeSql(sql);
 					// 根据需要统计的名字，初始化统计项