Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
===================================================================
diff -u -r30945 -r30980
--- ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30945)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30980)
@@ -271,6 +271,9 @@
 				<measure name="maxAmount" class="java.lang.Integer" calculation="Highest">
 					<measureExpression><![CDATA[$F{amount}]]></measureExpression>
 				</measure>
+				<measure name="columnTitleMeasure" class="java.lang.String" calculation="First">
+					<measureExpression><![CDATA[$F{columnTitle}]]></measureExpression>
+				</measure>
 				<crosstabCell width="100" height="25">
 					<cellContents>
 						<box>
@@ -281,8 +284,7 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}
-]]></textFieldExpression>
+							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
 							<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
@@ -326,8 +328,8 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{amountMeasure}!=0)?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{amountMeasure}!=0)?"###0":$P{amountFormatParam}]]></patternExpression>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>
@@ -341,8 +343,8 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{amountMeasure}!=0)?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{amountMeasure}!=0)?"###0":$P{amountFormatParam}]]></patternExpression>
+							<textFieldExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
+							<patternExpression><![CDATA[($V{columnTitleMeasure}.contains("数量") || $V{columnTitleMeasure}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
 						</textField>
 					</cellContents>
 				</crosstabCell>