Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml
===================================================================
diff -u -r14745 -r14753
--- ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 14745)
+++ ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jrxml	(.../QualityMonitoringReport.jrxml)	(revision 14753)
@@ -174,7 +174,7 @@
 								<textElement textAlignment="Center" verticalAlignment="Middle">
 									<font size="12"/>
 								</textElement>
-								<textFieldExpression><![CDATA[$V{amount} == null ? "0" : $V{amount}]]></textFieldExpression>
+								<textFieldExpression><![CDATA[$V{amount} == null ? 0 : $V{amount}]]></textFieldExpression>
 							</textField>
 						</cellContents>
 					</crosstabRowHeader>
Index: ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jasper
===================================================================
diff -u -r12640 -r14753
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jasper
===================================================================
diff -u -r13853 -r14753
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml
===================================================================
diff -u -r13853 -r14753
--- ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml	(.../materialMissItemView.jrxml)	(revision 13853)
+++ ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml	(.../materialMissItemView.jrxml)	(revision 14753)
@@ -1,6 +1,6 @@
 <?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="materialMissItemView" language="groovy" pageWidth="700" pageHeight="700" columnWidth="700" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f5587650-40ba-4841-b2b7-eea8ec77ae7a">
-	<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="materialMissItemView" language="groovy" pageWidth="870" pageHeight="660" columnWidth="870" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f5587650-40ba-4841-b2b7-eea8ec77ae7a">
+	<property name="ireport.zoom" value="0.9090909090909095"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
@@ -29,7 +29,20 @@
 		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[select r.materialname,r.amount,r.depart,r.materialcost,r.misstime,r.tousseName from recyclingerror r where 1=1 AND  r.tousseitem_id is not null and materialName != '器械包标识牌' and errortype='缺失' $P!{querySql}]]>
+		<![CDATA[SELECT
+	r.materialname,
+	r.amount,
+	r.depart,
+case when r.materialcost is null then 0 else r.materialcost end materialcost,
+	r.misstime,
+	r.tousseName
+FROM
+	recyclingerror r
+WHERE
+	1 = 1
+AND r.tousseitem_id IS NOT NULL
+AND materialName != '器械包标识牌'
+AND errortype = '缺失' $P!{querySql}]]>
 	</queryString>
 	<field name="materialname" class="java.lang.String"/>
 	<field name="amount" class="java.lang.Integer"/>
@@ -43,9 +56,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="54abbe41-45b8-4ff9-9a75-4e28526c8418" x="0" y="0" width="700" height="30"/>
+				<reportElement uuid="54abbe41-45b8-4ff9-9a75-4e28526c8418" x="0" y="0" width="870" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="Serif" size="16" isBold="true"/>
 				</textElement>
@@ -54,9 +67,9 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="30">
+		<band height="33">
 			<staticText>
-				<reportElement uuid="9dd4c752-bcf3-4d06-b8c6-0e13b90707ce" style="table_TH" x="0" y="0" width="147" height="30"/>
+				<reportElement uuid="9dd4c752-bcf3-4d06-b8c6-0e13b90707ce" style="table_TH" x="0" y="0" width="200" height="33"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -70,7 +83,7 @@
 				<text><![CDATA[材料名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="9dd4c752-bcf3-4d06-b8c6-0e13b90707ce" style="table_TH" x="298" y="0" width="74" height="30"/>
+				<reportElement uuid="9dd4c752-bcf3-4d06-b8c6-0e13b90707ce" style="table_TH" x="720" y="0" width="70" height="33"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -84,28 +97,28 @@
 				<text><![CDATA[丢失数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="563337cb-4f03-4a0e-9d59-0a7ae545fd18" style="table_TH" x="372" y="0" width="121" height="30"/>
+				<reportElement uuid="563337cb-4f03-4a0e-9d59-0a7ae545fd18" style="table_TH" x="400" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[丢失时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e72c089f-2ebb-4465-ab13-51fe9d46d5b7" style="table_TH" x="493" y="0" width="124" height="30"/>
+				<reportElement uuid="e72c089f-2ebb-4465-ab13-51fe9d46d5b7" style="table_TH" x="520" y="0" width="200" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="1e60b3d2-9fe2-4921-9910-bbc4786a9c7c" style="table_TH" x="617" y="0" width="83" height="30"/>
+				<reportElement uuid="1e60b3d2-9fe2-4921-9910-bbc4786a9c7c" style="table_TH" x="790" y="0" width="80" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料价格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="dadac499-264c-4db4-a5f0-b0b28a9f655b" style="table_TH" mode="Opaque" x="147" y="0" width="151" height="30"/>
+				<reportElement uuid="dadac499-264c-4db4-a5f0-b0b28a9f655b" style="table_TH" mode="Opaque" x="200" y="0" width="200" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -114,9 +127,9 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="83d48cfb-a8f4-4dcb-b453-6348fb48c71b" mode="Transparent" x="0" y="0" width="147" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="83d48cfb-a8f4-4dcb-b453-6348fb48c71b" mode="Transparent" x="0" y="0" width="200" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25" lineStyle="Solid"/>
 					<topPen lineWidth="0.25" lineStyle="Solid"/>
@@ -131,7 +144,7 @@
 				<textFieldExpression><![CDATA[$F{materialname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="66cfb17f-7e23-441e-9499-15d54ef2bb47" mode="Transparent" x="298" y="0" width="74" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="66cfb17f-7e23-441e-9499-15d54ef2bb47" mode="Transparent" x="720" y="0" width="70" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -146,7 +159,7 @@
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="yyyy-MM-dd HH:mm" isBlankWhenNull="true">
-				<reportElement uuid="260eaa1c-1b4d-464f-ae16-d8152df83efe" mode="Transparent" x="372" y="0" width="121" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="260eaa1c-1b4d-464f-ae16-d8152df83efe" mode="Transparent" x="400" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -161,7 +174,7 @@
 				<textFieldExpression><![CDATA[$F{misstime}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="74b3fe95-8e70-40a1-9360-8d91161f6c6e" mode="Transparent" x="493" y="0" width="124" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="74b3fe95-8e70-40a1-9360-8d91161f6c6e" mode="Transparent" x="520" y="0" width="200" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -175,8 +188,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="4345a7ab-a372-40c6-b50e-bdb54d6b8506" mode="Transparent" x="617" y="0" width="83" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="4345a7ab-a372-40c6-b50e-bdb54d6b8506" mode="Transparent" x="790" y="0" width="80" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -191,7 +204,7 @@
 				<textFieldExpression><![CDATA[$F{materialcost}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="09f27306-c7cd-40bb-9ebb-9e51424a5d4f" style="table_TD" x="147" y="0" width="151" height="30"/>
+				<reportElement uuid="09f27306-c7cd-40bb-9ebb-9e51424a5d4f" style="table_TD" x="200" y="0" width="200" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/QualityMonitoringReport.jasper
===================================================================
diff -u -r14745 -r14753
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml
===================================================================
diff -u -r12640 -r14753
--- ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml	(.../materialMissTotalView.jrxml)	(revision 12640)
+++ ssts-web/src/main/webapp/jasperRtp/materialMissTotalView.jrxml	(.../materialMissTotalView.jrxml)	(revision 14753)
@@ -1,6 +1,6 @@
 <?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="materialMissTotalView" language="groovy" pageWidth="600" pageHeight="700" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="46c12114-c565-4e6e-b2e1-aa89446f4681">
-	<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="materialMissTotalView" language="groovy" pageWidth="600" pageHeight="660" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="46c12114-c565-4e6e-b2e1-aa89446f4681">
+	<property name="ireport.zoom" value="1.0000000000000004"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
@@ -32,7 +32,7 @@
 		<![CDATA[SELECT
      sum(r.amount) totalamount,
      r.materialname,
-     r.materialcost AS price
+     case when r.materialcost is null then 0.00 else r.materialcost end  price
 FROM
      recyclingerror r
 WHERE
@@ -60,9 +60,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d5290296-9bf3-494a-8c8b-799903e456b6" mode="Transparent" x="0" y="0" width="600" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d5290296-9bf3-494a-8c8b-799903e456b6" mode="Transparent" x="0" y="0" width="600" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="Serif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -72,30 +72,30 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="97c7b304-9bb2-4578-a28a-aad287c1ca72" style="table_TH" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="97c7b304-9bb2-4578-a28a-aad287c1ca72" style="table_TH" x="0" y="0" width="240" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="17456410-01bf-4864-96b1-605cad66dc6d" style="table_TH" x="240" y="0" width="120" height="30"/>
+				<reportElement uuid="17456410-01bf-4864-96b1-605cad66dc6d" style="table_TH" x="240" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[丢失总数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="69d87b29-e1d7-4858-b719-ee21a492767d" style="table_TH" x="360" y="0" width="120" height="30"/>
+				<reportElement uuid="69d87b29-e1d7-4858-b719-ee21a492767d" style="table_TH" x="360" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[材料价格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="31f7e125-4502-47b3-8034-c0ca32b0b781" style="table_TH" x="480" y="0" width="120" height="30"/>
+				<reportElement uuid="31f7e125-4502-47b3-8034-c0ca32b0b781" style="table_TH" x="480" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -104,9 +104,9 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="30" splitType="Stretch">
+		<band height="33" splitType="Stretch">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="32529793-9d33-4bfa-bbf4-e89be42f3cf3" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="32529793-9d33-4bfa-bbf4-e89be42f3cf3" x="0" y="0" width="240" height="33"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -120,7 +120,7 @@
 				<textFieldExpression><![CDATA[$F{materialname}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="240" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="240" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -134,8 +134,8 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalamount}]]></textFieldExpression>
 			</textField>
-			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="360" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="360" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -147,10 +147,10 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{price}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{price} == null ? 0.00 : $F{price}]]></textFieldExpression>
 			</textField>
-			<textField pattern="¤ #,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="480" y="0" width="120" height="30" forecolor="#000000" backcolor="#FFFFFF"/>
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="d18faa4f-d6bd-43f2-be6e-552a0d29245a" mode="Transparent" x="480" y="0" width="120" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="0.25"/>
 					<topPen lineWidth="0.25"/>
@@ -162,35 +162,35 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{totalamount}*$F{price}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{price} == null ? 0.00 : $F{totalamount}*$F{price}]]></textFieldExpression>
 			</textField>
 		</band>
 	</detail>
 	<summary>
-		<band height="30">
-			<textField isBlankWhenNull="true">
-				<reportElement uuid="b6f69632-e34f-45b2-af41-1b3b4ed44ce2" style="table_CH" x="480" y="0" width="120" height="30"/>
+		<band height="33">
+			<textField pattern="###0.00" isBlankWhenNull="true">
+				<reportElement uuid="b6f69632-e34f-45b2-af41-1b3b4ed44ce2" style="table_CH" x="480" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalprice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="5461450b-c980-47b2-a406-63a6045a3753" style="table_CH" x="0" y="0" width="240" height="30"/>
+				<reportElement uuid="5461450b-c980-47b2-a406-63a6045a3753" style="table_CH" x="0" y="0" width="240" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[总计：]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="9ddf0f1c-7f14-4f1b-bd87-651bc0531a43" style="table_CH" x="240" y="0" width="120" height="30"/>
+				<reportElement uuid="9ddf0f1c-7f14-4f1b-bd87-651bc0531a43" style="table_CH" x="240" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sumAmount}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="64b7c321-b8ff-468a-a21c-5c5d88ca99f5" style="table_CH" x="360" y="0" width="120" height="30"/>
+				<reportElement uuid="64b7c321-b8ff-468a-a21c-5c5d88ca99f5" style="table_CH" x="360" y="0" width="120" height="33"/>
 				<textElement/>
 				<text><![CDATA[]]></text>
 			</staticText>