Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonthReportBean.java =================================================================== diff -u -r26863 -r27621 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonthReportBean.java (.../MonthReportBean.java) (revision 26863) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MonthReportBean.java (.../MonthReportBean.java) (revision 27621) @@ -20,6 +20,10 @@ private Integer amount; /** + * 序号用于报表排序 + */ + private Integer sequence; + /** * 一次性物品合计，用于贵港个性化报表总合计时减去一次性物品合计 */ private Double sumOfDisposableGoods; @@ -87,4 +91,12 @@ this.sumOfDisposableGoods = sumOfDisposableGoods; } + public Integer getSequence() { + return sequence; + } + + public void setSequence(Integer sequence) { + this.sequence = sequence; + } + } Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml (.../materialTypeWorkloadReport.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jrxml (.../materialTypeWorkloadReport.jrxml) (revision 27621) @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ <band height="30" splitType="Stretch"> <textField> - <reportElement uuid="11ae082d-b215-43b4-aeaa-684ca09252d2" x="0" y="0" width="1085" height="30"/> + <reportElement uuid="11ae082d-b215-43b4-aeaa-684ca09252d2" x="0" y="0" width="3200" height="30"/> <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml (.../foreignTousseApplicationReport.jrxml) (revision 27621) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="foreignTousseApplicationReport" language="groovy" pageWidth="1155" pageHeight="790" columnWidth="1155" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc"> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="foreignTousseApplicationReport" language="groovy" pageWidth="1154" pageHeight="790" columnWidth="1154" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc"> <property name="ireport.zoom" value="1.0"/> - <property name="ireport.x" value="0"/> + <property name="ireport.x" value="152"/> <property name="ireport.y" value="0"/> <style name="table"> <box> @@ -225,7 +225,7 @@ <title> <band height="30" splitType="Stretch"> <textField> - <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1155" height="30"/> + <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1154" height="30"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> @@ -236,91 +236,91 @@ <columnHeader> <band height="30" splitType="Stretch"> <staticText> - <reportElement uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e" style="table_CH" mode="Opaque" x="125" y="0" width="80" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e" style="table_CH" mode="Opaque" x="124" y="0" width="80" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[病人所属科室]]></text> </staticText> <staticText> - <reportElement uuid="d2c35607-bde5-4c14-92b1-e100f9a278cb" style="table_CH" mode="Opaque" x="1" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="d2c35607-bde5-4c14-92b1-e100f9a278cb" style="table_CH" mode="Opaque" x="0" y="0" width="70" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[日期]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1025" y="0" width="60" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1024" y="0" width="60" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[申请人]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="281" y="0" width="65" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="280" y="0" width="65" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[病人姓名]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="881" y="0" width="144" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="880" y="0" width="144" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[手术名称]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1085" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1084" y="0" width="70" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[处理方式]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="346" y="0" width="200" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="345" y="0" width="200" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[物品名称]]></text> </staticText> <staticText> - <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="546" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="545" y="0" width="70" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[灭菌包数量]]></text> </staticText> <staticText> - <reportElement uuid="7fe469a8-eb2d-4719-9d43-5d706e05ef58" style="table_CH" x="205" y="0" width="76" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="7fe469a8-eb2d-4719-9d43-5d706e05ef58" style="table_CH" x="204" y="0" width="76" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[住院号]]></text> </staticText> <staticText> - <reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="821" y="0" width="60" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="820" y="0" width="60" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[手术医生]]></text> </staticText> <staticText> - <reportElement uuid="000349bd-47a1-41da-8a8c-c110ff8cc01a" style="table_CH" x="676" y="0" width="145" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="000349bd-47a1-41da-8a8c-c110ff8cc01a" style="table_CH" x="675" y="0" width="145" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[供应商]]></text> </staticText> <staticText> - <reportElement uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e" style="table_CH" mode="Opaque" x="71" y="0" width="54" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="39cd1fa3-8712-43f8-a523-47acdec6d68e" style="table_CH" mode="Opaque" x="70" y="0" width="54" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[申请科室]]></text> </staticText> <staticText> - <reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="616" y="0" width="60" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="615" y="0" width="60" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> @@ -331,83 +331,83 @@ <detail> <band height="35" splitType="Stretch"> <textField> - <reportElement uuid="1c0be745-af8b-44b7-9e0d-4789ab5184df" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="1" y="0" width="70" height="35"/> + <reportElement uuid="1c0be745-af8b-44b7-9e0d-4789ab5184df" style="table_TD" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="70" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{applicationTimeStr}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1025" y="0" width="60" height="35"/> + <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1024" y="0" width="60" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{applicant}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="281" y="0" width="65" height="35"/> + <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="280" y="0" width="65" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{patient}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="881" y="0" width="144" height="35"/> + <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="880" y="0" width="144" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{surgery}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1085" y="0" width="70" height="35"/> + <reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1084" y="0" width="70" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{processType}]]></textFieldExpression> </textField> <subreport> - <reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="346" y="0" width="270" height="35" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="345" y="0" width="270" height="35" isPrintWhenDetailOverflows="true"/> <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{tousseItems})]]></dataSourceExpression> <returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/> <subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "foreignTousseApplicationReport_subreport1.jasper"]]></subreportExpression> </subreport> <textField isBlankWhenNull="true"> - <reportElement uuid="a1bd59c5-f4a8-4ad5-ab32-7f29ffee4948" style="table_TD" stretchType="RelativeToBandHeight" x="205" y="0" width="76" height="35"/> + <reportElement uuid="a1bd59c5-f4a8-4ad5-ab32-7f29ffee4948" style="table_TD" stretchType="RelativeToBandHeight" x="204" y="0" width="76" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{hospitalNumber}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="821" y="0" width="60" height="35"/> + <reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="820" y="0" width="60" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{doctor}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="676" y="0" width="145" height="35"/> + <reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="675" y="0" width="145" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99" style="table_TD" stretchType="RelativeToBandHeight" x="125" y="0" width="80" height="35"/> + <reportElement uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99" style="table_TD" stretchType="RelativeToBandHeight" x="124" y="0" width="80" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{ascriptionDepartment}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99" style="table_TD" stretchType="RelativeToBandHeight" x="71" y="0" width="54" height="35"/> + <reportElement uuid="26be1ad9-8a7c-4ee5-a02b-64ae18424b99" style="table_TD" stretchType="RelativeToBandHeight" x="70" y="0" width="54" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> <textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="616" y="0" width="60" height="35"/> + <reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="615" y="0" width="60" height="35"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12"/> </textElement> @@ -418,25 +418,25 @@ <summary> <band height="34" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement uuid="0d3e5ce2-e82f-46f2-a0bf-947ceaca805c" style="table_TD" mode="Opaque" x="71" y="0" width="475" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="0d3e5ce2-e82f-46f2-a0bf-947ceaca805c" style="table_TD" mode="Opaque" x="70" y="0" width="475" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"/> </textField> <textField pattern="###0"> - <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TD" x="546" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="be433f51-71e0-494f-b23d-5050ff24d3ee" style="table_TD" x="545" y="0" width="70" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="01032e78-6269-4260-b4c4-e6c271e69141" style="table_CH" x="1" y="0" width="70" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="01032e78-6269-4260-b4c4-e6c271e69141" style="table_CH" x="0" y="0" width="70" height="30" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true"/> </textElement> <text><![CDATA[合计]]></text> </staticText> <staticText> - <reportElement uuid="cac3a5c8-b815-4c47-ab53-cd7e16d381ea" style="table_CH" x="616" y="0" width="539" height="30" backcolor="#FFFFFF"/> + <reportElement uuid="cac3a5c8-b815-4c47-ab53-cd7e16d381ea" style="table_CH" x="615" y="0" width="539" height="30" backcolor="#FFFFFF"/> <textElement/> <text><![CDATA[]]></text> </staticText> Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 27621) @@ -55,6 +55,9 @@ <fieldDescription><![CDATA[columnTitle]]></fieldDescription> </field> <field name="sumOfDisposableGoods" class="java.lang.Double"/> + <field name="sequence" class="java.lang.Integer"> + <fieldDescription><![CDATA[sequence]]></fieldDescription> + </field> <background> <band splitType="Stretch"/> </background> @@ -84,35 +87,10 @@ </staticText> </cellContents> </crosstabHeaderCell> - <rowGroup name="rowNum" width="0" totalPosition="End"> - <bucket class="java.lang.String"> - <bucketExpression><![CDATA[$F{rowNum}]]></bucketExpression> - </bucket> - <crosstabRowHeader> - <cellContents backcolor="#F0F8FF" mode="Opaque"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - </cellContents> - </crosstabRowHeader> - <crosstabTotalRowHeader> - <cellContents backcolor="#FFFFFF" mode="Transparent"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <staticText> - <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="117" height="25" forecolor="#000000"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font isBold="true"/> - </textElement> - <text><![CDATA[合计]]></text> - </staticText> - </cellContents> - </crosstabTotalRowHeader> - </rowGroup> <rowGroup name="department" width="117" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> + <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents backcolor="#FFFFFF" mode="Transparent"> @@ -213,6 +191,9 @@ <measure name="sumOfDgsMeasure" class="java.lang.Double" calculation="Sum"> <measureExpression><![CDATA[$F{sumOfDisposableGoods}]]></measureExpression> </measure> + <measure name="sequenceMeasure" class="java.lang.Integer" calculation="First"> + <measureExpression><![CDATA[$F{sequence}]]></measureExpression> + </measure> <crosstabCell width="79" height="25"> <cellContents> <box> @@ -227,34 +208,13 @@ </textField> </cellContents> </crosstabCell> - <crosstabCell width="79" height="25" rowTotalGroup="rowNum"> - <cellContents backcolor="#FFFFFF" mode="Transparent"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <textField pattern="###0.0000"> - <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 isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$V{moneyMeasure}]]></textFieldExpression> - </textField> - </cellContents> - </crosstabCell> <crosstabCell width="0" height="25" columnTotalGroup="columnNum"> <cellContents backcolor="#005FB3" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> </cellContents> </crosstabCell> - <crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum"> - <cellContents backcolor="#005FB3" mode="Opaque"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - </cellContents> - </crosstabCell> <crosstabCell width="81" height="25" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> @@ -269,20 +229,6 @@ </textField> </cellContents> </crosstabCell> - <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 pattern="###0.0000"> - <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{moneyMeasure}-$V{sumOfDgsMeasure}]]></textFieldExpression> - </textField> - </cellContents> - </crosstabCell> <crosstabCell width="79" height="0" rowTotalGroup="department"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> @@ -307,9 +253,6 @@ <crosstabCell columnTotalGroup="columnName"> <cellContents/> </crosstabCell> - <crosstabCell rowTotalGroup="rowNum" columnTotalGroup="columnName"> - <cellContents/> - </crosstabCell> <crosstabCell rowTotalGroup="department" columnTotalGroup="columnName"> <cellContents/> </crosstabCell> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r27617 -r27621 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27617) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27621) @@ -20,6 +20,7 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -89,7 +90,6 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyItem; import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationAreaWorkLoadBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationRecordItenBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForDepartmentVO; import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSterilizationInspectSituationBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean; @@ -105,7 +105,6 @@ import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; import com.forgon.tools.MathTools; -import com.forgon.tools.SqlBuilder; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.date.DateTools; @@ -242,12 +241,15 @@ Map<String, Object> map = getParameterMap(reportName); JasperPrint jsPrint = jasperReportManager.getJasperPrint(realPath, map); //报表数据的打印对象 + HttpSession session = StrutsParamUtils.getRequest().getSession(); + session.setAttribute("JasperPrint", jsPrint); + session.setAttribute("fileName", map.get("title")); + + //用于打印 + map.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE); + JasperPrint jasperPrintForPrint = jasperReportManager.getJasperPrint(realPath, map); + session.setAttribute("jasperPrintForPrint", jasperPrintForPrint); - StrutsParamUtils.getRequest().getSession() - .setAttribute("JasperPrint", jsPrint); - StrutsParamUtils.getRequest().getSession() - .setAttribute("fileName", map.get("title")); - } return "success"; } @@ -653,7 +655,17 @@ } } } - + if(!applyMonthReportOnlyPriceTemplate || applyMonthReportOneColumnTemplate){//仅显示价格的模板因报表特别，排序过程不一样 + //按科室供应室配置中的科室申领配置的科室排序 + Map<String, Integer> sequenceMap = supplyRoomConfigManager.getOrgUnitAndSequenceMap(4); + Iterator<MonthReportBean> it = dataSource.iterator(); + while(it.hasNext()){ + MonthReportBean b = it.next(); + if(sequenceMap.containsKey(b.getDepartment())){ + b.setSequence(sequenceMap.get(b.getDepartment())); + } + } + } if (applyMonthReportOneColumnTemplate) { Map<String, Set<String>> columnTitleColumnNameMap = new HashMap<>(); for (MonthReportBean bean : dataSource) { @@ -719,7 +731,22 @@ // 转为ArrayList，TODO：需要增加排序的方法，对按科室进行排序 List<MonthReportBean> beans = new ArrayList<MonthReportBean>(distinctMap.values()); - + //按科室供应室配置中的科室申领配置的科室排序 + Map<String, Integer> sequenceMap2 = supplyRoomConfigManager.getOrgUnitAndSequenceMap(4); + Collections.sort(beans, new Comparator<MonthReportBean>() { + @Override + public int compare(MonthReportBean o1, MonthReportBean o2) { + int o1sequence = 99999; + if(sequenceMap2.containsKey(o1.getDepartment())){ + o1sequence = sequenceMap2.get(o1.getDepartment()); + } + int o2sequence = 99999; + if(sequenceMap2.containsKey(o2.getDepartment())){ + o2sequence = sequenceMap2.get(o2.getDepartment()); + } + return o1sequence - o2sequence; + } + }); for (int i=0;i<totalRowNumber;i++){ myDataSource.add(new MonthReportBeanWith2Column()); } Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml (.../godownEntryDetailStatistic.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jrxml (.../godownEntryDetailStatistic.jrxml) (revision 27621) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="godownEntryDetailStatistic" language="groovy" pageWidth="1440" pageHeight="1032" whenNoDataType="BlankPage" columnWidth="1440" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="7abd0686-a7d6-4012-abc6-caa220056f14"> <property name="ireport.zoom" value="0.9090909090909096"/> - <property name="ireport.x" value="54"/> + <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> <style name="table"> <box> @@ -316,13 +316,6 @@ </textElement> <textFieldExpression><![CDATA[$V{totalPrice}]]></textFieldExpression> </textField> - <textField pattern="###0.00" isBlankWhenNull="false"> - <reportElement uuid="80732fbd-4dd3-435f-9c32-1dc1a8f671c2" style="table_TD" mode="Opaque" x="291" y="0" width="60" height="21" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> - <font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> - <paragraph lineSpacing="Single"/> - </textElement> - </textField> <staticText> <reportElement uuid="d12657e6-f296-408c-8056-b4ebd0cff9f2" style="table_TD" x="211" y="0" width="1149" height="21"/> <textElement/> Index: ssts-web/src/main/webapp/jasperRtp/materialTypeWorkloadReport.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jasper =================================================================== diff -u -r16965 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml (.../monthReportGroupBySterilizationMode.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml (.../monthReportGroupBySterilizationMode.jrxml) (revision 27621) @@ -52,6 +52,9 @@ <field name="columnTitle" class="java.lang.String"> <fieldDescription><![CDATA[columnTitle]]></fieldDescription> </field> + <field name="sequence" class="java.lang.Integer"> + <fieldDescription><![CDATA[sequence]]></fieldDescription> + </field> <background> <band splitType="Stretch"/> </background> @@ -83,7 +86,8 @@ </crosstabHeaderCell> <rowGroup name="rowNum" width="0" totalPosition="End"> <bucket class="java.lang.String"> - <bucketExpression><![CDATA[$F{rowNum}]]></bucketExpression> + <bucketExpression><![CDATA[$F{department}]]></bucketExpression> + <orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents backcolor="#F0F8FF" mode="Opaque"> @@ -110,6 +114,7 @@ <rowGroup name="department" width="117" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> + <orderByExpression><![CDATA[$V{sequenceMeasure}==null?9999:$V{sequenceMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents backcolor="#FFFFFF" mode="Transparent"> @@ -207,6 +212,9 @@ <measure name="moneyMeasure" class="java.lang.Double" calculation="Sum"> <measureExpression><![CDATA[$F{money}]]></measureExpression> </measure> + <measure name="sequenceMeasure" class="java.lang.Integer" calculation="First"> + <measureExpression><![CDATA[$F{sequence}]]></measureExpression> + </measure> <crosstabCell width="79" height="25"> <cellContents> <box> Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r27495 -r27621 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 27495) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 27621) @@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; import net.sf.json.JSONArray; @@ -266,4 +267,10 @@ * @return */ public boolean verifDepartCanMergeApplication(String departCoding, SupplyRoomConfig config); + /** + * 获取供应室配置的科室和序号的map + * @param type 供应室类型 + * @return + */ + public Map<String, Integer> getOrgUnitAndSequenceMap(int type); } Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/godownEntryDetailStatistic.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27567 -r27621 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27567) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27621) @@ -3258,7 +3258,6 @@ public List<MonthReportBean> getMonthReportDataGroupByDisposableGoodsType(String startDate,String endDate, String department,String tousseType,String disposableGoodsType,Boolean showCustonTousseAmount){ boolean enableDiscountPrice = CssdUtils.getSystemSetConfigByNameBool("enableDiscountPrice"); - enableDiscountPrice = true; //是否启用包内材料统计列 boolean monthReportMaterialAmountOfTousse = CssdUtils.getSystemSetConfigByNameBool("monthReportMaterialAmountOfTousse"); SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); @@ -5354,8 +5353,30 @@ sortDetailItems(detail); datas.add(detail); } + orderDepartmentMonthDetailList(datas); return datas; } + /** + * 对DepartmentMonthDetailList进行排序(按科室供应室配置的科室申领的顺序科室排序) + * @param list + */ + private void orderDepartmentMonthDetailList(List<DepartmentMonthDetail> list){ + Map<String, Integer> map = supplyRoomConfigManager.getOrgUnitAndSequenceMap(4); + Collections.sort(list, new Comparator<DepartmentMonthDetail>() { + @Override + public int compare(DepartmentMonthDetail o1, DepartmentMonthDetail o2) { + int o1sequence = 99999; + if(map.containsKey(o1.getDepart())){ + o1sequence = map.get(o1.getDepart()); + } + int o2sequence = 99999; + if(map.containsKey(o2.getDepart())){ + o2sequence = map.get(o2.getDepart()); + } + return o1sequence - o2sequence; + } + }); + } @Override public List<DepartmentMonthDetail> getDepartmentMonthDetailList( String startTime, String endTime, String depart, @@ -11472,6 +11493,7 @@ sql += " union all "; sql += returnMaterialSql; sql += " ) m "; + sql += String.format("left join (select sequence,orgUnitCoding from %s src where src.supplyRoomType=4) t on m.departCoding=t.orgUnitCoding ", SupplyRoomConfig.class.getSimpleName()); sql += " where " + dateQueryAdapter.dateAreaSql("m.returnTime", startDay, endDay,true); if (StringUtils.isNotBlank(type)) { sql += " and m.type = '" + type + "'"; @@ -11486,7 +11508,7 @@ String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); sql += " and m.handleDepartCode = '" + handleDeptCode + "'"; } - sql += " order by m.depart"; + sql += " order by (case when t.sequence is null then 9999 else t.sequence end)"; //sql += "group by m.departCoding"; //System.out.println(sql); Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml (.../deviceMaintenanceCusReport.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml (.../deviceMaintenanceCusReport.jrxml) (revision 27621) @@ -88,8 +88,8 @@ <title> <band height="41" splitType="Stretch"> <textField> - <reportElement uuid="64157d03-19f2-4c2d-8fd9-99cb2ac19259" x="0" y="0" width="1048" height="41"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> + <reportElement uuid="64157d03-19f2-4c2d-8fd9-99cb2ac19259" x="0" y="0" width="4390" height="41"/> + <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> @@ -103,28 +103,28 @@ <crosstabHeaderCell> <cellContents style="Crosstab Data Text"> <staticText> - <reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="268" y="0" width="55" height="83"/> + <reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="268" y="0" width="55" height="84"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="13" isBold="true"/> </textElement> <text><![CDATA[登记人]]></text> </staticText> <staticText> - <reportElement uuid="1256f540-aa3a-4b0b-af19-1f89d16f5c02" style="table_TH" x="91" y="0" width="177" height="83"/> + <reportElement uuid="1256f540-aa3a-4b0b-af19-1f89d16f5c02" style="table_TH" x="91" y="0" width="177" height="84"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="13" isBold="true"/> </textElement> <text><![CDATA[设备维护名称]]></text> </staticText> <staticText> - <reportElement uuid="60b275b2-3adb-43c6-8a16-3ffda04f0023" style="table_TH" x="0" y="0" width="91" height="83"/> + <reportElement uuid="60b275b2-3adb-43c6-8a16-3ffda04f0023" style="table_TH" x="0" y="0" width="91" height="84"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="13" isBold="true"/> </textElement> <text><![CDATA[维护时间]]></text> </staticText> <staticText> - <reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="323" y="0" width="170" height="83"/> + <reportElement uuid="63f70f13-ab4d-4113-af49-541c7007b3a2" style="table_TH" x="323" y="0" width="170" height="84"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="13" isBold="true"/> </textElement> @@ -249,14 +249,14 @@ <cellContents/> </crosstabTotalColumnHeader> </columnGroup> - <columnGroup name="option" height="41" headerPosition="Stretch"> + <columnGroup name="option" height="42" headerPosition="Stretch"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{option}]]></bucketExpression> </bucket> <crosstabColumnHeader> <cellContents> <textField pattern="" isBlankWhenNull="true"> - <reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="41"/> + <reportElement uuid="7ec92dc6-d92d-4bf5-82aa-0aac3fb95ebb" style="table_TH" positionType="Float" stretchType="RelativeToBandHeight" x="0" y="0" width="104" height="42"/> <textElement textAlignment="Center" verticalAlignment="Middle"> <font size="12" isBold="true" isUnderline="false" isStrikeThrough="false"/> <paragraph lineSpacing="Single"/> Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper =================================================================== diff -u -r27617 -r27621 Binary files differ Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml =================================================================== diff -u -r16965 -r27621 --- ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml (.../tousseDeliverStatistics.jrxml) (revision 16965) +++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml (.../tousseDeliverStatistics.jrxml) (revision 27621) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="apparatusInfusionisType" language="groovy" pageWidth="400" pageHeight="561" whenNoDataType="BlankPage" columnWidth="400" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5bbf3cee-ce6d-4168-af43-6fa057d2664f"> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="apparatusInfusionisType" language="groovy" pageWidth="25000" pageHeight="561" whenNoDataType="BlankPage" columnWidth="25000" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5bbf3cee-ce6d-4168-af43-6fa057d2664f"> <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> @@ -34,25 +34,32 @@ <parameter name="title" class="java.lang.String"> <defaultValueExpression><![CDATA[""]]></defaultValueExpression> </parameter> + <parameter name="orderSql" class="java.lang.String"> + <defaultValueExpression><![CDATA[""]]></defaultValueExpression> + </parameter> <queryString> - <![CDATA[select * from( - select i.settleAccountsDepart depart, count(*) amount, ti.tousseName goodsName + <![CDATA[select depart, amount, goodsName,sequence from( + select i.settleAccountsDepart depart, count(*) amount, ti.tousseName goodsName,t.sequence from TousseInstance ti - inner join Invoice i on i.id=ti.invoice_id where 1=1 $P!{querySql} - group by i.settleAccountsDepart, ti.tousseName -)tempTable $P!{filterSql}]]> + inner join Invoice i on i.id=ti.invoice_id + left join (select sequence,orgUnitCoding from SupplyRoomConfig src where src.supplyRoomType=4) t on i.settleAccountsDepartCoding=t.orgUnitCoding + where 1=1 $P!{querySql} + group by i.settleAccountsDepart, ti.tousseName,t.sequence + )tempTable $P!{filterSql} + order by $P!{orderSql}]]> </queryString> <field name="DEPART" class="java.lang.String"/> <field name="AMOUNT" class="java.math.BigDecimal"/> <field name="GOODSNAME" class="java.lang.String"/> + <field name="SEQUENCE" class="java.lang.Integer"/> <background> <band splitType="Stretch"/> </background> <title> <band height="33" splitType="Stretch"> <textField> - <reportElement uuid="dc8d483b-0cb4-40be-acb5-022dcf8a585e" x="0" y="0" width="400" height="33"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> + <reportElement uuid="dc8d483b-0cb4-40be-acb5-022dcf8a585e" x="0" y="0" width="25000" height="33"/> + <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> @@ -62,7 +69,7 @@ <summary> <band height="132" splitType="Stretch"> <crosstab ignoreWidth="true"> - <reportElement uuid="fa0c5782-2849-4356-82e8-bbba923555f8" x="0" y="0" width="400" height="132"/> + <reportElement uuid="fa0c5782-2849-4356-82e8-bbba923555f8" x="0" y="0" width="311" height="132"/> <crosstabHeaderCell> <cellContents> <staticText> @@ -84,6 +91,7 @@ <rowGroup name="DEPART" width="150" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{DEPART}]]></bucketExpression> + <orderByExpression><![CDATA[$V{SEQUENCEMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents backcolor="#FFFFFF" mode="Transparent"> @@ -102,7 +110,7 @@ <textElement verticalAlignment="Middle"> <font size="12"/> </textElement> - <textFieldExpression><![CDATA[$V{DEPART}.substring($V{DEPART}.indexOf("_")+1,$V{DEPART}.length())]]></textFieldExpression> + <textFieldExpression><![CDATA[$V{DEPART}]]></textFieldExpression> </textField> </cellContents> </crosstabRowHeader> @@ -178,6 +186,9 @@ <measure name="AMOUNTMeasure" class="java.math.BigDecimal" calculation="Sum"> <measureExpression><![CDATA[$F{AMOUNT}]]></measureExpression> </measure> + <measure name="SEQUENCEMeasure" class="java.lang.Integer" calculation="First"> + <measureExpression><![CDATA[$F{SEQUENCE}]]></measureExpression> + </measure> <crosstabCell width="80" height="33"> <cellContents> <box> Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml =================================================================== diff -u -r27617 -r27621 --- ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml (.../monthReport.jrxml) (revision 27617) +++ ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml (.../monthReport.jrxml) (revision 27621) @@ -52,6 +52,9 @@ <field name="columnTitle" class="java.lang.String"> <fieldDescription><![CDATA[columnTitle]]></fieldDescription> </field> + <field name="sequence" class="java.lang.Integer"> + <fieldDescription><![CDATA[sequence]]></fieldDescription> + </field> <background> <band splitType="Stretch"/> </background> @@ -81,35 +84,10 @@ </staticText> </cellContents> </crosstabHeaderCell> - <rowGroup name="rowNum" width="0" totalPosition="End"> - <bucket class="java.lang.String"> - <bucketExpression><![CDATA[$F{rowNum}]]></bucketExpression> - </bucket> - <crosstabRowHeader> - <cellContents backcolor="#F0F8FF" mode="Opaque"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - </cellContents> - </crosstabRowHeader> - <crosstabTotalRowHeader> - <cellContents backcolor="#FFFFFF" mode="Transparent"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <staticText> - <reportElement uuid="1311756a-eafc-440e-926f-b78c03af13a7" x="0" y="0" width="117" height="25" forecolor="#000000"/> - <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="12" isBold="true"/> - </textElement> - <text><![CDATA[合计]]></text> - </staticText> - </cellContents> - </crosstabTotalRowHeader> - </rowGroup> <rowGroup name="department" width="117" totalPosition="End"> <bucket class="java.lang.String"> <bucketExpression><![CDATA[$F{department}]]></bucketExpression> + <orderByExpression><![CDATA[$V{sequenceMeasure}]]></orderByExpression> </bucket> <crosstabRowHeader> <cellContents backcolor="#FFFFFF" mode="Transparent"> @@ -207,6 +185,9 @@ <measure name="moneyMeasure" class="java.lang.Double" calculation="Sum"> <measureExpression><![CDATA[$F{money}]]></measureExpression> </measure> + <measure name="sequenceMeasure" class="java.lang.Integer" calculation="First"> + <measureExpression><![CDATA[$F{sequence}==null?99999:$F{sequence}]]></measureExpression> + </measure> <crosstabCell width="79" height="25"> <cellContents> <box> @@ -221,34 +202,13 @@ </textField> </cellContents> </crosstabCell> - <crosstabCell width="79" height="25" rowTotalGroup="rowNum"> - <cellContents backcolor="#FFFFFF" mode="Transparent"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - <textField pattern="###0.0000"> - <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{moneyMeasure}]]></textFieldExpression> - </textField> - </cellContents> - </crosstabCell> <crosstabCell width="0" height="25" columnTotalGroup="columnNum"> <cellContents backcolor="#005FB3" mode="Opaque"> <box> <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> </box> </cellContents> </crosstabCell> - <crosstabCell width="0" height="25" rowTotalGroup="rowNum" columnTotalGroup="columnNum"> - <cellContents backcolor="#005FB3" mode="Opaque"> - <box> - <pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/> - </box> - </cellContents> - </crosstabCell> <crosstabCell width="81" height="25" columnTotalGroup="columnTitle"> <cellContents backcolor="#FFFFFF" mode="Transparent"> <box> @@ -263,20 +223,6 @@ </textField> </cellContents> </crosstabCell> - <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 pattern="###0.0000"> - <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{moneyMeasure}]]></textFieldExpression> - </textField> - </cellContents> - </crosstabCell> <crosstabCell width="79" height="0" rowTotalGroup="department"> <cellContents backcolor="#BFE1FF" mode="Opaque"> <box> @@ -301,9 +247,6 @@ <crosstabCell columnTotalGroup="columnName"> <cellContents/> </crosstabCell> - <crosstabCell rowTotalGroup="rowNum" columnTotalGroup="columnName"> - <cellContents/> - </crosstabCell> <crosstabCell rowTotalGroup="department" columnTotalGroup="columnName"> <cellContents/> </crosstabCell> Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r27495 -r27621 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 27495) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 27621) @@ -2,11 +2,15 @@ import java.io.File; import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -30,6 +34,7 @@ import com.forgon.disinfectsystem.systemsetting.service.SystemSettingManager; import com.forgon.tools.MathTools; import com.forgon.tools.cache.ForgonThreadLocalResourceManager; +import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.json.JSONUtil; @@ -980,4 +985,24 @@ } return false; } + @Override + public Map<String, Integer> getOrgUnitAndSequenceMap(int type) { + String sql = String.format("select sequence,orgUnitCoding,orgUnitName from %s po where po.supplyRoomType=%s and po.orgUnitCoding not in (select orgUnitCoding from %s where status = %s) order by po.sequence", + SupplyRoomConfig.class.getSimpleName(),type,OrgUnit.class.getSimpleName(), OrgUnit.STATUS_DISABLED); + ResultSet result = null; + Map<String, Integer> map = new HashMap<String, Integer>(); + try { + result = objectDao.executeSql(sql); + while(result.next()){ + int sequence = result.getInt("sequence"); + String orgUnitName = result.getString("orgUnitName"); + map.put(orgUnitName, sequence); + } + } catch (SQLException e) { + e.printStackTrace(); + }finally { + DatabaseUtil.closeResultSetAndStatement(result); + } + return map; + } }