Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jasper
===================================================================
diff -u -r30557 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jasper
===================================================================
diff -u -r30552 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jasper
===================================================================
diff -u -r30112 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
===================================================================
diff -u -r30112 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml	(.../monthReportGroupByDisposableGoodsType.jrxml)	(revision 30112)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml	(.../monthReportGroupByDisposableGoodsType.jrxml)	(revision 30945)
@@ -219,8 +219,8 @@
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jasper
===================================================================
diff -u -r30928 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r30854 -r30945
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 30854)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 30945)
@@ -262,7 +262,6 @@
 		}else if("accountingMonthlyReportGroupByDisposableGoodsType" == patternOfReport){//按一次性物品类型拆分的核算月报
 			jasperreportName = "monthReportGroupByDisposableGoodsType.jasper";
 			patternOfReport = "showAmountMode";
-			jasperreportName = "monthReport.jasper";
 		}else if('accountingMonthlyReportGroupBySterilizationMode' == patternOfReport){
 			jasperreportName = 'monthReportGroupBySterilizationMode.jasper';
 		}else if(sstsConfig.enableToussePointsStatistics){
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jasper
===================================================================
diff -u -r30112 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml
===================================================================
diff -u -r30552 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30552)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportHideApplicationDepart.jrxml	(.../monthReportHideApplicationDepart.jrxml)	(revision 30945)
@@ -281,8 +281,9 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
@@ -296,8 +297,8 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml
===================================================================
diff -u -r30557 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml	(.../monthReportShowApplicationDepart.jrxml)	(revision 30557)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportShowApplicationDepart.jrxml	(.../monthReportShowApplicationDepart.jrxml)	(revision 30945)
@@ -316,8 +316,9 @@
 								<font size="12"/>
 								<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
@@ -331,8 +332,8 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jasper
===================================================================
diff -u -r30112 -r30945
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml
===================================================================
diff -u -r30112 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml	(.../monthReport.jrxml)	(revision 30112)
+++ ssts-web/src/main/webapp/jasperRtp/monthReport.jrxml	(.../monthReport.jrxml)	(revision 30945)
@@ -234,8 +234,8 @@
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
@@ -249,8 +249,8 @@
 							<textElement verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml
===================================================================
diff -u -r30112 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml	(.../monthReportGroupBySterilizationMode.jrxml)	(revision 30112)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupBySterilizationMode.jrxml	(.../monthReportGroupBySterilizationMode.jrxml)	(revision 30945)
@@ -234,8 +234,9 @@
 							<textElement verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
@@ -249,8 +250,8 @@
 							<textElement verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml
===================================================================
diff -u -r30112 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 30112)
+++ ssts-web/src/main/webapp/jasperRtp/monthIntegralReport.jrxml	(.../monthIntegralReport.jrxml)	(revision 30945)
@@ -288,8 +288,9 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
@@ -303,8 +304,8 @@
 							<textElement textAlignment="Right" verticalAlignment="Middle">
 								<font size="12" isBold="true"/>
 							</textElement>
-							<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-							<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+							<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>
 				</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml
===================================================================
diff -u -r30928 -r30945
--- ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 30928)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportBranche.jrxml	(.../monthReportBranche.jrxml)	(revision 30945)
@@ -288,8 +288,8 @@
 								<textElement textAlignment="Right" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}:$V{moneyMeasure}]]></textFieldExpression>
-								<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+								<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>
 					</crosstabCell>
@@ -310,8 +310,8 @@
 								<textElement textAlignment="Right" verticalAlignment="Middle">
 									<font size="12" isBold="true"/>
 								</textElement>
-								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
-								<patternExpression><![CDATA[($V{columnTitle}.contains("数量"))?"###0":$P{amountFormatParam}]]></patternExpression>
+								<textFieldExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?$V{amountMeasure}/2:$V{moneyMeasure}/2]]></textFieldExpression>
+								<patternExpression><![CDATA[($V{columnTitle}.contains("数量") || $V{columnTitle}.contains("包内材料统计"))?"###0":$P{amountFormatParam}]]></patternExpression>
 							</textField>
 						</cellContents>
 					</crosstabCell>
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
===================================================================
diff -u -r30112 -r30945
Binary files differ