Index: ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml
===================================================================
diff -u -r19036 -r19040
--- ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml	(.../tousseSpecificationSizeStatistics.jrxml)	(revision 19036)
+++ ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jrxml	(.../tousseSpecificationSizeStatistics.jrxml)	(revision 19040)
@@ -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="tousseSpecificationSizeStatistics" language="groovy" pageWidth="340" pageHeight="380" columnWidth="340" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c04c1842-b429-4c83-b740-8e492b6d54c4">
+<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="tousseSpecificationSizeStatistics" language="groovy" pageWidth="340" pageHeight="570" columnWidth="340" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="c04c1842-b429-4c83-b740-8e492b6d54c4">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
Index: ssts-web/src/main/webapp/jasperRtp/tousseSpecificationSizeStatistics.jasper
===================================================================
diff -u -r19036 -r19040
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19036 -r19040
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19036)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19040)
@@ -16320,29 +16320,35 @@
 			}
 			
 			//1、本院科室
-			String sql1 = String.format("select td.packageSize,sum(ii.amount) amount "
+			String sql1 = String.format("select td.packageSize,sum(ii.amount) amount,"
+					+ "case when td.packageSize='%s' then 1 when td.packageSize='%s' then 2 when td.packageSize='%s' then 3  when td.packageSize='%s' then 4 end sequence "
 					+ "from Invoice i join InvoiceItem ii on ii.invoice_id=i.id join TousseDefinition td on td.id=ii.tousseDefinitionId "
-					+ "where ii.tousseType in ('%s','%s','%s') %s %s %s group by td.packageSize", 
+					+ "where td.packageSize is not null and ii.tousseType in ('%s','%s','%s') %s %s %s group by td.packageSize order by sequence", 
+					TousseDefinition.PACKAGE_SIZE_HUGE,TousseDefinition.PACKAGE_SIZE_BIG,TousseDefinition.PACKAGE_SIZE_CENTER,TousseDefinition.PACKAGE_SIZE_SMALL,
 					TousseDefinition.PACKAGE_TYPE_INSIDE, TousseDefinition.PACKAGE_TYPE_DRESSING, TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY,
 					betweenSql, orgUnitCodingSql, inSql);
 			setTousseSpecificationSizeStatisticsBean(list, sql1, "本院器械包");
 			
 			//2、外院科室
-			sql1 = String.format("select td.packageSize,sum(ii.amount) amount "
+			sql1 = String.format("select td.packageSize,sum(ii.amount) amount,"
+					+ "case when td.packageSize='%s' then 1 when td.packageSize='%s' then 2 when td.packageSize='%s' then 3  when td.packageSize='%s' then 4 end sequence "
 					+ "from Invoice i join InvoiceItem ii on ii.invoice_id=i.id join TousseDefinition td on td.id=ii.tousseDefinitionId "
-					+ "where 1=1 and ii.tousseType in ('%s','%s','%s') %s %s %s group by td.packageSize", 
+					+ "where td.packageSize is not null and ii.tousseType in ('%s','%s','%s') %s %s %s group by td.packageSize order by sequence", 
+					TousseDefinition.PACKAGE_SIZE_HUGE,TousseDefinition.PACKAGE_SIZE_BIG,TousseDefinition.PACKAGE_SIZE_CENTER,TousseDefinition.PACKAGE_SIZE_SMALL,
 					TousseDefinition.PACKAGE_TYPE_INSIDE, TousseDefinition.PACKAGE_TYPE_DRESSING, TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY,
 					betweenSql, orgUnitCodingSql, notInSql);
 			setTousseSpecificationSizeStatisticsBean(list, sql1, "外院器械包");
 			
-			
 			//3、植入物器械包
-			sql1 = String.format("select t1.packageSize,count(*) amount from("
+			sql1 = String.format("select t1.packageSize,count(*) amount,"
+					+ "case when t1.packageSize='%s' then 1 when t1.packageSize='%s' then 2 when t1.packageSize='%s' then 3  when t1.packageSize='%s' then 4 end sequence "
+					+ "from("
 					+ "select td.packageSize "
 					+ "from Invoice i join TousseInstance ti on ti.invoice_id=i.id join ForeignTousseApplication fta on fta.id=ti.foreignTousseApp_id "
 					+ "join TousseDefinition td on td.invoicePlanID=fta.id and td.tousseType='%s' "
-					+ "where 1=1  and td.packageSize is not null %s %s group by td.id,td.packageSize"
-					+ ") t1 group by t1.packageSize",
+					+ "where td.packageSize is not null %s %s group by td.id,td.packageSize"
+					+ ") t1 group by t1.packageSize  order by sequence",
+					TousseDefinition.PACKAGE_SIZE_HUGE,TousseDefinition.PACKAGE_SIZE_BIG,TousseDefinition.PACKAGE_SIZE_CENTER,TousseDefinition.PACKAGE_SIZE_SMALL,
 					TousseDefinition.PACKAGE_TYPE_FOREIGN, betweenSql, orgUnitCodingSql);
 			setTousseSpecificationSizeStatisticsBean(list, sql1, "植入物器械包");