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>