Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_child_1.jasper
===================================================================
diff -u -r12607 -r27122
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27084 -r27122
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27084)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27122)
@@ -3320,13 +3320,21 @@
 		String month = StrutsParamUtils.getPraramValue("month", "");
 		String goodsSearch = StrutsParamUtils.getPraramValue("goodsSearch", "");
 		String tousseType = StrutsParamUtils.getPraramValue("tousseType", "");
-		if(StringUtils.isNotBlank(tousseType) && tousseType.contains("全部")){
-			tousseType = "全部";
-		}
-		String title = "发货物品统计月报【灭菌程序：" + tousseType + "】"
+		String title = "发货物品统计月报"
 				+ (StringUtils.isNotBlank(month) ? "（" + month + "）" : "");
 		Map<String, String> monthMap = getMonthStartAndEndDate(month);
 		map.put("title", title);
+		String sterilisations = null;
+		if(StringUtils.isBlank(tousseType) || tousseType.contains("全部")){
+			sterilisations = "全部";
+		}else{
+			sterilisations = tousseType.replaceAll(", ", "、").replaceAll(",", "、");
+		}
+		if(sterilisations.length() > 140){//超过的不显示
+			sterilisations = sterilisations.substring(0, 140);
+			sterilisations = sterilisations.substring(0, sterilisations.lastIndexOf("、")) + "......";
+		}
+		map.put("sterilisations", "灭菌程序:" + sterilisations);
 		String sql = "";
 		if (StringUtils.isNotBlank(month)) {
 			String startDay = dateQueryAdapter.dateAdapter(monthMap
Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jasper
===================================================================
diff -u -r12607 -r27122
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml
===================================================================
diff -u -r12607 -r27122
--- ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml	(.../EOGoods_main_1.jrxml)	(revision 12607)
+++ ssts-web/src/main/webapp/jasperRtp/EOGoods_main_1.jrxml	(.../EOGoods_main_1.jrxml)	(revision 27122)
@@ -31,6 +31,7 @@
 	<parameter name="sql" class="java.lang.String">
 		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
 	</parameter>
+	<parameter name="sterilisations" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[select i.depart,sum(t.fluctuationPrice) as totalPrice from invoice i,TousseInstance t
  where i.id = t.invoice_id and (i.status = '已发货' or i.status = '收货签收')
@@ -42,37 +43,37 @@
 		<band splitType="Stretch"/>
 	</background>
 	<columnHeader>
-		<band height="60" splitType="Stretch">
+		<band height="120" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="4af9d9c4-05f6-4cc1-9695-aabf5fe9b589" style="table_TH" x="112" y="30" width="211" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="4af9d9c4-05f6-4cc1-9695-aabf5fe9b589" style="table_TH" x="113" y="90" width="211" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="323" y="30" width="80" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="324" y="90" width="80" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="403" y="30" width="80" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="404" y="90" width="80" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[单价(元)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="483" y="30" width="80" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="484" y="90" width="80" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
-				<text><![CDATA[总计(元)]]></text>
+				<text><![CDATA[小计(元)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="0" y="30" width="112" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="1" y="90" width="112" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -86,25 +87,32 @@
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="563" y="30" width="87" height="30" backcolor="#D9EEDE"/>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="564" y="90" width="87" height="30" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[总价(元)]]></text>
 			</staticText>
+			<textField>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="30" width="650" height="60"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{sterilisations}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
 			<textField isBlankWhenNull="false">
-				<reportElement uuid="f5dd126c-5e41-44f1-96fd-7f6a9896fff2" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="112" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f5dd126c-5e41-44f1-96fd-7f6a9896fff2" style="table_TD" stretchType="RelativeToBandHeight" x="1" y="0" width="112" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="false" isItalic="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{DEPART}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="112" y="0" width="451" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="113" y="0" width="451" height="30" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{DEPART}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -115,7 +123,7 @@
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "EOGoods_child_1.jasper"]]></subreportExpression>
 			</subreport>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="563" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b2b1b7cc-bf59-46d0-80c2-0208194458d1" style="table_TD" stretchType="RelativeToBandHeight" x="564" y="0" width="87" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="false"/>
 				</textElement>
@@ -129,21 +137,21 @@
 	<pageFooter>
 		<band height="30">
 			<textField>
-				<reportElement uuid="99b6c86e-7a7f-42a7-8b73-f10bd36aac1f" x="0" y="0" width="483" height="20"/>
+				<reportElement uuid="99b6c86e-7a7f-42a7-8b73-f10bd36aac1f" x="1" y="0" width="483" height="20"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="483" y="0" width="80" height="20"/>
+				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="484" y="0" width="80" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["第 "+$V{PAGE_NUMBER}+" 页"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report" pattern="">
-				<reportElement uuid="4002a98f-14e0-4d97-a485-31cdc1ed6f69" x="563" y="0" width="87" height="20"/>
+				<reportElement uuid="4002a98f-14e0-4d97-a485-31cdc1ed6f69" x="564" y="0" width="87" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>