Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33414 -r33419
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33414)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33419)
@@ -16170,33 +16170,18 @@
 						+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fd.id = fi.formDefinition_id join QualityMonitoringDefinition qmdf on qmdf.id=fd.id "
 						+ " join FormInstanceItem fiItem on fi.id = fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id = fdi.id "
 						+ " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id " 
-						+ " left join FormInstanceOptionValue fiov on fiItem.id = fiov.formInstanceItem_id "
+						//+ " left join FormInstanceOptionValue fiov on fiItem.id = fiov.formInstanceItem_id "
 						+ " where fd.formName = '" + inspectItem + "'"
 						+ " and fd.formType = '" + monitoringType + "'"
 						+ SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(orgUnitCoding)
 						//+ SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding)
 						+ fiOrgUnitCodingSql
-						+ " and fiov.id is not null and fdi.isReportDisplay='是'  "
-						+ " and fiov.id in (select id from FormInstanceOptionValue where formInstanceItem_id = fiItem.id) "
+						//+ " and fiov.id is not null "
+						+ " and fdi.isReportDisplay='是'  "
+						+ " and (fiItem.id in (select formInstanceItem_id from FormInstanceOptionValue )) "
+						//+ " and fiov.id in (select id from FormInstanceOptionValue where formInstanceItem_id = fiItem.id) "
 						+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear)
 						+ "and "+dateQueryAdapter.dateAdapter(nextYear)
-						+ " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fdi.name "
-						+ " union all "
-				        + " select " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") +" monthstr,fdi.name,sum(qmd.amount) count "
-						+ " from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fd.id = fi.formDefinition_id join QualityMonitoringDefinition qmdf on qmdf.id=fd.id "
-						+ " join FormInstanceItem fiItem on fi.id = fiItem.formInstance_id join FormDefinitionItem fdi on fiItem.formDefinitionItem_id = fdi.id "
-						+ " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id " 
-						+ " left join FormInstanceOptionValue fiov on fiItem.id = fiov.formInstanceItem_id "
-						+ " where fd.formName = '" + inspectItem + "'"
-						+ " and fd.formType = '" + monitoringType + "'"
-						+ SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(orgUnitCoding)
-						//+ SqlUtils.get_InSql_Extra("fi.orgUnitCoding", orgUnitCoding)
-						+ fiOrgUnitCodingSql
-						+ " and fiov.id is null and fdi.isReportDisplay='是'  "
-						+ " and fdi.type != '" + FormDefinitionItem.TYPE_RADIO + "' "
-						+ " and fdi.type != '" + FormDefinitionItem.TYPE_CHECK + "' "
-						+ " and qmi.dateTime between " + dateQueryAdapter.dateAdapter(startYear)
-						+ " and "+dateQueryAdapter.dateAdapter(nextYear)
 						+ " group by " + dateQueryAdapter.dateConverAdapter3("qmi.dateTime","mm") + " ,fdi.name ";
 			}else{
 				resultNameList = getResultNameList(monitoringType,inspectItem,inspectDetail,null, startYear, nextYear);