Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r35495 -r35580
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 35495)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 35580)
@@ -2864,7 +2864,7 @@
 			return 0;
 		}
 		ResultSet rs = objectDao.executeSql(sql);
-		Integer amount = 0;
+		int amount = 0;
 		if (rs != null) {
 			try {
 				while (rs.next()) {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
===================================================================
diff -u -r34199 -r35580
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 34199)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 35580)
@@ -493,12 +493,12 @@
 					+ " and p.packTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("包装不合格数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -507,11 +507,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r35109 -r35580
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35109)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35580)
@@ -1972,12 +1972,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setRowNum(list.size()+1);;
 			bean.setTitle("包外化学指示标签变色不合格");
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -1986,11 +1986,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -2504,12 +2500,12 @@
 					+ " and p.packTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("灭菌物品包装密闭不合格数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -2518,11 +2514,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3062,12 +3054,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("包外明显污迹");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -3076,11 +3068,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3201,12 +3189,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("标签固定差");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -3215,11 +3203,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3342,12 +3326,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("包装松散");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -3356,11 +3340,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3481,12 +3461,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("包内化学指示卡变色不合格数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -3495,11 +3475,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3623,12 +3599,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer sterilizationAmount = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int sterilizationAmount = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("湿包发生数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (sterilizationAmount != null && sterilizationAmount > 0) {
+			if (sterilizationAmount > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(sterilizationAmount), 4,
 						BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -3637,11 +3613,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && sterilizationAmount > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, sterilizationAmount);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3765,12 +3737,12 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer sterilizationAmount = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int sterilizationAmount = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("破包发生数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (sterilizationAmount != null && sterilizationAmount > 0) {
+			if (sterilizationAmount > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(sterilizationAmount), 4,
 						BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -3779,11 +3751,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && sterilizationAmount > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, sterilizationAmount);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -3977,11 +3945,8 @@
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("r.orgUnitCoding", querySupplyRoom);
 
-			Integer amount = dataIndex.getAmountBySql(sql);
-			if (amount == null) {
-				amount = 0;
-			}
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("器械损坏件数");
 			bean.setRowNum(list.size()+1);
 			if(isHidePartOfWorkQualityCollection == true){
@@ -3992,7 +3957,7 @@
 			}else{
 				dataIndex.setWorkQualityBeanAmount(bean, key, amount);
 			}
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -4001,11 +3966,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -4233,12 +4194,12 @@
 					+ " and p.packTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("包内器械种类错误发生件数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -4247,11 +4208,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -4384,12 +4341,12 @@
 					+ " and p.packTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("无菌包内器械功能不全件数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -4398,11 +4355,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}
@@ -4520,12 +4473,12 @@
 					+ " and p.packTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)
 					+ SqlUtils.get_InSql_Extra("p.orgUnitCoding", querySupplyRoom);
-			Integer amount = dataIndex.getAmountBySql(sql);
-			Integer amount2 = dataIndex.getAmountBySql(sql2);
+			int amount = dataIndex.getAmountBySql(sql);
+			int amount2 = dataIndex.getAmountBySql(sql2);
 			bean.setTitle("无菌包内器械缺失发生件数");
 			bean.setRowNum(list.size()+1);
 			dataIndex.setWorkQualityBeanAmount(bean, key, amount);
-			if (amount2 != null && amount2 > 0) {
+			if (amount2 > 0) {
 				double percentage = new BigDecimal(amount).divide(
 						new BigDecimal(amount2), 4, BigDecimal.ROUND_HALF_UP)
 						.doubleValue();
@@ -4534,11 +4487,7 @@
 				dataIndex.setWorkQualityBeanPercentage(bean, key, percentage);
 				if(isHidePartOfWorkQualityCollection == true && amount2 > 0){
 					dataIndex.setWorkQualityBeanAmount(bean, key, amount2);
-					if(amount == null){
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, 0);
-					}else {
-						dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
-					}
+					dataIndex.setWorkQualityBeanUnQualityAmount(bean, key, amount);
 				}
 			}
 		}