Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java =================================================================== diff -u -r29766 -r29782 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 29766) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 29782) @@ -1050,7 +1050,7 @@ } /** - * 发放无菌物品总包数(器械包) 上下半年数量. + * 发放物品总包数(复用物品) 上下半年数量. * @param startAndEndDays * @param list * @param querySupplyRoom @@ -1082,7 +1082,7 @@ + ") tl "); - bean.setTitle("发放无菌物品总包数(器械包)"); + bean.setTitle("发放物品总包数(复用物品)"); bean.setRowNum(list.size()+1); Integer amount = 0; ResultSet rs = objectDao.executeSql(sql); @@ -1103,7 +1103,7 @@ } /** - * 发放无菌物品总包数(器械包) 全年数量. + * 发放物品总包数(复用物品) 全年数量. * @param year * @param list * @param querySupplyRoom @@ -1125,7 +1125,7 @@ reportParams.extraSelectColumns = ""; ResultSet result = objectDao.executeSql(sql); bean.setRowNum(list.size()+1); - bean.setTitle("发放无菌物品总包数(器械包)"); + bean.setTitle("发放物品总包数(复用物品)"); String key = ""; Integer amount = 0; try { @@ -1150,7 +1150,7 @@ } /** - * 发放无菌物品总件数(一次性物品)上下半年数量. + * 发放物品总件数(一次性物品)上下半年数量. * @param startAndEndDays * @param list * @param querySupplyRoom @@ -1181,7 +1181,7 @@ +dataIndex.getWorkAmountByPackageSQL("发货数量", params) + ") tl "); - bean.setTitle("发放无菌物品总件数(一次性物品)"); + bean.setTitle("发放物品总件数(一次性物品)"); bean.setRowNum(list.size()+1); Integer amount = 0; ResultSet rs = objectDao.executeSql(sql); @@ -1202,7 +1202,7 @@ } /** - * 发放无菌物品总件数(一次性物品) 全年数量 + * 发放物品总件数(一次性物品) 全年数量 * @param year * @param list * @param querySupplyRoom @@ -1225,7 +1225,7 @@ reportParams.extraSelectColumns = ""; ResultSet result = objectDao.executeSql(sql); bean.setRowNum(list.size()+1); - bean.setTitle("发放无菌物品总件数(一次性物品)"); + bean.setTitle("发放物品总件数(一次性物品)"); String key = ""; Integer amount = 0; try { Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java =================================================================== diff -u -r29758 -r29782 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 29758) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 29782) @@ -155,7 +155,7 @@ workQualityCollectionDataIndex.getCountFrequencyOfMonth(startAndEndDays, list,querySupplyRoom); // 灭菌物品总包数(普通灭菌、代理灭菌、外来器械灭菌)的统计,上下半年数据. workQualityCollectionDataIndex.getSterilizationAmount(startAndEndDays, list,querySupplyRoom); - // 发放无菌物品总件数 + // 发放物品总件数 workQualityCollectionDataIndex.getSendTousseAmount(startAndEndDays, list,querySupplyRoom); workQualityCollectionDataIndex.getSendDiposableGoodsAmount(startAndEndDays, list,querySupplyRoom); @@ -301,9 +301,9 @@ workQualityCollectionDataIndex.getCountFrequencyOfMonthAllYear(year, list,querySupplyRoom); // 灭菌物品总包数(普通灭菌、代理灭菌、外来器械灭菌)的统计,全年数据. workQualityCollectionDataIndex.getSterilizationAmountAllYear(year, list,querySupplyRoom); - // 发放无菌物品总包数(器械包) + // 发放物品总包数(复用物品) workQualityCollectionDataIndex.getSendTousseAmountAllYear(list,reportParams); - // 发放无菌物品总件数(一次性物品) + // 发放物品总件数(一次性物品) workQualityCollectionDataIndex.getSendDiposableGoodsAmountAllYear(list,reportParams); } // 器械清洗不合格数 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java =================================================================== diff -u -r29262 -r29782 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 29262) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java (.../CustomReportsOfDgsfy.java) (revision 29782) @@ -198,7 +198,7 @@ } } - // 发放无菌物品总件数 + // 发放物品总件数 workQualityCollectionDataIndex.getSendTousseAmount(startAndEndDays, list,querySupplyRoom); workQualityCollectionDataIndex.getSendDiposableGoodsAmount(startAndEndDays, list,querySupplyRoom); @@ -344,9 +344,9 @@ getSterilizationAmountAllYearOfDgsfy(year, list,querySupplyRoom); // 按灭菌炉分组统计包数 workQualityCollectionDataIndex.getSterilizationAmountAllYearBySterilizerGroup(year, list,querySupplyRoom); - // 发放无菌物品总包数(器械包) + // 发放物品总包数(复用物品) workQualityCollectionDataIndex.getSendTousseAmountAllYear(list,reportParams); - // 发放无菌物品总件数(一次性物品) + // 发放物品总件数(一次性物品) workQualityCollectionDataIndex.getSendDiposableGoodsAmountAllYear(list,reportParams); } // 器械清洗不合格数