Index: ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml
===================================================================
diff -u -r34805 -r35556
--- ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml	(.../cssdWorkloadReportForTangshanWorkersRepart.jrxml)	(revision 34805)
+++ ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jrxml	(.../cssdWorkloadReportForTangshanWorkersRepart.jrxml)	(revision 35556)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Jaspersoft Studio version 6.17.0.final using JasperReports Library version 6.17.0-6d93193241dd8cc42629e188b94f9e0bc5722efd  -->
 <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="materialDamageTotalView" language="groovy" pageWidth="730" pageHeight="700" columnWidth="730" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="6fcdca3f-d580-480b-819d-22d220ad74ca">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -73,14 +74,14 @@
 	<title>
 		<band height="60" splitType="Stretch">
 			<textField>
-				<reportElement uuid="68318225-d69f-4902-afb9-b1fd1dda68c9" x="0" y="0" width="730" height="30"/>
+				<reportElement x="0" y="0" width="730" height="30" uuid="68318225-d69f-4902-afb9-b1fd1dda68c9"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="68318225-d69f-4902-afb9-b1fd1dda68c9" x="0" y="30" width="730" height="30"/>
+				<reportElement x="0" y="30" width="730" height="30" uuid="68318225-d69f-4902-afb9-b1fd1dda68c9"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
@@ -91,7 +92,7 @@
 	<columnHeader>
 		<band height="35" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="0" y="0" width="60" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="0" y="0" width="60" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -105,7 +106,7 @@
 				<text><![CDATA[序号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="60" y="0" width="190" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="60" y="0" width="190" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -119,7 +120,7 @@
 				<text><![CDATA[被服务科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="650" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="650" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -133,7 +134,7 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="250" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="250" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -147,7 +148,7 @@
 				<text><![CDATA[特大包]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="330" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="330" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -161,7 +162,7 @@
 				<text><![CDATA[大包]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="410" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="410" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -175,7 +176,7 @@
 				<text><![CDATA[中包]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="490" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="490" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -189,7 +190,7 @@
 				<text><![CDATA[小包]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="28562fbe-92f9-4929-a49b-b1edd4394357" style="table_TH" x="570" y="0" width="80" height="35" backcolor="#BFE1FF"/>
+				<reportElement style="table_TH" x="570" y="0" width="80" height="35" backcolor="#BFE1FF" uuid="28562fbe-92f9-4929-a49b-b1edd4394357"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -207,7 +208,7 @@
 	<detail>
 		<band height="30" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="0" y="0" width="60" height="30"/>
+				<reportElement x="0" y="0" width="60" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -221,7 +222,7 @@
 				<textFieldExpression><![CDATA[$V{COLUMN_COUNT}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="60" y="0" width="190" height="30"/>
+				<reportElement x="60" y="0" width="190" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -235,7 +236,9 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="650" y="0" width="80" height="30"/>
+				<reportElement x="650" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -245,11 +248,14 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{hugeAmount}*8+$F{bigAmount}*7+$F{centerAmount}*3+$F{smallAmount}+$F{washAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="250" y="0" width="80" height="30"/>
+				<reportElement x="250" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -259,11 +265,14 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{hugeAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="330" y="0" width="80" height="30"/>
+				<reportElement x="330" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -273,12 +282,14 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle" markup="html">
 					<font size="12"/>
-					<paragraph rightIndent="5"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{bigAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="410" y="0" width="80" height="30"/>
+				<reportElement x="410" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -288,11 +299,14 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle" markup="html">
 					<font size="12"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{centerAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="490" y="0" width="80" height="30"/>
+				<reportElement x="490" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -302,11 +316,14 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{smallAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" x="570" y="0" width="80" height="30"/>
+				<reportElement x="570" y="0" width="80" height="30" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc">
+					<property name="com.jaspersoft.studio.unit.rightIndent" value="px"/>
+				</reportElement>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -316,6 +333,7 @@
 				</box>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
+					<paragraph rightIndent="8"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{washAmount}]]></textFieldExpression>
 			</textField>
@@ -324,7 +342,7 @@
 	<summary>
 		<band height="30">
 			<staticText>
-				<reportElement uuid="df36a661-6b2a-4627-976e-4a0796af3c6d" style="table_CH" x="60" y="0" width="190" height="30"/>
+				<reportElement style="table_CH" x="60" y="0" width="190" height="30" uuid="df36a661-6b2a-4627-976e-4a0796af3c6d"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -338,7 +356,7 @@
 				<text><![CDATA[总计]]></text>
 			</staticText>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d1ef5016-4aaf-464f-be6f-57068004ec10" style="table_CH" x="650" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="650" y="0" width="80" height="30" uuid="d1ef5016-4aaf-464f-be6f-57068004ec10"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -352,42 +370,42 @@
 				<textFieldExpression><![CDATA[$V{totalHugeAmount}*8+$V{totalBigAmount}*7+$V{totalCenterAmount}*3+$V{totalSmallAmount}+$V{totalWashAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a" style="table_CH" x="250" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="250" y="0" width="80" height="30" uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalHugeAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a" style="table_CH" x="330" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="330" y="0" width="80" height="30" uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalBigAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a" style="table_CH" x="410" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="410" y="0" width="80" height="30" uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalCenterAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a" style="table_CH" x="490" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="490" y="0" width="80" height="30" uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalSmallAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a" style="table_CH" x="570" y="0" width="80" height="30"/>
+				<reportElement style="table_CH" x="570" y="0" width="80" height="30" uuid="9008e0b9-8f73-4ad7-8b51-a3946cc91c2a"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalWashAmount}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc" mode="Opaque" x="0" y="0" width="60" height="30" backcolor="#BFE1FF"/>
+				<reportElement mode="Opaque" x="0" y="0" width="60" height="30" backcolor="#BFE1FF" uuid="e5a1dc92-8925-4fbb-a032-77dd862bc0cc"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r35521 -r35556
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35521)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 35556)
@@ -388,21 +388,6 @@
 			}
 			int frameWidth = 0;
 			int size = jRPrintElements.size();
-			if("cssdWorkloadReportForTangshanWorkersHospital".equals(reportName)){
-				for (int i = 0; i < size; i++) {
-					JRPrintElement jr = jRPrintElements.get(i);
-					if(jr instanceof JRTemplatePrintText){
-						JRTemplatePrintText kItemText = (JRTemplatePrintText)jr;
-						if(StringUtils.isNotBlank(kItemText.getFullText()) && StringTools.isNumber(kItemText.getFullText())){
-							if("cssdWorkloadReportForTangshanWorkersHospital".equals(reportName) && kItemText.getWidth() == 60){
-								continue;
-							}
-							kItemText.getLineBox().setRightPadding(8);
-						}
-						continue;
-					}
-				}
-			}
 			if(size > 10){//size > 10 极大概率是固定列的报表,自动列报表远远小于10,固定列的报表不需要使用本方法矫正宽度
 				return;
 			}
@@ -464,7 +449,7 @@
 	 * @return
 	 */
 	private boolean canCalcframeWidth(String reportName){
-		String canCalcStr = "cssdWorkloadReportForTangshanWorkersHospital,sterilizationAreaWorkLoad,supplyRoomQualityQuota,departSatisfyDetailReport,operatingRoomInstrumentSetUsageAndApportionmentExpenseReport,formInstanceReport,QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport";
+		String canCalcStr = "sterilizationAreaWorkLoad,supplyRoomQualityQuota,departSatisfyDetailReport,operatingRoomInstrumentSetUsageAndApportionmentExpenseReport,formInstanceReport,QualityMonitoring,sterilizingStoveUseCount,tousseDeliverStatistics,deviceMaintenance,apparatusInfusionisType,monthReport,yearWorkloadReport2,statisticalWorkload,washWorkloadReprot,materialTypeWorkloadReport,packingUnqualifieReport,sterilizationWorkloadReport";
 		if(canCalcStr.indexOf(reportName) != -1){
 			return true;
 		}
Index: ssts-web/src/main/webapp/jasperRtp/cssdWorkloadReportForTangshanWorkersRepart.jasper
===================================================================
diff -u -r34805 -r35556
Binary files differ