Index: ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml
===================================================================
diff -u -r18083 -r18179
--- ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml	(.../operationReservationInvoice2.jrxml)	(revision 18083)
+++ ssts-web/src/main/webapp/jasperRtp/operationReservationInvoice2.jrxml	(.../operationReservationInvoice2.jrxml)	(revision 18179)
@@ -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="operationReservationInvoice2.jrxml" language="groovy" pageWidth="884" pageHeight="798" columnWidth="884" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2dca2480-f220-48e1-ab63-3879cbfe9252">
+<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="operationReservationInvoice2.jrxml" language="groovy" pageWidth="764" pageHeight="798" columnWidth="764" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2dca2480-f220-48e1-ab63-3879cbfe9252">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -16,7 +16,7 @@
 	<title>
 		<band height="38" splitType="Stretch">
 			<textField>
-				<reportElement uuid="c4532d9d-d29a-4ca0-bf40-e0249a82ebfe" x="0" y="0" width="884" height="38"/>
+				<reportElement uuid="c4532d9d-d29a-4ca0-bf40-e0249a82ebfe" x="0" y="0" width="764" height="38"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -55,7 +55,7 @@
 				<text><![CDATA[区号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="df18e65b-fb99-4aa9-8aa0-1d021aad9875" x="374" y="0" width="140" height="38"/>
+				<reportElement uuid="df18e65b-fb99-4aa9-8aa0-1d021aad9875" x="254" y="0" width="140" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -69,7 +69,7 @@
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="564" y="0" width="80" height="38"/>
+				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="444" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -83,7 +83,7 @@
 				<text><![CDATA[所需数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="094b5757-101f-4d67-8339-20abd214b9b4" x="254" y="0" width="120" height="38"/>
+				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="684" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -94,24 +94,10 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[手术间]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="804" y="0" width="80" height="38"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
 				<text><![CDATA[去污区数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="724" y="0" width="80" height="38"/>
+				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="604" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -125,7 +111,7 @@
 				<text><![CDATA[包装区数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="644" y="0" width="80" height="38"/>
+				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="524" y="0" width="80" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -139,7 +125,7 @@
 				<text><![CDATA[发货区数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="514" y="0" width="50" height="38"/>
+				<reportElement uuid="c452d207-6094-4ce6-a337-be79b71a49e3" x="394" y="0" width="50" height="38"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -172,7 +158,7 @@
 				<textFieldExpression><![CDATA[$F{operationTimeGroup}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="3c75bbd4-b449-4e58-815e-f05b93b6fe20" x="114" y="0" width="770" height="38"/>
+				<reportElement uuid="3c75bbd4-b449-4e58-815e-f05b93b6fe20" x="114" y="0" width="650" height="38"/>
 				<subreportParameter name="SUBREPORT_DIR">
 					<subreportParameterExpression><![CDATA[$P{SUBREPORT_DIR}]]></subreportParameterExpression>
 				</subreportParameter>