Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
===================================================================
diff -u -r27621 -r27623
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 27621)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 27623)
@@ -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="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.x" value="1022"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
 	<style name="table">
@@ -34,19 +34,15 @@
 	<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 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
-    left join (select sequence,orgUnitCoding from SupplyRoomConfig src where src.supplyRoomType=4) t on i.settleAccountsDepartCoding=t.orgUnitCoding
+    left join (select sequence,orgUnitCoding from SupplyRoomConfig src where src.supplyRoomType=3 and src.orgUnitCoding not in (select orgUnitCoding from OrgUnit where status =0)) 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}]]>
+    )tempTable $P!{filterSql}]]>
 	</queryString>
 	<field name="DEPART" class="java.lang.String"/>
 	<field name="AMOUNT" class="java.math.BigDecimal"/>
@@ -91,7 +87,7 @@
 				<rowGroup name="DEPART" width="150" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{DEPART}]]></bucketExpression>
-						<orderByExpression><![CDATA[$V{SEQUENCEMeasure}]]></orderByExpression>
+						<orderByExpression><![CDATA[$V{SEQUENCEMeasure}==null?9999:$V{SEQUENCEMeasure}]]></orderByExpression>
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents backcolor="#FFFFFF" mode="Transparent">