Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReport.jrxml
===================================================================
diff -u -r33099 -r33396
--- ssts-web/src/main/webapp/jasperRtp/packingRecordReport.jrxml	(.../packingRecordReport.jrxml)	(revision 33099)
+++ ssts-web/src/main/webapp/jasperRtp/packingRecordReport.jrxml	(.../packingRecordReport.jrxml)	(revision 33396)
@@ -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="monthDetail_main_1" language="groovy" pageWidth="1370" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="1370" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+<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="monthDetail_main_1" language="groovy" pageWidth="1420" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="1420" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -53,7 +53,7 @@
 	<columnHeader>
 		<band height="84" splitType="Stretch">
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="1370" height="27"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="1420" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
@@ -67,21 +67,21 @@
 				<text><![CDATA[供应商]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="800" y="54" width="120" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="850" y="54" width="120" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[配包人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1040" y="54" width="140" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1090" y="54" width="140" height="30" backcolor="#C5D9F1"/>
 				<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="920" y="54" width="120" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="970" y="54" width="120" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -102,7 +102,7 @@
 				<text><![CDATA[拆包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1180" y="54" width="70" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1230" y="54" width="70" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -116,7 +116,7 @@
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1250" y="54" width="120" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="1300" y="54" width="120" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -137,18 +137,25 @@
 				<text><![CDATA[器械包]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="27" width="1370" height="27"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="27" width="1420" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{titleDate}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="800" y="54" width="50" height="30" backcolor="#C5D9F1"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[小计]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="30">
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="1370" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="1420" height="30" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="rootPath">
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -162,26 +169,33 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{firstColumnName}]]></textFieldExpression>
 			</textField>
+			<textField pattern="#0" isBlankWhenNull="true">
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="800" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{firstColumnTotalAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="30">
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="0" y="0" width="750" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="0" y="0" width="800" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="15" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="750" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="800" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sunAmount}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="800" y="0" width="570" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="850" y="0" width="570" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="15" isBold="true" isItalic="false"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign_child.jrxml
===================================================================
diff -u -r33082 -r33396
--- ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign_child.jrxml	(.../packingRecordReportNotHaveForeign_child.jrxml)	(revision 33082)
+++ ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign_child.jrxml	(.../packingRecordReportNotHaveForeign_child.jrxml)	(revision 33396)
@@ -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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="830" pageHeight="802" columnWidth="830" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
+<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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="880" pageHeight="802" columnWidth="880" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -53,7 +53,7 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="450" y="0" width="120" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="500" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -81,7 +81,7 @@
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="570" y="0" width="120" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="620" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -95,7 +95,7 @@
 				<textFieldExpression><![CDATA[$F{reviewer}]]></textFieldExpression>
 			</textField>
 			<textField pattern="yyyy-MM-dd hh:mm:ss" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="690" y="0" width="140" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="740" y="0" width="140" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -108,20 +108,6 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{packTime}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1250" y="0" width="120" height="30"/>
-				<box>
-					<pen lineWidth="0.5"/>
-					<topPen lineWidth="0.5"/>
-					<leftPen lineWidth="0.5"/>
-					<bottomPen lineWidth="0.5"/>
-					<rightPen lineWidth="0.5"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{doctor}]]></textFieldExpression>
-			</textField>
 			<textField pattern="#0" isBlankWhenNull="true">
 				<reportElement uuid="5c6203d7-c69f-4c80-a1de-56b92d87f3e5" stretchType="RelativeToBandHeight" x="0" y="0" width="50" height="30"/>
 				<box>
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign_child.jasper
===================================================================
diff -u -r33101 -r33396
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReport.jasper
===================================================================
diff -u -r33099 -r33396
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign.jasper
===================================================================
diff -u -r33101 -r33396
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33392 -r33396
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33392)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33396)
@@ -24467,22 +24467,6 @@
 				firstColumnDetaileds.add(packingRecordReportVo);
 			}
 			paramObj.put("firstColumnTotalAmount", firstColumnTotalAmount);
-			int orderNum = 1;
-			for (FirstColumnVo vo : firstColumnVos) {
-				List<PackingRecordReportVo> firstColumnDetaileds = vo.getFirstColumnDetaileds();
-				int amount = 0;
-				for (PackingRecordReportVo packingRecordReportVo : firstColumnDetaileds) {
-					amount = MathTools.add(amount, packingRecordReportVo.getAmount()).intValue();
-					packingRecordReportVo.setOrderNum(orderNum);
-					orderNum++;
-				}
-				PackingRecordReportVo totalVo = new PackingRecordReportVo();
-				totalVo.setAmount(amount);
-				totalVo.setDepart("小计");
-				totalVo.setOrderNum(orderNum);
-				orderNum++;
-				firstColumnDetaileds.add(totalVo);
-			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		} finally {
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReport_child.jrxml
===================================================================
diff -u -r33082 -r33396
--- ssts-web/src/main/webapp/jasperRtp/packingRecordReport_child.jrxml	(.../packingRecordReport_child.jrxml)	(revision 33082)
+++ ssts-web/src/main/webapp/jasperRtp/packingRecordReport_child.jrxml	(.../packingRecordReport_child.jrxml)	(revision 33396)
@@ -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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="1370" pageHeight="802" columnWidth="1370" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
+<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="operatingRoomUseRecordReport_child_child_child" language="groovy" pageWidth="1420" pageHeight="802" columnWidth="1420" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="318375b8-53fe-47b6-a25b-2a1ddf5fb36e">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -67,7 +67,7 @@
 				<textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="800" y="0" width="120" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="850" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -95,7 +95,7 @@
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="920" y="0" width="120" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="970" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -109,7 +109,7 @@
 				<textFieldExpression><![CDATA[$F{reviewer}]]></textFieldExpression>
 			</textField>
 			<textField pattern="yyyy-MM-dd hh:mm:ss" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1040" y="0" width="140" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1090" y="0" width="140" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -123,7 +123,7 @@
 				<textFieldExpression><![CDATA[$F{packTime}]]></textFieldExpression>
 			</textField>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="5c6203d7-c69f-4c80-a1de-56b92d87f3e5" stretchType="RelativeToBandHeight" x="1180" y="0" width="70" height="30"/>
+				<reportElement uuid="5c6203d7-c69f-4c80-a1de-56b92d87f3e5" stretchType="RelativeToBandHeight" x="1230" y="0" width="70" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
@@ -137,7 +137,7 @@
 				<textFieldExpression><![CDATA[$F{materialInstanceAmount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1250" y="0" width="120" height="30"/>
+				<reportElement uuid="b3b9f449-9307-438f-a8c7-17bad778a405" stretchType="RelativeToBandHeight" x="1300" y="0" width="120" height="30"/>
 				<box>
 					<pen lineWidth="0.5"/>
 					<topPen lineWidth="0.5"/>
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReport_child.jasper
===================================================================
diff -u -r33099 -r33396
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign.jrxml
===================================================================
diff -u -r33101 -r33396
--- ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign.jrxml	(.../packingRecordReportNotHaveForeign.jrxml)	(revision 33101)
+++ ssts-web/src/main/webapp/jasperRtp/packingRecordReportNotHaveForeign.jrxml	(.../packingRecordReportNotHaveForeign.jrxml)	(revision 33396)
@@ -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="monthDetail_main_1" language="groovy" pageWidth="830" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="830" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+<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="monthDetail_main_1" language="groovy" pageWidth="880" pageHeight="1000" whenNoDataType="AllSectionsNoDetail" columnWidth="880" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -53,28 +53,28 @@
 	<columnHeader>
 		<band height="84" splitType="Stretch">
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="830" height="27"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="0" width="880" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="450" y="54" width="120" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="500" y="54" width="120" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[配包人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="690" y="54" width="140" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="a9c60a2d-c54d-4419-a244-dee833119df2" style="table_TH" x="740" y="54" width="140" height="30" backcolor="#C5D9F1"/>
 				<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="570" y="54" width="120" height="30" backcolor="#C5D9F1"/>
+				<reportElement uuid="db44711a-c56b-47ff-a1c2-f82eda2ba32f" style="table_TH" x="620" y="54" width="120" height="30" backcolor="#C5D9F1"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -109,18 +109,25 @@
 				<text><![CDATA[器械包]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="27" width="830" height="27"/>
+				<reportElement uuid="d8247d37-7c3f-413e-a94b-de38e48cab81" x="0" y="27" width="880" height="27"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{titleDate}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="450" y="54" width="50" height="30" backcolor="#C5D9F1"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[小计]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="30">
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="830" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="0" width="881" height="30" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="rootPath">
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -134,26 +141,33 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{firstColumnName}]]></textFieldExpression>
 			</textField>
+			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" positionType="Float" stretchType="RelativeToTallestObject" x="450" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{firstColumnTotalAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="30">
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="0" y="0" width="400" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="0" y="0" width="450" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="15" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField pattern="#0" isBlankWhenNull="true">
-				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="400" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="1c775e45-a905-44cf-8b93-2a13eb0df19d" style="table_TD" stretchType="RelativeToBandHeight" x="450" y="0" width="50" height="30" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sunAmount}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="450" y="0" width="380" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="500" y="0" width="380" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="15" isBold="true" isItalic="false"/>
 				</textElement>