Index: ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml
===================================================================
diff -u -r29439 -r29440
--- ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml	(.../statisticalWorkloadDisposableGood.jrxml)	(revision 29439)
+++ ssts-web/src/main/webapp/jasperRtp/statisticalWorkloadDisposableGood.jrxml	(.../statisticalWorkloadDisposableGood.jrxml)	(revision 29440)
@@ -1,28 +1,56 @@
 <?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="statisticalWorkload" language="groovy" pageWidth="220" pageHeight="1200" columnWidth="220" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="cbf22cc0-e3ae-4485-a118-b438d682d7e3">
-	<property name="ireport.zoom" value="1.0"/>
+<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="workload" language="groovy" pageWidth="309" pageHeight="1200" whenNoDataType="AllSectionsNoDetail" columnWidth="309" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="b6209d28-6c93-40a9-beb3-71a741da002e">
+	<property name="ireport.zoom" value="0.6830134553650713"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
-	<parameter name="title" class="java.lang.String">
-		<defaultValueExpression><![CDATA[title]]></defaultValueExpression>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_TD" mode="Opaque" backcolor="#FFFFFF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="861de894-2f53-4782-9d02-f3eb0de5f316"/>
+	<parameter name="title" class="java.lang.String"/>
+	<parameter name="startTime" class="java.lang.String">
+		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
 	</parameter>
-	<field name="sequence" class="java.lang.Integer">
-		<fieldDescription><![CDATA[sequence]]></fieldDescription>
+	<parameter name="endTime" class="java.lang.String">
+		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
+	</parameter>
+	<parameter name="date1" class="java.lang.String"/>
+	<parameter name="date2" class="java.lang.String"/>
+	<queryString>
+		<![CDATA[]]>
+	</queryString>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
 	</field>
 	<field name="columnName" class="java.lang.String">
 		<fieldDescription><![CDATA[columnName]]></fieldDescription>
 	</field>
-	<field name="amount" class="java.lang.Integer"/>
-	<field name="materialAmount" class="java.lang.Integer">
-		<fieldDescription><![CDATA[materialAmount]]></fieldDescription>
+	<field name="sequence" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sequence]]></fieldDescription>
 	</field>
-	<field name="score" class="java.lang.Integer">
-		<fieldDescription><![CDATA[score]]></fieldDescription>
-	</field>
 	<field name="operator" class="java.lang.String">
 		<fieldDescription><![CDATA[operator]]></fieldDescription>
 	</field>
+	<field name="materialAmount" class="java.lang.Integer"/>
+	<field name="score" class="java.lang.Integer"/>
 	<field name="disposableGoodAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[disposableGoodAmount]]></fieldDescription>
 	</field>
@@ -32,160 +60,128 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="8a494fab-981d-4237-9e12-32835b7fa569" x="0" y="0" width="220" height="30"/>
+				<reportElement uuid="4f96bdd9-75d8-4bb7-b3c7-eed54a1c886a" x="0" y="0" width="2200" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
+					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 		</band>
 	</title>
 	<summary>
 		<band height="30" splitType="Stretch">
-			<crosstab ignoreWidth="false">
-				<reportElement uuid="bbefa993-f197-47ce-bf52-186e824d3ebc" positionType="Float" isPrintRepeatedValues="false" x="0" y="0" width="3000" height="30" isRemoveLineWhenBlank="true"/>
-				<crosstabParameter name="title2">
-					<parameterValueExpression><![CDATA[$P{title}]]></parameterValueExpression>
-				</crosstabParameter>
+			<crosstab>
+				<reportElement uuid="648fe906-6aed-4eff-8977-38ddace66c2c" x="0" y="0" width="2200" height="30" backcolor="#CCFFCC"/>
 				<crosstabHeaderCell>
 					<cellContents>
 						<staticText>
-							<reportElement uuid="9aa33780-d8b1-4388-aa2d-ca55c29979f1" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="55" forecolor="#000000" backcolor="#FFFFFF"/>
+							<reportElement uuid="dd714099-88ea-4b06-a98f-a50bc4a332b8" style="table_TH" x="0" y="0" width="70" height="55" backcolor="#FFFFFF"/>
 							<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" rotation="None" markup="none">
-								<font fontName="SansSerif" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
+							<textElement textAlignment="Center" verticalAlignment="Middle">
+								<font size="14" isBold="true"/>
 							</textElement>
 							<text><![CDATA[姓名]]></text>
 						</staticText>
-						<staticText>
-							<reportElement uuid="9aa33780-d8b1-4388-aa2d-ca55c29979f1" positionType="Float" mode="Transparent" x="70" y="0" width="95" height="55" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-							<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" rotation="None" markup="none">
-								<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-								<paragraph lineSpacing="Single"/>
-							</textElement>
-							<text><![CDATA[一次性物品发货数量]]></text>
-						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="operator" width="165" totalPosition="End">
+				<rowGroup name="operator" width="70" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{operator}]]></bucketExpression>
 					</bucket>
 					<crosstabRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Opaque">
-							<textField pattern="###0" isBlankWhenNull="false">
-								<reportElement uuid="18aa4f8a-a19b-4555-8dfe-88e045561c72" style="Crosstab Data Text" positionType="Float" mode="Transparent" x="70" y="0" width="95" height="30" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
-									<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-									<paragraph lineSpacing="Single"/>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement uuid="1b98ec54-1096-461c-85a0-dd2f24dbfd6d" style="table_TD" mode="Opaque" x="0" y="0" width="70" height="30"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="14"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
-							</textField>
-							<textField pattern="" isBlankWhenNull="false">
-								<reportElement uuid="18aa4f8a-a19b-4555-8dfe-88e045561c72" style="Crosstab Data Text" mode="Transparent" x="0" y="0" width="70" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
-								<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" rotation="None" markup="none">
-									<font fontName="SansSerif" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-									<paragraph lineSpacing="Single"/>
-								</textElement>
 								<textFieldExpression><![CDATA[$V{operator}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
 					<crosstabTotalRowHeader>
-						<cellContents backcolor="#FFFFFF" mode="Opaque">
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
 							<staticText>
-								<reportElement uuid="c3247cff-8f4a-40e4-bbd2-01972f0018bd" x="0" y="0" width="70" height="30"/>
+								<reportElement uuid="518aa8fe-9fd3-4237-9852-10c18bc8e31a" x="0" y="0" width="70" height="30"/>
 								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
+									<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 isBold="true"/>
+									<font size="14" isBold="true"/>
 								</textElement>
 								<text><![CDATA[合计]]></text>
 							</staticText>
-							<textField pattern="###0" isBlankWhenNull="false">
-								<reportElement uuid="5afb0286-d36e-4016-b666-62a1bc087adb" style="Crosstab Data Text" positionType="Float" x="70" y="0" width="95" height="30" isRemoveLineWhenBlank="true" isPrintInFirstWholeBand="true" isPrintWhenDetailOverflows="true"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="14" isBold="true"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
-							</textField>
 						</cellContents>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<columnGroup name="sequence" height="0">
+				<columnGroup name="sequence" height="0" totalPosition="End">
 					<bucket class="java.lang.Integer">
 						<bucketExpression><![CDATA[$F{sequence}]]></bucketExpression>
 					</bucket>
 					<crosstabColumnHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque"/>
+						<cellContents backcolor="#F0F8FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#005FB3" mode="Transparent">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<staticText>
+								<reportElement uuid="c23bc7e2-1f6c-465d-b1c5-e816b5a2167c" style="table_CH" x="0" y="0" width="95" height="55" forecolor="#000000" backcolor="#FFFFFF"/>
+								<textElement textAlignment="Center" verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
+									<paragraph lineSpacing="1_1_2"/>
+								</textElement>
+								<text><![CDATA[一次性物品发货数量]]></text>
+							</staticText>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
-				<columnGroup name="columnName" height="55">
+				<columnGroup name="columnName" height="55" totalPosition="End">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{columnName}]]></bucketExpression>
 					</bucket>
 					<crosstabColumnHeader>
 						<cellContents backcolor="#FFFFFF" mode="Opaque">
-							<textField pattern="" isBlankWhenNull="false">
-								<reportElement uuid="d01d2df8-4930-4455-b890-b9960056d2a5" style="Crosstab Data Text" positionType="Float" mode="Transparent" x="0" y="0" width="150" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+							<textField>
+								<reportElement uuid="6eab765c-c933-44aa-8d42-7a1e876bca4e" style="Crosstab Data Text" x="0" y="0" width="150" height="30"/>
 								<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" rotation="None" markup="none">
-									<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-									<paragraph lineSpacing="Single"/>
+								<textElement verticalAlignment="Middle">
+									<font size="14" isBold="true"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{columnName}]]></textFieldExpression>
 							</textField>
 							<staticText>
-								<reportElement uuid="953e5c2e-da0c-4657-9059-0673ebe92e42" style="Crosstab Data Text" positionType="Float" x="0" y="30" width="75" height="25"/>
+								<reportElement uuid="a33a36e9-3ed0-4a12-b2ba-5cae843bb127" style="Crosstab Data Text" x="0" y="30" width="75" height="25"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -196,10 +192,10 @@
 								<textElement verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
-								<text><![CDATA[包数]]></text>
+								<text><![CDATA[器械包数]]></text>
 							</staticText>
 							<staticText>
-								<reportElement uuid="8c0a00c9-b16f-41d1-bf23-255c4d4028f5" style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC"/>
+								<reportElement uuid="db370b31-880c-44a3-a8e1-ba9570c3262f" style="Crosstab Data Text" mode="Opaque" x="75" y="30" width="75" height="25" backcolor="#CCFFCC"/>
 								<box>
 									<pen lineWidth="1.0"/>
 									<topPen lineWidth="1.0"/>
@@ -210,12 +206,16 @@
 								<textElement verticalAlignment="Middle">
 									<font size="14" isBold="true"/>
 								</textElement>
-								<text><![CDATA[件数]]></text>
+								<text><![CDATA[器械件数]]></text>
 							</staticText>
 						</cellContents>
 					</crosstabColumnHeader>
 					<crosstabTotalColumnHeader>
-						<cellContents/>
+						<cellContents backcolor="#BFE1FF" mode="Opaque">
+							<box>
+								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+							</box>
+						</cellContents>
 					</crosstabTotalColumnHeader>
 				</columnGroup>
 				<measure name="amountMeasure" class="java.lang.Integer" calculation="Sum">
@@ -224,51 +224,34 @@
 				<measure name="materialAmountMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{materialAmount}]]></measureExpression>
 				</measure>
+				<measure name="scoreMeasure" class="java.lang.Integer" calculation="Sum">
+					<measureExpression><![CDATA[$F{score}]]></measureExpression>
+				</measure>
 				<measure name="disposableGoodAmountMeasure" class="java.lang.Integer" calculation="Sum">
 					<measureExpression><![CDATA[$F{disposableGoodAmount}]]></measureExpression>
 				</measure>
-				<measure name="measure1" class="java.lang.Integer" calculation="Sum">
-					<measureExpression><![CDATA[$F{disposableGoodAmount}]]></measureExpression>
-				</measure>
 				<crosstabCell width="150" height="30">
 					<cellContents>
-						<textField>
-							<reportElement uuid="04ec2f5b-0dfc-4109-8616-6c09675dfa8c" style="Crosstab Data Text" positionType="Float" x="0" y="0" width="75" height="30"/>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField pattern="" isBlankWhenNull="false">
+							<reportElement uuid="1de502ee-792a-4517-ae65-33bb35ce3412" style="table_TD" mode="Opaque" x="0" y="0" width="75" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
 								<leftPen lineWidth="1.0"/>
 								<bottomPen lineWidth="1.0"/>
 								<rightPen lineWidth="1.0"/>
 							</box>
-							<textElement textAlignment="Right" verticalAlignment="Middle">
-								<font size="14"/>
-								<paragraph lineSpacing="Double"/>
+							<textElement textAlignment="Right" verticalAlignment="Middle" rotation="None" markup="none">
+								<font fontName="SansSerif" size="14" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+								<paragraph lineSpacing="Single"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
-						<elementGroup>
-							<textField>
-								<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
-								<box>
-									<pen lineWidth="1.0"/>
-									<topPen lineWidth="1.0"/>
-									<leftPen lineWidth="1.0"/>
-									<bottomPen lineWidth="1.0"/>
-									<rightPen lineWidth="1.0"/>
-								</box>
-								<textElement textAlignment="Right" verticalAlignment="Middle">
-									<font size="14"/>
-								</textElement>
-								<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
-							</textField>
-						</elementGroup>
-					</cellContents>
-				</crosstabCell>
-				<crosstabCell width="150" height="30" rowTotalGroup="operator">
-					<cellContents backcolor="#FFFFFF" mode="Opaque">
 						<textField>
-							<reportElement uuid="2721048b-46bc-4214-929a-12b1bfc4255d" style="Crosstab Data Text" positionType="Float" x="0" y="0" width="75" height="30"/>
+							<reportElement uuid="7d295ce1-db02-45c3-8c3b-de0656a1887a" style="table_TD" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -277,12 +260,26 @@
 								<rightPen lineWidth="1.0"/>
 							</box>
 							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="14"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{materialAmountMeasure}]]></textFieldExpression>
+						</textField>
+					</cellContents>
+				</crosstabCell>
+				<crosstabCell width="150" height="30" rowTotalGroup="operator">
+					<cellContents backcolor="#BFE1FF" mode="Opaque">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
+						<textField>
+							<reportElement uuid="e277e6b2-eb9d-409f-b558-226f59b070e9" style="table_CH" x="0" y="0" width="75" height="30"/>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="14" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
 						</textField>
 						<textField>
-							<reportElement uuid="08f99324-322c-4918-a578-b6dcc1a91123" style="Crosstab Data Text" mode="Opaque" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
+							<reportElement uuid="4d5762e5-7d05-4067-a81e-93e4012380dd" style="table_CH" x="75" y="0" width="75" height="30" backcolor="#CCFFCC"/>
 							<box>
 								<pen lineWidth="1.0"/>
 								<topPen lineWidth="1.0"/>
@@ -297,40 +294,55 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="sequence">
-					<cellContents backcolor="#005FB3" mode="Opaque">
+				<crosstabCell width="95" height="30" columnTotalGroup="sequence">
+					<cellContents backcolor="#005FB3" mode="Transparent">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
 						<textField>
-							<reportElement uuid="b1fe81ff-ce6e-40c9-a39e-50465ad08fbd" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+							<reportElement uuid="51ee9976-ad1a-4a02-bc10-1a0b58a09d9f" style="table_CH" x="0" y="0" width="95" height="30" backcolor="#FFFFFF"/>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="14"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="operator" columnTotalGroup="sequence">
-					<cellContents backcolor="#005FB3" mode="Opaque">
+				<crosstabCell width="95" height="30" rowTotalGroup="operator" columnTotalGroup="sequence">
+					<cellContents backcolor="#005FB3" mode="Transparent" style="table_TH">
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
 						<textField>
-							<reportElement uuid="7dda8e68-a3e7-41d7-b367-ae8fc9e80b7f" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
+							<reportElement uuid="fb60eba0-5e25-4489-a8bd-8eeb3e7e7ba7" style="Crosstab Data Text" mode="Opaque" x="0" y="0" width="95" height="30" forecolor="#000000" backcolor="#BFE1FF"/>
+							<box>
+								<pen lineWidth="1.0"/>
+								<topPen lineWidth="1.0"/>
+								<leftPen lineWidth="1.0"/>
+								<bottomPen lineWidth="1.0"/>
+								<rightPen lineWidth="1.0"/>
+							</box>
+							<textElement textAlignment="Right" verticalAlignment="Middle">
+								<font size="14" isBold="true"/>
+								<paragraph rightIndent="8"/>
+							</textElement>
+							<textFieldExpression><![CDATA[$V{disposableGoodAmountMeasure}]]></textFieldExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell width="50" columnTotalGroup="columnName">
+				<crosstabCell width="0" height="30" columnTotalGroup="columnName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<textField>
-							<reportElement uuid="0454d3f6-00e9-4788-ae4a-09c4ac05e96a" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
-						</textField>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="operator" columnTotalGroup="columnName">
+				<crosstabCell width="0" height="30" rowTotalGroup="operator" columnTotalGroup="columnName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
-						<textField>
-							<reportElement uuid="62e397c1-5e67-4374-9d76-da3db87b2ceb" style="Crosstab Data Text" x="0" y="0" width="50" height="25"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{amountMeasure}]]></textFieldExpression>
-						</textField>
+						<box>
+							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
+						</box>
 					</cellContents>
 				</crosstabCell>
 			</crosstab>