Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jasper =================================================================== diff -u -r34592 -r34602 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml =================================================================== diff -u -r34592 -r34602 --- ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml (.../monthReportShowBrevityCode.jrxml) (revision 34592) +++ ssts-web/src/main/webapp/jasperRtp/monthReportShowBrevityCode.jrxml (.../monthReportShowBrevityCode.jrxml) (revision 34602) @@ -1,5 +1,5 @@ - + @@ -31,20 +31,6 @@ - - - - - - - - - - - - - - @@ -76,16 +62,13 @@ - - - <band height="34" splitType="Stretch"> <textField> - <reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="559" height="34"/> + <reportElement uuid="14137749-263e-4143-a8dd-482900def002" x="0" y="0" width="450" height="34"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -96,7 +79,7 @@ <pageFooter> <band height="21"> <textField isBlankWhenNull="true"> - <reportElement uuid="b067ffd6-7c60-4499-842e-fbd4965c5fbc" x="0" y="0" width="559" height="20"/> + <reportElement uuid="b067ffd6-7c60-4499-842e-fbd4965c5fbc" x="0" y="0" width="450" height="20"/> <textElement textAlignment="Center"/> <textFieldExpression><![CDATA[$P{footerInfo}]]></textFieldExpression> </textField> @@ -105,52 +88,29 @@ <summary> <band height="127" splitType="Stretch"> <crosstab> - <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="800" height="127"/> + <reportElement uuid="46e7a69c-b801-484e-9d83-8aeea6de0e6c" x="0" y="0" width="450" height="103"/> <crosstabParameter name="amountFormatParam"> <parameterValueExpression><![CDATA[$P{amountFormat}]]></parameterValueExpression> </crosstabParameter> - <crosstabParameter name="appDepartShowNameParam"> - <parameterValueExpression><![CDATA[$P{applicationDepartShowName}]]></parameterValueExpression> + <crosstabParameter name="parameter1"> + <parameterValueExpression><![CDATA[$F{columnTitle}]]></parameterValueExpression> </crosstabParameter> - <crosstabParameter name="setDepartShowNameParam"> - <parameterValueExpression><![CDATA[$P{settleAccountsDepartShowName}]]></parameterValueExpression> - </crosstabParameter> - <crosstabParameter name="sumPriceShowNameParam"> - <parameterValueExpression><![CDATA[$P{sumPriceShowName}]]></parameterValueExpression> - </crosstabParameter> - <crosstabParameter name="sumAmountShowNameParam"> - <parameterValueExpression><![CDATA[$P{sumAmountShowName}]]></parameterValueExpression> - </crosstabParameter> <crosstabHeaderCell> <cellContents> - <textField isBlankWhenNull="true"> - <reportElement uuid="08fc6f93-10d2-4d55-8b65-3e3d2f0f7aa9" style="table_TH" x="0" y="0" width="153" height="95" backcolor="#FFFFFF"/> - <box> - <pen lineWidth="0.5"/> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> + <staticText> + <reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="0" y="0" width="187" height="80" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> + <font isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$P{appDepartShowNameParam}]]></textFieldExpression> - </textField> - <textField isBlankWhenNull="true"> - <reportElement uuid="d5f2cf8b-d44b-479b-8296-5ae526a0ff0a" style="table_TH" x="153" y="0" width="153" height="95" backcolor="#FFFFFF"/> - <box> - <pen lineWidth="0.5"/> - <topPen lineWidth="0.5"/> - <leftPen lineWidth="0.5"/> - <bottomPen lineWidth="0.5"/> - <rightPen lineWidth="0.5"/> - </box> + <text><![CDATA[科室财务编码]]></text> + </staticText> + <staticText> + <reportElement uuid="ea016505-12c9-441f-bd8c-f9f2e8a91ad7" style="table_TH" x="187" y="0" width="290" height="80" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> + <font isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$P{setDepartShowNameParam}]]></textFieldExpression> - </textField> + <text><![CDATA[部门]]></text> + </staticText> </cellContents> </crosstabHeaderCell> <rowGroup name="rowNum" width="0" totalPosition="End"> @@ -171,7 +131,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <staticText> - <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="306" height="25" forecolor="#000000"/> + <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="477" height="25" forecolor="#000000"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -180,7 +140,7 @@ </cellContents> </crosstabTotalRowHeader> </rowGroup> - <rowGroup name="department" width="306" totalPosition="End"> + <rowGroup name="department" width="477" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> @@ -190,35 +150,33 @@ <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="dcbc7276-883b-4b54-9de2-1123a51a99bc" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="153" height="25"/> + <textField isStretchWithOverflow="true"> + <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="187" height="25"/> <box> <pen lineWidth="0.5"/> <topPen lineWidth="0.5"/> <leftPen lineWidth="0.5"/> <bottomPen lineWidth="0.5"/> <rightPen lineWidth="0.5"/> </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="12"/> - <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> + <textElement verticalAlignment="Middle"> + <font size="8"/> </textElement> <textFieldExpression><![CDATA[$V{applicationDepart}==null?"":" "+$V{applicationDepart}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="table_TD" stretchType="RelativeToBandHeight" x="153" y="0" width="153" height="25"/> + <textField isStretchWithOverflow="true"> + <reportElement uuid="fd3d33e0-3b14-4eeb-83d6-f1c64a4400c0" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="187" y="0" width="290" height="25"/> <box> - <pen lineWidth="1.0"/> - <topPen lineWidth="1.0"/> - <leftPen lineWidth="1.0"/> - <bottomPen lineWidth="1.0"/> - <rightPen lineWidth="1.0"/> + <pen lineWidth="0.5"/> + <topPen lineWidth="0.5"/> + <leftPen lineWidth="0.5"/> + <bottomPen lineWidth="0.5"/> + <rightPen lineWidth="0.5"/> </box> - <textElement textAlignment="Left" verticalAlignment="Middle"> - <font size="12"/> - <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> + <textElement verticalAlignment="Middle"> + <font size="8"/> </textElement> - <textFieldExpression><![CDATA[$V{department}==null?"":" "+$V{department}]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{department}]]></textFieldExpression> </textField> </cellContents> </crosstabRowHeader> @@ -249,7 +207,7 @@ </cellContents> </crosstabTotalColumnHeader> </columnGroup> - <columnGroup name="columnTitle" height="0" totalPosition="End" headerPosition="Stretch"> + <columnGroup name="columnTitle" height="38" totalPosition="End" headerPosition="Stretch"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{columnTitle}]]></bucketExpression> </bucket> @@ -259,7 +217,7 @@ <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField> - <reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="0"/> + <reportElement uuid="01ce4efc-6647-40c7-b6e7-75573b401d0d" style="Crosstab Data Text" x="0" y="0" width="79" height="38"/> <textElement verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -272,27 +230,26 @@ <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField isStretchWithOverflow="true"> - <reportElement uuid="bbe90974-ff68-4b42-9b40-65e01b60a66e" style="table_TH" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> + <staticText> + <reportElement uuid="453d2b65-585d-49be-b4c1-1d8cb7ee033d" x="0" y="0" width="81" height="80"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> - <textFieldExpression><![CDATA[$V{maxAmount}>0||$V{amountMeasure}!=0?$P{sumAmountShowNameParam}:$P{sumPriceShowNameParam}]]></textFieldExpression> - </textField> + <text><![CDATA[合计]]></text> + </staticText> </cellContents> </crosstabTotalColumnHeader> </columnGroup> - <columnGroup name="columnName" height="95" headerPosition="Center"> + <columnGroup name="columnName" height="42" headerPosition="Center"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{columnName}]]></bucketExpression> </bucket> <crosstabColumnHeader> <cellContents> - <textField isBlankWhenNull="true"> - <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="100" height="95" backcolor="#FFFFFF"/> + <textField> + <reportElement uuid="68a2ae4b-3dab-4820-a41c-8392a574ad5d" style="table_TH" x="0" y="0" width="79" height="42" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> - <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> </textElement> <textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression> </textField> @@ -311,39 +268,35 @@ <measure name="amountMeasure" class="java.lang.Integer" calculation="Sum"> <measureExpression><![CDATA[$F{amount}]]></measureExpression> </measure> - <measure name="maxAmount" class="java.lang.Integer" calculation="Highest"> - <measureExpression><![CDATA[$F{amount}]]></measureExpression> + <measure name="columnTitleMeasure" class="java.lang.String" calculation="First"> + <measureExpression><![CDATA[$F{columnTitle}]]></measureExpression> </measure> <measure name="applicationDepart" class="java.lang.String"> <measureExpression><![CDATA[$F{applicationDepart}]]></measureExpression> </measure> - <measure name="columnTitleMeasure" class="java.lang.String" calculation="First"> - <measureExpression><![CDATA[$F{columnTitle}]]></measureExpression> - </measure> - <crosstabCell width="100" height="25"> + <crosstabCell width="79" height="25"> <cellContents> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern="###0.0000"> - <reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> + <reportElement uuid="d304edd7-5900-4bdf-916c-1a90972f5d38" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="79" height="25"/> + <textElement verticalAlignment="Middle"> <font size="12"/> - <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> </textElement> <textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression> <patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression> </textField> </cellContents> </crosstabCell> - <crosstabCell width="100" height="25" rowTotalGroup="rowNum"> + <crosstabCell width="79" height="25" rowTotalGroup="rowNum"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> - <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> + <textField isStretchWithOverflow="true" pattern=""> + <reportElement uuid="bf47b0ab-3d7c-424d-b042-d6dbc81b5a35" style="Crosstab Data Text" x="0" y="0" width="79" height="25" forecolor="#000000"/> + <textElement verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression> @@ -365,38 +318,37 @@ </box> </cellContents> </crosstabCell> - <crosstabCell width="100" height="25" columnTotalGroup="columnTitle"> + <crosstabCell width="81" height="25" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> + <reportElement uuid="8d59cefd-47be-4107-a902-d5fc6d238879" style="Crosstab Data Text" stretchType="RelativeToTallestObject" x="0" y="0" width="81" height="25"/> + <textElement verticalAlignment="Middle"> <font size="12"/> - <paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/> </textElement> <textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression> <patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression> </textField> </cellContents> </crosstabCell> - <crosstabCell width="100" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle"> + <crosstabCell width="81" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="100" height="25" forecolor="#000000"/> - <textElement textAlignment="Right" verticalAlignment="Middle"> + <reportElement uuid="b0639c13-c7c6-4a64-8807-c9f55e3d4111" style="Crosstab Data Text" x="0" y="0" width="81" height="25" forecolor="#000000"/> + <textElement verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression> <patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression> </textField> </cellContents> </crosstabCell> - <crosstabCell width="100" height="0" rowTotalGroup="department"> + <crosstabCell width="79" height="0" rowTotalGroup="department"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> @@ -410,7 +362,7 @@ </box> </cellContents> </crosstabCell> - <crosstabCell width="100" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle"> + <crosstabCell width="81" height="0" rowTotalGroup="department" columnTotalGroup="columnTitle"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r34599 -r34602 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34599) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34602) @@ -1003,7 +1003,7 @@ if("hiddenAmountMode".equals(patternOfReport)){ applyMonthReportOnlyPriceTemplate = true;//隐藏数量 - }else if("isHaveApplicationDepartMode".equals(patternOfReport) || "dgshlyyMode".equals(patternOfReport)){//有申请科室的格式 + }else if("isHaveApplicationDepartMode".equals(patternOfReport)){//有申请科室的格式 String showAmountColumnStr = StrutsParamUtils.getPraramValue("showAmountColumn","");//显示数量下拉框的值 if("true".equals(showAmountColumnStr)){ hideAmountColumn = false; @@ -1072,12 +1072,10 @@ if(!columnConfigOfAccountingInfoMap.containsKey("数量合计列名字")){ parametMap.put("sumAmountShowName", "合计"); } - if("dgshlyyMode".equals(patternOfReport)){ - showApplicationDepart = false; - parametMap.put("applicationDepartShowName", "科室财务编码"); - parametMap.put("settleAccountsDepartShowName", "部门"); - } } + if("dgshlyyMode".equals(patternOfReport)){ + showApplicationDepart = false; + } String showCustonTousseAmountStr = StrutsParamUtils.getPraramValue( "showCustonTousseAmount", ""); //院区