Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js =================================================================== diff -u -r33701 -r34127 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 33701) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34127) @@ -646,7 +646,7 @@ //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WorkQualityCountReport,text:sstsConfig.workQualityCollectionReportConfiguration?(sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'):'工作质量持续收集统计报表',href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r34079 -r34127 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34079) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34127) @@ -688,7 +688,7 @@ //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QualityControlOfClinic,text:sstsConfig.nursingQualityIndexReportConfiguration?(sstsConfig.nursingQualityIndexReportConfiguration.reportName || '供应室护理质量指标统计表'):'供应室护理质量指标统计表',href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WorkQualityCountReport,text:sstsConfig.workQualityCollectionReportConfiguration?(sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'):'工作质量持续收集统计报表',href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js =================================================================== diff -u -r30854 -r34127 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 30854) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 34127) @@ -30,6 +30,7 @@ var myMask; Ext.onReady(function() { Ext.QuickTips.init(); + entityName = sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'; //20181225 var supplyRoomRecord = Ext.data.Record.create([ {name: 'departCode', type: 'string'}, @@ -120,25 +121,36 @@ if(sstsConfig.hasOwnProperty('isXjjqzyyWorkQualityCollection') && sstsConfig.isXjjqzyyWorkQualityCollection){ isXjjqzyyWorkQualityCollection = true; } - // 全年 - var jasperReportName = "workQualityCollection.jasper"; - if(type == 'split'){ - // 上下半年对比 - jasperReportName = "workQualityCollection2.jasper"; - }else if(type == 'compareToLastYear'){ - // 跟去年对比 - jasperReportName = "workQualityCollection3.jasper"; - } - if(hidePartOfWorkQualityCollection == true){ - // 全年 - var jasperReportName = "workQualityCollection4.jasper"; + var jasperReportName = ""; + if(sstsConfig.hasOwnProperty('workQualityCollectionReportConfiguration')){ + jasperReportName = "workQualityCollectionCustom.jasper"; if(type == 'split'){ // 上下半年对比 - jasperReportName = "workQualityCollection5.jasper"; + jasperReportName = "workQualityCollectionCustom2.jasper"; }else if(type == 'compareToLastYear'){ // 跟去年对比 - jasperReportName = "workQualityCollection6.jasper"; + jasperReportName = "workQualityCollectionCustom3.jasper"; } + }else{ + jasperReportName = "workQualityCollection.jasper"; + if(type == 'split'){ + // 上下半年对比 + jasperReportName = "workQualityCollection2.jasper"; + }else if(type == 'compareToLastYear'){ + // 跟去年对比 + jasperReportName = "workQualityCollection3.jasper"; + } + if(hidePartOfWorkQualityCollection == true){ + // 全年 + var jasperReportName = "workQualityCollection4.jasper"; + if(type == 'split'){ + // 上下半年对比 + jasperReportName = "workQualityCollection5.jasper"; + }else if(type == 'compareToLastYear'){ + // 跟去年对比 + jasperReportName = "workQualityCollection6.jasper"; + } + } } var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';