Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r35582 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35582)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35589)
@@ -707,7 +707,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 				}
 				dataIndex.setWorkQualityBeanAmount(bean, key, amount);
@@ -810,7 +810,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 					if(monthAmountMap.containsKey(key)){
 						amount += monthAmountMap.get(key);
@@ -919,7 +919,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 				}
 				dataIndex.setWorkQualityBeanAmount(bean, key, amount);
@@ -1042,7 +1042,7 @@
 							key = Integer.valueOf(key).toString();
 						}
 						amount = result.getInt(2);
-						if(amount != null & amount >0){
+						if(amount >0){
 							thisYearAmount += amount;
 						}
 						dataIndex.setWorkQualityBeanAmount(bean, key, amount);
@@ -4637,7 +4637,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 					if(monthAmountMap.containsKey(key)){
 						amount += monthAmountMap.get(key);
@@ -4790,7 +4790,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 				}
 				dataIndex.setWorkQualityBeanAmount(bean, key, amount);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java
===================================================================
diff -u -r34558 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java	(.../CustomReports.java)	(revision 34558)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReports.java	(.../CustomReports.java)	(revision 35589)
@@ -393,7 +393,7 @@
 					key = Integer.valueOf(key).toString();
 				}
 				amount = result.getInt(2);
-				if(amount != null & amount >0){
+				if(amount >0){
 					thisYearAmount += amount;
 				}
 				dataIndex.setWorkQualityBeanAmount(bean, key, amount);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java
===================================================================
diff -u -r35396 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java	(.../ReportQueryParams.java)	(revision 35396)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java	(.../ReportQueryParams.java)	(revision 35589)
@@ -166,7 +166,7 @@
 	/**
 	 * 回收科室分组
 	 */
-	public Set<String> recyDepartGroup = null;
+	public Set<String> recyDepartGroup;
 	/**
 	 * 获取是否查询聚合包
 	 * @return
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/util/QueryUtil.java
===================================================================
diff -u -r35264 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/util/QueryUtil.java	(.../QueryUtil.java)	(revision 35264)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/util/QueryUtil.java	(.../QueryUtil.java)	(revision 35589)
@@ -218,11 +218,13 @@
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-			for (DatasetFieldVo thisDatasetFieldVo : fieldArray) {
-				if("true".equals(thisDatasetFieldVo.getOnlyAsQueryParameter())){
-					if(querySql.contains("${"+ thisDatasetFieldVo.getFieldName() +"}")){
-						querySql = querySql.replaceAll("\\$\\{"+ thisDatasetFieldVo.getFieldName() +"CaseWhen\\}", "1=1");
-						querySql = querySql.replaceAll("\\$\\{"+ thisDatasetFieldVo.getFieldName() +"\\}", "");
+			if(fieldArray != null){
+				for (DatasetFieldVo thisDatasetFieldVo : fieldArray) {
+					if("true".equals(thisDatasetFieldVo.getOnlyAsQueryParameter())){
+						if(querySql.contains("${"+ thisDatasetFieldVo.getFieldName() +"}")){
+							querySql = querySql.replaceAll("\\$\\{"+ thisDatasetFieldVo.getFieldName() +"CaseWhen\\}", "1=1");
+							querySql = querySql.replaceAll("\\$\\{"+ thisDatasetFieldVo.getFieldName() +"\\}", "");
+						}
 					}
 				}
 			}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
===================================================================
diff -u -r35583 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 35583)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 35589)
@@ -194,10 +194,16 @@
 		} finally {
 			try {
 				ops.close();
-				fos.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
+			if(fos != null){
+				try {
+					fos.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
 		}
 	}
 
@@ -310,10 +316,16 @@
 		} finally {
 			try {
 				ops.close();
-				fos.close();
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
+			if(fos != null){
+				try {
+					fos.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
 		}
 	}
 
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/controller/ReportController.java
===================================================================
diff -u -r27186 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/controller/ReportController.java	(.../ReportController.java)	(revision 27186)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/customizedreports/controller/ReportController.java	(.../ReportController.java)	(revision 35589)
@@ -376,10 +376,12 @@
 			} catch (IOException ie) {
 				ie.printStackTrace();
 			} finally {
-				try {
-					respOs.close();
-				} catch (IOException ioe) {
-					ioe.printStackTrace();
+				if(respOs != null){
+					try {
+						respOs.close();
+					} catch (IOException ioe) {
+						ioe.printStackTrace();
+					}
 				}
 			}
 		}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
===================================================================
diff -u -r31291 -r35589
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java	(.../ConvertHtml2Excel.java)	(revision 31291)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java	(.../ConvertHtml2Excel.java)	(revision 35589)
@@ -94,7 +94,6 @@
 	        	HSSFRow row = sheet.createRow(titleRowIndex);
 	            ConvertHtml2Excel.makeRowCell(trLs, titleRowIndex, row, 0, titleStyle, crossRowEleMetaLs);
 	            row.setHeightInPoints(16);
-	            titleRowIndex++;
 	        }
 	        for (CrossRangeCellMeta crcm : crossRowEleMetaLs) {
 	            sheet.addMergedRegion(new CellRangeAddress(crcm.getFirstRow(), crcm.getLastRow(), crcm.getFirstCol(), crcm.getLastCol()));