Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jasper
===================================================================
diff -u -r12331 -r14514
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r14471 -r14514
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14471)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14514)
@@ -77,7 +77,6 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyInfo;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SatisfyItem;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordEnteringBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordItemBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
@@ -1967,8 +1966,6 @@
 											&& answerItem.length() > 0) {
 										if (answerItem.equals(option)) {
 											MonitoringItemBean bean = new MonitoringItemBean();
-											bean.setId(qualityMonitoring
-													.getId());
 											bean.setAmount(qualityMonitoring
 													.getAmount());
 											bean.setDateTime(dateStr);
@@ -1978,7 +1975,7 @@
 												goodsName = qualityMonitoring
 														.getMaterial();
 											}
-											bean.setGoodsName(goodsName);
+											bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId());
 											bean.setOrderNumber(qualityMonitoringItem
 													.getOrderNumber());
 											bean.setOption(option);// 表头第三列
@@ -1997,15 +1994,14 @@
 						for (String option : optionArray) {
 							if (map.get(option) == null) {
 								MonitoringItemBean bean = new MonitoringItemBean();
-								bean.setId(qualityMonitoring.getId());
 								bean.setAmount(qualityMonitoring.getAmount());
 								bean.setDateTime(dateStr);
 								String goodsName = qualityMonitoring
 										.getTousseName();
 								if (StringUtils.isBlank(goodsName)) {
 									goodsName = qualityMonitoring.getMaterial();
 								}
-								bean.setGoodsName(goodsName);
+								bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId());
 								bean.setOrderNumber(qualityMonitoringItem
 										.getOrderNumber());
 								bean.setOption(option);// 表头第三列
@@ -2022,15 +2018,14 @@
 							// 参数项
 							if (answer != null && answer.length() > 0) {
 								MonitoringItemBean bean = new MonitoringItemBean();
-								bean.setId(qualityMonitoring.getId());
 								bean.setAmount(qualityMonitoring.getAmount());
 								bean.setDateTime(dateStr);
 								String goodsName = qualityMonitoring
 										.getTousseName();
 								if (StringUtils.isBlank(goodsName)) {
 									goodsName = qualityMonitoring.getMaterial();
 								}
-								bean.setGoodsName(goodsName);
+								bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId());
 								bean.setOrderNumber(qualityMonitoringItem
 										.getOrderNumber());
 								bean.setOption(qualityMonitoringAnswer
@@ -2045,13 +2040,12 @@
 				//
 				if ("定期监测".equals(monitoringType)) {
 					MonitoringItemBean bean = new MonitoringItemBean();
-					bean.setId(qualityMonitoring.getId());
 					bean.setDateTime(dateStr);
 					String goodsName = qualityMonitoring.getTousseName();
 					if (StringUtils.isBlank(goodsName)) {
 						goodsName = qualityMonitoring.getMaterial();
 					}
-					bean.setGoodsName(goodsName);
+					bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId());
 					bean.setAmount(qualityMonitoring.getAmount());
 					bean.setOrderNumber(100);
 					bean.setOption("监测结果");// 表头第三列
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
===================================================================
diff -u -r14192 -r14514
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 14192)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 14514)
@@ -1,7 +1,7 @@
 <?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="QualityMonitoringReport" language="groovy" pageWidth="1100" pageHeight="842" columnWidth="1100" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="7a1b4557-a774-4276-982f-6340b58433e3">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="79"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
 	<style name="table">
@@ -130,7 +130,7 @@
 							</box>
 							<textField isStretchWithOverflow="true">
 								<reportElement uuid="c74af6f6-5059-4a0b-8386-8a8891ec5f4c" style="table_TD" stretchType="RelativeToBandHeight" x="0" y="0" width="91" height="25" isPrintWhenDetailOverflows="true"/>
-								<textElement verticalAlignment="Middle">
+								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
 								<textFieldExpression><![CDATA[$V{dateTime}]]></textFieldExpression>
@@ -141,33 +141,18 @@
 						<cellContents/>
 					</crosstabTotalRowHeader>
 				</rowGroup>
-				<rowGroup name="id" width="0">
-					<bucket class="java.lang.Long">
-						<bucketExpression><![CDATA[$F{id}]]></bucketExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Transparent">
-							<box>
-								<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-							</box>
-						</cellContents>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents/>
-					</crosstabTotalRowHeader>
-				</rowGroup>
 				<rowGroup name="tousseName" width="177">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{goodsName}]]></bucketExpression>
 					</bucket>
 					<crosstabRowHeader>
 						<cellContents>
-							<textField>
+							<textField pattern="">
 								<reportElement uuid="4e9dd109-2026-415f-bd8d-c5d6a949c819" style="table_TD" x="0" y="0" width="177" height="25"/>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{tousseName}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{tousseName}.substring(0,($V{tousseName}.lastIndexOf("%&")>0?$V{tousseName}.lastIndexOf("%&"):0))]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
@@ -269,18 +254,6 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell height="25" rowTotalGroup="id">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="e84b03c0-78c6-4a05-b6c5-7c1a5609d190" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell width="50" columnTotalGroup="orderNumber">
 					<cellContents backcolor="#005FB3" mode="Opaque">
 						<box>
@@ -293,18 +266,6 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="orderNumber">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="67b36e7d-829d-4f1f-81d9-8ddac89b06fa" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell width="50" columnTotalGroup="questionName">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
@@ -317,18 +278,6 @@
 						</textField>
 					</cellContents>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="questionName">
-					<cellContents backcolor="#005FB3" mode="Opaque">
-						<box>
-							<pen lineWidth="0.5" lineStyle="Solid" lineColor="#000000"/>
-						</box>
-						<textField>
-							<reportElement uuid="30558852-edf7-4f3f-8355-3777f36b79c7" style="Crosstab Data Text" x="0" y="0" width="50" height="25" forecolor="#FFFFFF"/>
-							<textElement/>
-							<textFieldExpression><![CDATA[$V{answerMeasure}]]></textFieldExpression>
-						</textField>
-					</cellContents>
-				</crosstabCell>
 				<crosstabCell height="25" rowTotalGroup="dateTime">
 					<cellContents backcolor="#BFE1FF" mode="Opaque">
 						<box>
@@ -386,9 +335,6 @@
 				<crosstabCell columnTotalGroup="option">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
 				<crosstabCell rowTotalGroup="dateTime" columnTotalGroup="option">
 					<cellContents/>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r14192 -r14514
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml
===================================================================
diff -u -r12331 -r14514
--- ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/routineMonitoringReport.jrxml	(.../routineMonitoringReport.jrxml)	(revision 14514)
@@ -102,17 +102,6 @@
 						</staticText>
 					</cellContents>
 				</crosstabHeaderCell>
-				<rowGroup name="id" width="0" headerPosition="Stretch">
-					<bucket class="java.lang.Integer">
-						<bucketExpression><![CDATA[$F{id}]]></bucketExpression>
-					</bucket>
-					<crosstabRowHeader>
-						<cellContents backcolor="#F0F8FF" mode="Opaque"/>
-					</crosstabRowHeader>
-					<crosstabTotalRowHeader>
-						<cellContents/>
-					</crosstabTotalRowHeader>
-				</rowGroup>
 				<rowGroup name="dateTime" width="66">
 					<bucket class="java.lang.String">
 						<bucketExpression><![CDATA[$F{dateTime}]]></bucketExpression>
@@ -146,7 +135,7 @@
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{goodsName}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{goodsName}.substring(0,($V{goodsName}.lastIndexOf("%&")>0?$V{goodsName}.lastIndexOf("%&"):0))]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
@@ -312,18 +301,6 @@
 				<crosstabCell rowTotalGroup="dateTime" columnTotalGroup="option">
 					<cellContents/>
 				</crosstabCell>
-				<crosstabCell rowTotalGroup="id">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="orderNumber">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="questionName">
-					<cellContents/>
-				</crosstabCell>
-				<crosstabCell rowTotalGroup="id" columnTotalGroup="option">
-					<cellContents/>
-				</crosstabCell>
 				<crosstabCell rowTotalGroup="goodsName">
 					<cellContents/>
 				</crosstabCell>