Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r18194 -r18202 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18194) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 18202) @@ -2540,11 +2540,11 @@ // 器械清洗不合格数 getMaterialWashUnqualifiedAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 消毒物品不合格数 - getDisinfectGoodsUnqualifiedAmount(startAndEndDays, list,querySupplyRoom); + getDisinfectGoodsUnqualifiedAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 灭菌物品包装密闭不合格数 getPackSealUnqualifiedAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 回收器械丢失发生件数 - getRecyclingMaterialLostAmount(startAndEndDays, list,querySupplyRoom); + getRecyclingMaterialLostAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 器械损坏件数 getMaterialScrapAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 无菌包内器械缺失发生件数 @@ -2554,7 +2554,7 @@ // 包内器械种类错误发生件数 getMaterialTypeErrorAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 无菌标识不正确发生数 - getLabelErrorAmount(startAndEndDays, list,querySupplyRoom); + getLabelErrorAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 包外化学指示标签变色不合格 getLabelChangeColourUnqualifiedAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 包内化学指示卡不合格数 @@ -2566,17 +2566,17 @@ // 包装松散 getIncompactPackageAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 灭菌方式选择不正确发生数 - getSterilizationTypeChooserWrong(startAndEndDays, list,querySupplyRoom); + getSterilizationTypeChooserWrong(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 湿包发生数 getWetBagAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 破包发生数 getTornBagAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 灭菌失败事件发生数 - getSterilizationFaildAmount(startAndEndDays, list,querySupplyRoom); + getSterilizationFaildAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 无菌物品发放错误发生数 - getGoodsDeliveryError(startAndEndDays, list,querySupplyRoom); + getGoodsDeliveryError(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 手术包次日下送件数 - getSecordDaySendTousseAmount(startAndEndDays, list,querySupplyRoom); + getSecordDaySendTousseAmount(startAndEndDays, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // long endTime=System.currentTimeMillis(); // long Time=endTime-starTime; // System.out.println("读数据库数据耗时（原方法）："); @@ -2628,11 +2628,11 @@ // 器械清洗不合格数 getMaterialWashUnqualifiedAmountAllYear(year, list,querySupplyRoom,washAmountMap,isHidePartOfWorkQualityCollection); // 消毒物品不合格数 - getDisinfectGoodsUnqualifiedAmountAllYear(year, list,querySupplyRoom); + getDisinfectGoodsUnqualifiedAmountAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 灭菌物品包装密闭不合格数 getPackSealUnqualifiedAmountAllYear(year, list,querySupplyRoom,packAmountMap,isHidePartOfWorkQualityCollection); // 回收器械丢失发生件数 - getRecyclingMaterialLostAmountAllYear(year, list,querySupplyRoom); + getRecyclingMaterialLostAmountAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 器械损坏件数 getMaterialScrapAmountAllYear(year, list,querySupplyRoom,packAmountMap,isHidePartOfWorkQualityCollection); // 无菌包内器械缺失发生件数 @@ -2642,7 +2642,7 @@ // 包内器械种类错误发生件数 getMaterialTypeErrorAmountAllYear(year, list,querySupplyRoom,packAmountMap,isHidePartOfWorkQualityCollection); // 无菌标识不正确发生数 - getLabelErrorAmountAllYear(year, list,querySupplyRoom); + getLabelErrorAmountAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 包外化学指示标签变色不合格 getLabelChangeColourUnqualifiedAmountAllYear(year, list,querySupplyRoom,packAmountMap,isHidePartOfWorkQualityCollection); // 包内化学指示卡不合格数 @@ -2654,17 +2654,17 @@ // 包装松散 getIncompactPackageAmountAllYear(year, list,querySupplyRoom,packAmountMap,isHidePartOfWorkQualityCollection); // 灭菌方式选择不正确发生数 - getSterilizationTypeChooserWrongAllYear(year, list,querySupplyRoom); + getSterilizationTypeChooserWrongAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 湿包发生数 getWetBagAmountAllYear(year, list,querySupplyRoom,sterilizationAmountMap,isHidePartOfWorkQualityCollection); // 破包发生数 getTornBagAmountAllYear(year, list,querySupplyRoom,sterilizationAmountMap,isHidePartOfWorkQualityCollection); // 灭菌失败事件发生数 - getSterilizationFaildAmountAllYear(year, list,querySupplyRoom); + getSterilizationFaildAmountAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 无菌物品发放错误发生数 - getGoodsDeliveryErrorAllYear(year, list,querySupplyRoom); + getGoodsDeliveryErrorAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); // 手术包次日下送件数 - getSecordDaySendTousseAmountAllYear(year, list,querySupplyRoom); + getSecordDaySendTousseAmountAllYear(year, list,querySupplyRoom,isHidePartOfWorkQualityCollection); return list; } /** @@ -2837,8 +2837,12 @@ private void getDisinfectGoodsUnqualifiedAmount( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -2865,7 +2869,14 @@ try { while (rs.next()) { amount = rs.getInt(1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + // 总数为空 + setWorkQualityBeanAmount(bean, key, ""); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -2880,7 +2891,8 @@ // 消毒物品不合格数 全年统计 private void getDisinfectGoodsUnqualifiedAmountAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -2901,6 +2913,9 @@ bean.setTitle("消毒物品不合格数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -2909,7 +2924,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -3029,8 +3049,12 @@ private void getSecordDaySendTousseAmount( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -3058,7 +3082,12 @@ try { while (rs.next()) { amount = rs.getInt(1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -3073,7 +3102,8 @@ // 手术包次日下送件数 全年数据 private void getSecordDaySendTousseAmountAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -3095,6 +3125,9 @@ bean.setTitle("手术包次日下送件数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -3103,7 +3136,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -3188,8 +3226,12 @@ } private void getSterilizationFaildAmount( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -3210,7 +3252,12 @@ Integer amount = getSumAmountBySql(sql); bean.setTitle("灭菌失败事件发生数"); bean.setRowNum(list.size()+1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } if (startAndEndDays.size() != 1 || bean.getAmount().intValue() != 0) { list.add(bean); @@ -3219,7 +3266,8 @@ // 灭菌失败事件发生数 全年数据 private void getSterilizationFaildAmountAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -3239,6 +3287,9 @@ bean.setTitle("灭菌失败事件发生数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -3247,7 +3298,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -3272,8 +3328,12 @@ } private void getGoodsDeliveryError( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -3286,7 +3346,12 @@ Integer amount = getSumAmountBySql(sql); bean.setTitle("无菌物品发放错误发生数"); bean.setRowNum(list.size()+1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } if (startAndEndDays.size() != 1 || bean.getAmount().intValue() != 0) { list.add(bean); @@ -3295,7 +3360,8 @@ // 无菌物品发放错误发生数 全年数据 private void getGoodsDeliveryErrorAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -3316,6 +3382,9 @@ bean.setTitle("无菌物品发放错误发生数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -3324,7 +3393,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -3335,8 +3409,12 @@ } private void getRecyclingMaterialLostAmount( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -3349,7 +3427,12 @@ Integer amount = getSumAmountBySql(sql); bean.setTitle("回收器械丢失发生件数"); bean.setRowNum(list.size()+1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } if (startAndEndDays.size() != 1 || bean.getAmount().intValue() != 0) { list.add(bean); @@ -3358,7 +3441,8 @@ // 回收器械丢失发生件数 全年数据 private void getRecyclingMaterialLostAmountAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -3379,6 +3463,9 @@ bean.setTitle("回收器械丢失发生件数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -3387,7 +3474,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -4217,8 +4309,12 @@ } private void getSterilizationTypeChooserWrong( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -4239,7 +4335,12 @@ Integer amount = getSumAmountBySql(sql); bean.setTitle("灭菌方式选择不正确发生数"); bean.setRowNum(list.size()+1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } if (startAndEndDays.size() != 1 || bean.getAmount().intValue() != 0) { list.add(bean); @@ -4248,7 +4349,8 @@ // 灭菌方式选择不正确发生数 全年数据 private void getSterilizationTypeChooserWrongAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -4270,6 +4372,9 @@ bean.setTitle("灭菌方式选择不正确发生数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -4278,7 +4383,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); @@ -4289,8 +4399,12 @@ } private void getLabelErrorAmount( Map> startAndEndDays, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } for (String key : startAndEndDays.keySet()) { String startDay = null; String endDay = null; @@ -4303,7 +4417,12 @@ Integer amount = getSumAmountBySql(sql); bean.setTitle("无菌标识不正确发生数"); bean.setRowNum(list.size()+1); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } if (startAndEndDays.size() != 1 || bean.getAmount().intValue() != 0) { list.add(bean); @@ -4312,7 +4431,8 @@ // 无菌标识不正确发生数 全年数据 private void getLabelErrorAmountAllYear( String year, - List list,String querySupplyRoom) throws SQLException { + List list,String querySupplyRoom, + boolean isHidePartOfWorkQualityCollection) throws SQLException { WorkQualityCollection bean = new WorkQualityCollection(); String queryYear = year + "-01-01 00:00:00"; String nextYear = getNextYear(year) + " 00:00:00"; @@ -4322,6 +4442,9 @@ bean.setTitle("无菌标识不正确发生数"); String key = ""; Integer amount = 0; + if(isHidePartOfWorkQualityCollection == true){ + bean.initAmountSpace(); + } try { while (result.next()) { key = result.getString(1); @@ -4330,7 +4453,12 @@ key = Integer.valueOf(key).toString(); } amount = result.getInt(2); - setWorkQualityBeanAmount(bean, key, amount); + if(isHidePartOfWorkQualityCollection == true){ + // 设置发生数 + setWorkQualityBeanUnQualityAmount(bean, key, amount); + }else{ + setWorkQualityBeanAmount(bean, key, amount); + } } } catch (SQLException e) { e.printStackTrace(); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java =================================================================== diff -u -r18194 -r18202 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java (.../WorkQualityCollection.java) (revision 18194) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WorkQualityCollection.java (.../WorkQualityCollection.java) (revision 18202) @@ -518,5 +518,25 @@ public void setLastYearPercentage(Double lastYearPercentage) { this.lastYearPercentage = lastYearPercentage; } - + + public void initAmountSpace(){ + this.setJanAmount(""); + this.setFebAmount(""); + this.setMarAmount(""); + this.setAprAmount(""); + this.setMayAmount(""); + this.setJunAmount(""); + this.setJulAmount(""); + this.setAugAmount(""); + this.setSepAmount(""); + this.setOctAmount(""); + this.setNovAmount(""); + this.setDecAmount(""); + this.setFirstHalfYearAmount(""); + this.setSecondHalfYearAmount(""); + this.setThisYearAmount(""); + this.setLastYearAmount(""); + this.setJulAmount(""); + this.setJulAmount(""); + } }