Index: ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jrxml =================================================================== diff -u -r30423 -r35563 --- ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jrxml (.../workloadScoreStatisticReport.jrxml) (revision 30423) +++ ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jrxml (.../workloadScoreStatisticReport.jrxml) (revision 35563) @@ -1,4 +1,5 @@ + @@ -91,14 +92,14 @@ <band height="68" splitType="Stretch"> <textField> - <reportElement uuid="722b0dd0-f1ec-492e-8a80-360209a6322a" x="0" y="34" width="731" height="34"/> + <reportElement x="0" y="34" width="731" height="34" uuid="722b0dd0-f1ec-492e-8a80-360209a6322a"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="6b0ae627-7d96-46df-a85d-417052fd2882" x="0" y="0" width="731" height="34"/> + <reportElement x="0" y="0" width="731" height="34" uuid="6b0ae627-7d96-46df-a85d-417052fd2882"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="16" isBold="true"/> </textElement> @@ -109,77 +110,77 @@ <columnHeader> <band height="60" splitType="Stretch"> <staticText> - <reportElement uuid="1f4ffffc-0363-41a3-bacd-f5ed04fa9af7" style="table_CH" x="50" y="0" width="60" height="60" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="50" y="0" width="60" height="60" backcolor="#FFFFFF" uuid="1f4ffffc-0363-41a3-bacd-f5ed04fa9af7"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[包分类]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="181" y="30" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="181" y="30" width="70" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[器械包]]></text> </staticText> <staticText> - <reportElement uuid="8fe518d4-1c48-4e3e-b14a-b2767f0b0b98" style="table_CH" x="561" y="0" width="80" height="60" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="561" y="0" width="80" height="60" backcolor="#FFFFFF" uuid="8fe518d4-1c48-4e3e-b14a-b2767f0b0b98"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[数量小计]]></text> </staticText> <staticText> - <reportElement uuid="22bc8a88-2e30-47c4-88e1-5e2044ec0a30" style="table_CH" x="0" y="0" width="50" height="60" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="0" y="0" width="50" height="60" backcolor="#FFFFFF" uuid="22bc8a88-2e30-47c4-88e1-5e2044ec0a30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[序号]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="251" y="30" width="75" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="251" y="30" width="75" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[消毒物品]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="181" y="0" width="380" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="181" y="0" width="380" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[分类统计数量（按发货数量）]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="326" y="30" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="326" y="30" width="70" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[敷料包]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="396" y="30" width="90" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="396" y="30" width="90" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[外部代灭菌]]></text> </staticText> <staticText> - <reportElement uuid="9436bad2-6fd1-4b53-b79a-998bed297da6" style="table_CH" x="486" y="30" width="75" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="486" y="30" width="75" height="30" backcolor="#FFFFFF" uuid="9436bad2-6fd1-4b53-b79a-998bed297da6"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[外来器械]]></text> </staticText> <staticText> - <reportElement uuid="8fe518d4-1c48-4e3e-b14a-b2767f0b0b98" style="table_CH" x="641" y="0" width="90" height="60" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="641" y="0" width="90" height="60" backcolor="#FFFFFF" uuid="8fe518d4-1c48-4e3e-b14a-b2767f0b0b98"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[积分统计]]></text> </staticText> <staticText> - <reportElement uuid="1f4ffffc-0363-41a3-bacd-f5ed04fa9af7" style="table_CH" x="110" y="0" width="71" height="60" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="110" y="0" width="71" height="60" backcolor="#FFFFFF" uuid="1f4ffffc-0363-41a3-bacd-f5ed04fa9af7"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> @@ -190,71 +191,92 @@ <detail> <band height="30" splitType="Stretch"> <textField> - <reportElement uuid="9470b315-b5da-4f97-8158-337e35883ae8" style="table_TD" x="50" y="0" width="60" height="30"/> + <reportElement style="table_TD" x="50" y="0" width="60" height="30" uuid="9470b315-b5da-4f97-8158-337e35883ae8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$F{tousseSize}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="fcc3199c-4724-4931-971b-b6e0965fc906" style="table_TD" x="181" y="0" width="70" height="30"/> + <reportElement style="table_TD" x="181" y="0" width="70" height="30" uuid="fcc3199c-4724-4931-971b-b6e0965fc906"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$F{insideAmount}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="35c547d3-0fe6-4896-a07d-9f80129d08d3" style="table_TD" x="561" y="0" width="80" height="30"/> + <reportElement style="table_TD" x="561" y="0" width="80" height="30" uuid="35c547d3-0fe6-4896-a07d-9f80129d08d3"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{subtotal}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="fcc3199c-4724-4931-971b-b6e0965fc906" style="table_TD" x="251" y="0" width="75" height="30"/> + <reportElement style="table_TD" x="251" y="0" width="75" height="30" uuid="fcc3199c-4724-4931-971b-b6e0965fc906"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$F{disinfectionAmount}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="11567b72-56f2-4b7a-ac12-b74d5dccda1e" style="table_TD" x="0" y="0" width="50" height="30"/> + <reportElement style="table_TD" x="0" y="0" width="50" height="30" uuid="11567b72-56f2-4b7a-ac12-b74d5dccda1e"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> <textFieldExpression><![CDATA[$F{orderNumber}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="fcc3199c-4724-4931-971b-b6e0965fc906" style="table_TD" x="326" y="0" width="70" height="30"/> + <reportElement style="table_TD" x="326" y="0" width="70" height="30" uuid="fcc3199c-4724-4931-971b-b6e0965fc906"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$F{dressingAmount}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="fcc3199c-4724-4931-971b-b6e0965fc906" style="table_TD" x="396" y="0" width="90" height="30"/> + <reportElement style="table_TD" x="396" y="0" width="90" height="30" uuid="fcc3199c-4724-4931-971b-b6e0965fc906"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$F{proxyAmount}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="fcc3199c-4724-4931-971b-b6e0965fc906" style="table_TD" x="486" y="0" width="75" height="30"/> + <reportElement style="table_TD" x="486" y="0" width="75" height="30" uuid="fcc3199c-4724-4931-971b-b6e0965fc906"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$F{foreignAmount}]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement uuid="35c547d3-0fe6-4896-a07d-9f80129d08d3" style="table_TD" x="641" y="0" width="90" height="30"/> + <reportElement style="table_TD" x="641" y="0" width="90" height="30" uuid="35c547d3-0fe6-4896-a07d-9f80129d08d3"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{subtotal}*$F{score}]]></textFieldExpression> <patternExpression><![CDATA[$P{scoreFormat}]]></patternExpression> </textField> <textField> - <reportElement uuid="9470b315-b5da-4f97-8158-337e35883ae8" style="table_TD" x="110" y="0" width="71" height="30"/> + <reportElement style="table_TD" x="110" y="0" width="71" height="30" uuid="9470b315-b5da-4f97-8158-337e35883ae8"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14"/> </textElement> @@ -266,74 +288,98 @@ <summary> <band height="60"> <textField pattern="###0"> - <reportElement uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f" style="table_CH" x="181" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="181" y="0" width="70" height="30" backcolor="#FFFFFF" uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{insideAmountSum}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="f7e618d9-8d61-4d86-99f6-fc42ebdf33db" style="table_CH" x="561" y="0" width="80" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="561" y="0" width="80" height="30" backcolor="#FFFFFF" uuid="f7e618d9-8d61-4d86-99f6-fc42ebdf33db"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalAmount}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2" style="table_CH" x="0" y="0" width="181" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="0" y="0" width="181" height="30" backcolor="#FFFFFF" uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="false"/> </textElement> <text><![CDATA[合计]]></text> </staticText> <textField pattern="###0"> - <reportElement uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f" style="table_CH" x="251" y="0" width="75" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="251" y="0" width="75" height="30" backcolor="#FFFFFF" uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{disinfectionAmountSum}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f" style="table_CH" x="326" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="326" y="0" width="70" height="30" backcolor="#FFFFFF" uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{dressingAmountSum}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f" style="table_CH" x="396" y="0" width="90" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="396" y="0" width="90" height="30" backcolor="#FFFFFF" uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{proxyAmountSum}]]></textFieldExpression> </textField> <textField pattern="###0"> - <reportElement uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f" style="table_CH" x="486" y="0" width="75" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="486" y="0" width="75" height="30" backcolor="#FFFFFF" uuid="7e92e430-6a7f-45e7-b5ca-39f59020da7f"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{foreignAmountSum}]]></textFieldExpression> </textField> <textField pattern=""> - <reportElement uuid="f7e618d9-8d61-4d86-99f6-fc42ebdf33db" style="table_CH" x="641" y="0" width="90" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" x="641" y="0" width="90" height="30" backcolor="#FFFFFF" uuid="f7e618d9-8d61-4d86-99f6-fc42ebdf33db"> + <property name="com.jaspersoft.studio.unit.rightIndent" value="px"/> + </reportElement> <textElement textAlignment="Right" verticalAlignment="Middle"> <font size="14"/> + <paragraph rightIndent="8"/> </textElement> <textFieldExpression><![CDATA[$V{totalScore}]]></textFieldExpression> <patternExpression><![CDATA[$P{scoreFormat}]]></patternExpression> </textField> <staticText> - <reportElement uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2" style="table_CH" stretchType="RelativeToTallestObject" x="0" y="30" width="181" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" stretchType="RelativeToTallestObject" x="0" y="30" width="181" height="30" backcolor="#FFFFFF" uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2"> + <property name="com.jaspersoft.studio.unit.leftIndent" value="px"/> + </reportElement> <box> <rightPen lineWidth="0.0"/> </box> - <textElement verticalAlignment="Middle"> + <textElement textAlignment="Left" verticalAlignment="Middle"> <font size="14" isBold="false"/> + <paragraph leftIndent="8"/> </textElement> <text><![CDATA[ 制表人：]]></text> </staticText> <staticText> - <reportElement uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2" style="table_CH" stretchType="RelativeToTallestObject" x="181" y="30" width="380" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" stretchType="RelativeToTallestObject" x="181" y="30" width="380" height="30" backcolor="#FFFFFF" uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2"/> <box> <leftPen lineWidth="0.0"/> <rightPen lineWidth="0.0"/> @@ -344,12 +390,15 @@ <text><![CDATA[ 科室负责人：]]></text> </staticText> <staticText> - <reportElement uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2" style="table_CH" stretchType="RelativeToTallestObject" x="561" y="30" width="170" height="30" backcolor="#FFFFFF"/> + <reportElement style="table_CH" stretchType="RelativeToTallestObject" x="561" y="30" width="170" height="30" backcolor="#FFFFFF" uuid="e7de0db3-c47c-4e38-a454-279f062bd4a2"> + <property name="com.jaspersoft.studio.unit.leftIndent" value="px"/> + </reportElement> <box> <leftPen lineWidth="0.0"/> </box> <textElement verticalAlignment="Middle"> <font size="14" isBold="false"/> + <paragraph leftIndent="8"/> </textElement> <text><![CDATA[打印日期：]]></text> </staticText> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35558 -r35563 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35558) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35563) @@ -284,13 +284,11 @@ session.setAttribute("JasperPrint", jPrint); if(CollectionUtils.isNotEmpty(dataSourceList)){ setPrintTextWidth(jPrint, reportName); - setRightPadding(jPrint, reportName); //用于打印 parametMap.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE); JRDataSource dataSourceForPrint = new JRBeanCollectionDataSource(dataSourceList);//打印用数据源 JasperPrint jasperPrintForPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSourceForPrint); setPrintTextWidth(jasperPrintForPrint, reportName); - setRightPadding(jasperPrintForPrint, reportName); session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); } String fileName = (String) (parametMap.get("title")==null?"未命名":parametMap.get("title")); @@ -320,7 +318,6 @@ JRDataSource dataSourceForPrint = new JRBeanCollectionDataSource(dataSourceList);//打印用数据源 JasperPrint jasperPrintForPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSourceForPrint); setPrintTextWidth(jasperPrintForPrint, reportName); - setRightPadding(jasperPrintForPrint, reportName); session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); String fileName = (String) (parametMap.get("title")==null?"未命名":parametMap.get("title")); String appointFileName = (String) (parametMap.get("appointFileName")==null?"":parametMap.get("appointFileName")); @@ -332,37 +329,6 @@ return "success"; } /** - * 设置表格右边距（ireport设置不生效），主要是给固定列的表格用 - * @param reportName - */ - public void setRightPadding(JasperPrint jasperPrintForPrint, String reportName){ - if("workloadScoreStatisticReport".equals(reportName)){ - List<JRPrintPage> pages = jasperPrintForPrint.getPages(); - if(CollectionUtils.isEmpty(pages)){ - return; - } - List<JRPrintElement> jRPrintElements = pages.get(0).getElements(); - if(CollectionUtils.isEmpty(jRPrintElements)){ - return; - } - for (JRPrintElement item : jRPrintElements) { - if(!(item instanceof JRTemplatePrintText)){ - continue; - } - JRTemplatePrintText itemText = (JRTemplatePrintText)item; - if(StringUtils.isNotBlank(itemText.getFullText()) && StringTools.isNumber(itemText.getFullText())){ - if(itemText.getWidth() == 66){//积分宽度改变的话，此处要跟着变。不然积分也会被设置右边距 - itemText.getLineBox().setRightPadding(0); - }else{ - itemText.getLineBox().setRightPadding(8); - } - - } - } - - } - } - /** * 设置ireport报表的标题宽度和报表长度一致,避免导出有合并列; * @param jasperPrintForPrint JasperPrint * @param reportName 报表参数名 @@ -414,7 +380,7 @@ * @return */ private boolean canCalcframeWidth(String reportName){ - String canCalcStr = "sterilizationAreaWorkLoad,supplyRoomQualityQuota,departSatisfyDetailReport,operatingRoomInstrumentSetUsageAndApportionmentExpenseReport,formInstanceReport,QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport"; + String canCalcStr = "deviceMaintenanceCus,sterilizationAreaWorkLoad,supplyRoomQualityQuota,departSatisfyDetailReport,operatingRoomInstrumentSetUsageAndApportionmentExpenseReport,formInstanceReport,QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport"; if(canCalcStr.indexOf(reportName) != -1){ return true; } Index: ssts-web/src/main/webapp/jasperRtp/workloadScoreStatisticReport.jasper =================================================================== diff -u -r30423 -r35563 Binary files differ