Index: ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml
===================================================================
diff -u -r17512 -r18254
--- ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml	(.../materialMissItemView.jrxml)	(revision 17512)
+++ ssts-web/src/main/webapp/jasperRtp/materialMissItemView.jrxml	(.../materialMissItemView.jrxml)	(revision 18254)
@@ -1,5 +1,5 @@
 <?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="870" pageHeight="660" columnWidth="870" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="f5587650-40ba-4841-b2b7-eea8ec77ae7a">
+<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="970" pageHeight="660" columnWidth="970" 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"/>
@@ -29,23 +29,13 @@
 		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[SELECT
-	r.materialname,
-	r.amount,
-	r.depart,
-case when r.materialcost is null then 0 else r.materialcost end materialcost,
-	r.operationTime,
-	r.tousseName
-FROM
-	MaterialErrorDamageDetail r
-WHERE materialName != '器械包标识牌'
-AND errortype = '缺失' $P!{querySql}]]>
+		<![CDATA[]]>
 	</queryString>
-	<field name="materialname" class="java.lang.String"/>
-	<field name="amount" class="java.lang.Integer"/>
+	<field name="materialName" class="java.lang.String"/>
+	<field name="missAmount" class="java.lang.Integer"/>
 	<field name="depart" class="java.lang.String"/>
 	<field name="materialcost" class="java.lang.Double"/>
-	<field name="operationTime" class="java.sql.Timestamp"/>
+	<field name="operationTime" class="java.lang.String"/>
 	<field name="tousseName" class="java.lang.String">
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
 	</field>
@@ -138,7 +128,7 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{materialname}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{materialName}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="66cfb17f-7e23-441e-9499-15d54ef2bb47" mode="Transparent" x="720" y="0" width="70" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
@@ -153,7 +143,7 @@
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{missAmount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="74b3fe95-8e70-40a1-9360-8d91161f6c6e" style="table_TH" mode="Transparent" x="520" y="0" width="200" height="33" forecolor="#000000" backcolor="#FFFFFF"/>
@@ -192,7 +182,7 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
-			<textField pattern="yyyy-MM-dd HH:mm">
+			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="1814c1fc-2c10-43a7-b9a4-c97f2e5d4e2a" style="table_TD" x="400" y="0" width="120" height="33"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>