Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java
===================================================================
diff -u -r17380 -r17425
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java	(.../IDCardInstance.java)	(revision 17380)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/idcardinstance/IDCardInstance.java	(.../IDCardInstance.java)	(revision 17425)
@@ -61,6 +61,11 @@
 		setType(BarcodeDevice.BARCODE_TYPE_SIGNBOARD);
 	}
 
+	/**
+	 * 获取本标识牌实例的所有器械包实例
+	 * @param dao
+	 * @return
+	 */
 	@Transient
 	public List<TousseInstance> getTousseInstances(ObjectDao dao) {
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r17187 -r17425
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 17187)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 17425)
@@ -20,16 +20,20 @@
 	var startTime= $Id('startTime').value;  //开始时间
 	var endTime = $Id('endTime').value;  //结束时间
 	var operatorSearch = $Id('operatorSearch').value;  //录入人名字
-	var hospitalNum = Ext.getCmp('hospitalNumSearch').getValue();  //住院号/诊疗号
-	var goodsId = Ext.getCmp('goodsSearch').getValue();  //物品id
-	var showOther = Ext.getCmp('othersGoods').getValue();  //是否需要显示同单明细
+	var hospitalNum = $Id('hospitalNumSearch').value;  //住院号/诊疗号
+	var showOther = $Id('othersGoods').value;  //是否需要显示同单明细
 	var departSearch = (!isFirstRoomPeople ? currentOrgUnitName : $Id('departSearch').value);  //不是一级供应室，只能查自己的
 	var barcode = $Id('barcodeSearch').value;  //条码字符串
 	var barcodeReg = /(\d){9}/;
 	if (!(barcode.length == 9 && barcodeReg.test(barcode))) {  //条码字符串为9数字,扫描码才有意义，否则清空
 		barcode = '';
 	}
 	
+	var goodsId = Ext.getCmp('goodsSearch').getValue();  //物品id
+	if (!$Id('goodsSearch').value) {  //用户删除了选择的物品，但是ext并不会实际的值清空，这里手工清空一下
+		goodsId = '';
+	}
+	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
@@ -338,7 +342,12 @@
 					triggerAction : 'all',
 					typeAhead : false,
 					listWidth : 130,
-					allowBlank : true
+					allowBlank : true,
+					listeners : {
+						select : function(combo, record, index) {
+							reloadReport();
+						}
+					}
 				}]
 			}]
 		}]
@@ -363,5 +372,6 @@
 			items : reportForm
 		}]
 	});
+	reloadReport();
 });
 
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
===================================================================
diff -u -r16986 -r17425
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml	(.../useRecordItemView.jrxml)	(revision 16986)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml	(.../useRecordItemView.jrxml)	(revision 17425)
@@ -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="useRecordItemView.jasper" pageWidth="1515" pageHeight="800" columnWidth="1515" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="aa4ec591-ebfb-4670-9304-2bfaaab2f169">
-	<property name="ireport.zoom" value="0.9313819845887362"/>
-	<property name="ireport.x" value="101"/>
+<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="useRecordItemView.jasper" pageWidth="1226" pageHeight="810" columnWidth="1226" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="aa4ec591-ebfb-4670-9304-2bfaaab2f169">
+	<property name="ireport.zoom" value="0.9313819845887368"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -55,9 +55,9 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="40" splitType="Stretch">
+		<band height="45" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1515" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1226" height="45" forecolor="#000000" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
@@ -67,79 +67,156 @@
 		</band>
 	</title>
 	<columnHeader>
-		<band height="40" splitType="Stretch">
+		<band height="45" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="bd677c44-3967-4aaf-8b48-eb0fe981b37a" style="table_TH" x="0" y="0" width="150" height="40"/>
+				<reportElement uuid="bd677c44-3967-4aaf-8b48-eb0fe981b37a" style="table_TH" x="0" y="0" width="150" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="233db35d-2898-46a5-bc8a-51c96289e80a" style="table_TH" x="150" y="0" width="80" height="40"/>
+				<reportElement uuid="233db35d-2898-46a5-bc8a-51c96289e80a" style="table_TH" x="150" y="0" width="80" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[录入人]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="00de20ef-4b91-4f24-8db1-2169a7d529f2" style="table_TH" x="230" y="0" width="140" height="40"/>
+				<reportElement uuid="00de20ef-4b91-4f24-8db1-2169a7d529f2" style="table_TH" x="230" y="0" width="140" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[录入时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="370" y="0" width="140" height="40"/>
+				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="370" y="0" width="72" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[病人姓名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2c7241a-6b37-4464-9269-f6ca6b480889" style="table_TH" mode="Opaque" x="1445" y="0" width="70" height="40"/>
+				<reportElement uuid="c2c7241a-6b37-4464-9269-f6ca6b480889" style="table_TH" mode="Opaque" x="1146" y="0" width="80" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[标识牌使用次数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="510" y="0" width="105" height="40"/>
+				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="442" y="0" width="105" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[住院号/诊疗号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="615" y="0" width="140" height="40"/>
+				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="547" y="0" width="79" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[医生名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="755" y="0" width="160" height="40"/>
+				<reportElement uuid="21e02a51-04e5-4328-b317-14193e1722e0" style="table_TH" x="626" y="0" width="160" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[手术名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="915" y="0" width="150" height="40"/>
+				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="786" y="0" width="80" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械包条码]]></text>
+				<text><![CDATA[条码]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="1065" y="0" width="150" height="40"/>
+				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="866" y="0" width="80" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[标识牌条码]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="1215" y="0" width="230" height="40"/>
+				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="946" y="0" width="200" height="45"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -148,10 +225,25 @@
 		</band>
 	</columnHeader>
 	<detail>
-		<band height="40" splitType="Stretch">
+		<band height="45" splitType="Stretch">
 			<elementGroup>
+				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="626" y="0" width="160" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<box>
+						<pen lineWidth="1.0"/>
+						<topPen lineWidth="1.0"/>
+						<leftPen lineWidth="1.0"/>
+						<bottomPen lineWidth="1.0"/>
+						<rightPen lineWidth="1.0"/>
+					</box>
+					<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+						<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+						<paragraph lineSpacing="Single"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{operation}]]></textFieldExpression>
+				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="0" y="0" width="150" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -166,7 +258,7 @@
 					<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="150" y="0" width="80" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="150" y="0" width="80" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -181,7 +273,7 @@
 					<textFieldExpression><![CDATA[$F{operator}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="230" y="0" width="140" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="230" y="0" width="140" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -196,7 +288,7 @@
 					<textFieldExpression><![CDATA[$F{enterTime}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="370" y="0" width="140" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="370" y="0" width="72" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -211,12 +303,12 @@
 					<textFieldExpression><![CDATA[$F{patient}]]></textFieldExpression>
 				</textField>
 				<subreport isUsingCache="false">
-					<reportElement uuid="8d36ec22-bd1f-4d2e-86cc-2f5aa5155d96" stretchType="RelativeToTallestObject" x="915" y="0" width="600" height="40"/>
+					<reportElement uuid="8d36ec22-bd1f-4d2e-86cc-2f5aa5155d96" stretchType="RelativeToTallestObject" x="786" y="0" width="440" height="45"/>
 					<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{enteringTousses})]]></dataSourceExpression>
 					<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "useRecordItemViewSub.jasper"]]></subreportExpression>
 				</subreport>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="510" y="0" width="105" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="442" y="0" width="105" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -231,7 +323,7 @@
 					<textFieldExpression><![CDATA[$F{hospotalNum}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="615" y="0" width="140" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
+					<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="547" y="0" width="79" height="45" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
 					<box>
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -246,21 +338,6 @@
 					<textFieldExpression><![CDATA[$F{doctorName}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
-			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="cdf321fe-036b-4348-bcd3-d6f763692f1d" stretchType="RelativeToBandHeight" mode="Transparent" x="755" y="0" width="160" height="40" isPrintWhenDetailOverflows="true" forecolor="#000000" backcolor="#FFFFFF"/>
-				<box>
-					<pen lineWidth="1.0"/>
-					<topPen lineWidth="1.0"/>
-					<leftPen lineWidth="1.0"/>
-					<bottomPen lineWidth="1.0"/>
-					<rightPen lineWidth="1.0"/>
-				</box>
-				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
-					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
-					<paragraph lineSpacing="Single"/>
-				</textElement>
-				<textFieldExpression><![CDATA[$F{operation}]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
===================================================================
diff -u -r16986 -r17425
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper
===================================================================
diff -u -r16986 -r17425
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml
===================================================================
diff -u -r16986 -r17425
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml	(.../useRecordItemViewSub.jrxml)	(revision 16986)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml	(.../useRecordItemViewSub.jrxml)	(revision 17425)
@@ -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="useRecordItemViewSub.jasper" language="groovy" pageWidth="600" pageHeight="40" columnWidth="600" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0e8c3824-f646-49cc-be24-3d9eb59acb9e">
-	<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="useRecordItemViewSub.jasper" language="groovy" pageWidth="440" pageHeight="45" columnWidth="440" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0e8c3824-f646-49cc-be24-3d9eb59acb9e">
+	<property name="ireport.zoom" value="1.3310000000000004"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<queryString>
@@ -20,9 +20,9 @@
 	</field>
 	<field name="useAmount" class="java.lang.Integer"/>
 	<detail>
-		<band height="40" splitType="Stretch">
+		<band height="45" splitType="Stretch">
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="300" y="0" width="230" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="160" y="0" width="200" height="45" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -37,7 +37,7 @@
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="530" y="0" width="70" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="360" y="0" width="80" height="45" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -52,7 +52,7 @@
 				<textFieldExpression><![CDATA[$F{useAmount}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="0" width="150" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="0" width="80" height="45" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -67,7 +67,7 @@
 				<textFieldExpression><![CDATA[$F{barcode}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="150" y="0" width="150" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="80" y="0" width="80" height="45" forecolor="#000000" backcolor="#FFFFFF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17406 -r17425
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17406)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17425)
@@ -63,8 +63,10 @@
 import com.forgon.disinfectsystem.diposablegoods.util.GodownEntryUtil;
 import com.forgon.disinfectsystem.diposablegoods.util.MaterialEntryUtil;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
@@ -9238,7 +9240,6 @@
 	 * @return
 	 */
 	private String getSqlByGoodsId(String goodsId, String goodsType, boolean showOther) {
-		
 		String tousseInstanceSql = 
 				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "ti.tousseName name,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
@@ -9249,7 +9250,7 @@
 		
 		String disposableGoodsSql = 
 				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
-				+ "udgi.name name,udgi.amount amount,'' barcode,'' idCardInstanceBarcode,0 useAmount "
+				+ "udgi.name name,udgi.amount amount,udgi.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
 				+ "from useRecord ur "
 				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
 				+ "where 1=1 ";
@@ -9258,18 +9259,21 @@
 		//如果goodsId不为空则则按照goodsId查，否则查全部的一次性物品和全部的器械包，此时不显示同单明细，否则有交叉
 		if (DatabaseUtil.isPoIdValid(goodsId)) {
 			if (StringTools.equals("一次性物品", goodsType)) {
-				if(showOther){  //显示同单的其他物品,使用子查询,使用记录的id必须是使用此物品的使用记录的id
-					disposableGoodsSql += "and ur.id in (select distinct userecord_id from useDiposableGoodsItem where disposableGoodsId=" + goodsId + ") ";
+				if(showOther){  //显示同单的其他物品，则需要查出所有使用记录的id，找出每一个使用记录的所有物品（一次性物品和器械包）
+					String useRecordIds = "select distinct userecord_id from useDiposableGoodsItem where disposableGoodsId=" + goodsId;
+					disposableGoodsSql += "and ur.id in(" + useRecordIds + ") ";
+					disposableGoodsSql += " union all " + tousseInstanceSql + " and ur.id in (" + useRecordIds + ") ";
 				}else{
 					disposableGoodsSql += "and udgi.disposableGoodsId=" + goodsId;
 				}
 				tempSql = disposableGoodsSql;
 			} else {
 				//由于器械包的包定义的id，有可能是由其他包定义生成的(消毒物品\自定义器械包),而goodsId是祖先id,所以要先查出goodsId的后代id
 				String toussedefIds = "select id from tousseDefinition where ancestorID=" + goodsId;
-				if(showOther){  //显示同单的其他物品，使用子查询，使用记录的id必须是使用此物品的使用记录的id
+				if(showOther){  //显示同单的其他物品，则需要查出所有使用记录的id，找出每一个使用记录的所有物品（一次性物品和器械包）
 					String useRecordIds = "select distinct useRecord_id from tousseInstance where tousseDefinition_id in (" + toussedefIds + ") ";
 					tousseInstanceSql += " and ur.id in (" + useRecordIds + ") ";
+					tousseInstanceSql += " union all " + disposableGoodsSql + " and ur.id in (" + useRecordIds + ") ";
 				}else{
 					tousseInstanceSql += " and ti.tousseDefinition_id in ( " + toussedefIds + " ) ";
 				}
@@ -9279,7 +9283,6 @@
 			tempSql = tousseInstanceSql + " union all " + disposableGoodsSql;
 		}
 		return tempSql;
-		
 	}
 	
 	/**
@@ -9289,7 +9292,6 @@
 	 * @return
 	 */
 	private String getSqlByBarcode(String barcode, boolean showOther) {
-		
 		String tousseInstanceSql = 
 				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
 				+ "ti.tousseName name,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
@@ -9298,6 +9300,14 @@
 				+ "inner join barcodeDevice bd on bd.id=ti.id "
 				+ "where 1=1 " ;
 		
+		String disposableGoodsSql = 
+				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
+				+ "udgi.name name,udgi.amount amount,udgi.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
+				+ "from useRecord ur "
+				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
+				+ "where 1=1 ";
+		
+		String tempSql = "";
 		BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode);
 		if (barcodeDevice instanceof IDCardInstance) {  //是标识牌条码
 			IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice;
@@ -9313,27 +9323,41 @@
 			String tousseInstanceIds = SqlBuilder.build_IN_Statement("ti.id", SqlBuilder.IN, idCollection);
 			if (showOther) {  //显示同单的
 				String useRecordIds = String.format("select distinct useRecord_id from tousseInstance ti where %s", tousseInstanceIds);
-				tousseInstanceSql += "and ur.id in(" + useRecordIds + ") ";
+				tousseInstanceSql += " and ur.id in(" + useRecordIds + ") ";
+				tousseInstanceSql += " union all " + disposableGoodsSql + " and ur.id in(" + useRecordIds + ") ";
 			} else {
 				tousseInstanceSql += "and " + tousseInstanceIds;
 			}
+			tempSql = tousseInstanceSql;
 		} else if (barcodeDevice instanceof TousseInstance) {  //是器械包条码
 			TousseInstance ti = (TousseInstance) barcodeDevice;
 			if (showOther) {  //显示同单的
 				Long useRecord_id = ti.getUseRecord_id();
 				if (useRecord_id != null) {
-					tousseInstanceSql += "and ur.id=" + ti.getUseRecord_id();
+					tousseInstanceSql += " and ur.id=" + useRecord_id;
+					tousseInstanceSql += " union all " + disposableGoodsSql + " and ur.id in(" + useRecord_id + ") ";
 				} else {
-					tousseInstanceSql += "and ur.id is null ";
+					tousseInstanceSql += "and 0=1 ";
 				}
 			} else {
-				tousseInstanceSql += "and ti.id=" + ti.getId();
+				tousseInstanceSql += " and ti.id=" + ti.getId();
 			}
+			tempSql = tousseInstanceSql;
+		} else if (barcodeDevice instanceof DisposableGoodsBatch
+				|| barcodeDevice instanceof ExpensiveDisposablegoods) {  //是一次性物品或高值耗材条码
+			if (showOther) {
+				String useRecordId = "select udgi.userecord_id from UseDiposableGoodsItem udgi where udgi.barcode='" + barcode + "'";
+				disposableGoodsSql += " and ur.id in(" + useRecordId + ")";
+				disposableGoodsSql += " union all " + tousseInstanceSql + " and ur.id in(" + useRecordId + ")";
+			} else {
+				disposableGoodsSql += " and udgi.barcode='" + barcode + "' ";
+			}
+			tempSql = disposableGoodsSql;
 		} else {
-			tousseInstanceSql += "and 1=0 ";
+			tousseInstanceSql += " and 1=0 ";
+			tempSql = tousseInstanceSql;
 		}
-		return tousseInstanceSql;
-		
+		return tempSql;
 	}
 	
 	
@@ -9343,6 +9367,7 @@
 	 */
 	@Override
 	public List<UseRecordEnteringBean> getUseRecordItemDataSource(Map<String,String> requestParameters) throws ParseException {
+		long ll = System.currentTimeMillis();
 		String startDay = requestParameters.get("startDay");  //开始时间
 		String endDay = requestParameters.get("endDay");  //结束时间
 		String depart = requestParameters.get("depart");  //使用科室的名称
@@ -9353,7 +9378,6 @@
 		String goodsType = requestParameters.get("goodsType");  //主要是区分一次性物品和器械包,然后根据这个类型,就知道goodsId是TousseDefinition的id还是DisposableGoods的id
 		String barcode = requestParameters.get("barcode");  //条码
 		
-		
 		if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
 			String sql = "";
 			if (StringUtils.isNotBlank(barcode)) {  //扫条码查询（器械包条码或者标识牌条码）
@@ -9411,28 +9435,15 @@
 					tousse.setIdCardInstanceBarcode(StringTools.defaultString(rs.getString("idCardInstanceBarcode")));
 					tousse.setUseAmount(rs.getInt("useAmount"));
 					enteringBean.getEnteringTousses().add(tousse);
-					
-//					UseRecordEnteringTousse tousse = CollectionUtils.find(enteringBean.getEnteringTousses(),new Predicate<UseRecordEnteringTousse>(){
-//						@Override
-//						public boolean evaluate(UseRecordEnteringTousse object) {
-//							return StringTools.equals(object.getTousseName(), name);
-//						}
-//					});
-//					if(tousse == null){
-//						tousse = new UseRecordEnteringTousse();
-//						tousse.setTousseName(name);
-//						enteringBean.getEnteringTousses().add(tousse);
-//					}
-//					tousse.setAmount(MathTools.add(tousse.getAmount(), amount).intValue());
 				}
 			} catch (Exception e) {
 				e.printStackTrace();
 			}finally {
 				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
+			logger.debug("使用记录录入明细统计报表后台查询时间：" + (System.currentTimeMillis() - ll) + "毫秒");
 			return enteringBeans;
 		}
-		
 		return new ArrayList<UseRecordEnteringBean>();
 		
 	}