Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java
===================================================================
diff -u -r31145 -r32513
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java	(.../TousseItemVO.java)	(revision 31145)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/TousseItemVO.java	(.../TousseItemVO.java)	(revision 32513)
@@ -28,6 +28,10 @@
 	 * 供应商名字
 	 */
 	private String supplierName;
+	/**
+	 * 已使用
+	 */
+	private String used;
 	public String getItemName() {
 		return itemName;
 	}
@@ -75,5 +79,13 @@
 	public void setSupplierName(String supplierName) {
 		this.supplierName = supplierName;
 	}
+
+	public String getUsed() {
+		return used;
+	}
+
+	public void setUsed(String used) {
+		this.used = used;
+	}
 	
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r32170 -r32513
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 32170)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 32513)
@@ -543,7 +543,7 @@
 	 * @return
 	 */
 	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(String timeType, String startDay,String endDay,String goodsName,String deptName,
-			String patientName , String deliverStatus, String companyName, String departOfPatient, boolean noDisplayTerminatedIP, String customColumnName1, Map<String, Object> parametMap, Long materialId, boolean showNoInvoie, String tousseDefinitionName);
+			String patientName , String deliverStatus, String companyName, String departOfPatient, boolean noDisplayTerminatedIP, String customColumnName1, Map<String, Object> parametMap, Long materialId, boolean showNoInvoie, String tousseDefinitionName, String used);
 	/**
 	 * 获取入库统计的报表数据，以供应商分类
 	 * @param startTime 起始时间
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml
===================================================================
diff -u -r31145 -r32513
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml	(.../foreignTousseApplicationReport.jrxml)	(revision 31145)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jrxml	(.../foreignTousseApplicationReport.jrxml)	(revision 32513)
@@ -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="foreignTousseApplicationReport" language="groovy" pageWidth="1459" pageHeight="790" columnWidth="1459" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
+<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="foreignTousseApplicationReport" language="groovy" pageWidth="1574" pageHeight="790" columnWidth="1574" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="191"/>
+	<property name="ireport.x" value="284"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -231,7 +231,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1459" height="30"/>
+				<reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1574" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -249,7 +249,7 @@
 				<text><![CDATA[接收时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1329" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1444" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -263,7 +263,7 @@
 				<text><![CDATA[病人姓名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1185" y="0" width="144" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1300" y="0" width="144" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -277,7 +277,7 @@
 				<text><![CDATA[住院号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1125" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1240" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -291,14 +291,14 @@
 				<text><![CDATA[申请科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1065" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1180" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货状态]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1389" y="0" width="70" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1504" y="0" width="70" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -353,6 +353,13 @@
 				</textElement>
 				<text><![CDATA[供应商]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="d2c35607-bde5-4c14-92b1-e100f9a278cb" style="table_CH" mode="Opaque" x="1065" y="0" width="115" height="30" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[外来器械包已使用]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -365,7 +372,7 @@
 				<textFieldExpression><![CDATA[$F{applicationTimeStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1329" y="0" width="60" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1444" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -379,14 +386,14 @@
 				<textFieldExpression><![CDATA[$F{patient}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1185" y="0" width="144" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1300" y="0" width="144" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{surgery}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="1125" y="0" width="60" height="35"/>
+				<reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="1240" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -407,21 +414,21 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="1065" y="0" width="60" height="35"/>
+				<reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="1180" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{deliverStatus}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1389" y="0" width="70" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1504" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{processType}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="460" y="0" width="605" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="460" y="0" width="720" height="35" isPrintWhenDetailOverflows="true"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{tousseItems})]]></dataSourceExpression>
 				<returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/>
 				<returnValue subreportVariable="totalPrice" toVariable="sum_price" calculation="Sum"/>
@@ -464,7 +471,7 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="cac3a5c8-b815-4c47-ab53-cd7e16d381ea" style="table_CH" x="800" y="0" width="659" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="cac3a5c8-b815-4c47-ab53-cd7e16d381ea" style="table_CH" x="800" y="0" width="774" height="30" backcolor="#FFFFFF"/>
 				<textElement/>
 				<text><![CDATA[]]></text>
 			</staticText>
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jasper
===================================================================
diff -u -r31145 -r32513
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jasper
===================================================================
diff -u -r31145 -r32513
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32392 -r32513
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32392)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32513)
@@ -12926,7 +12926,7 @@
 
 	@Override
 	public List<ForeignTousseApplicationVO> getForeignTousseApplicationReport(
-			String timeType, String startDay, String endDay, String goodsName, String deptName , String patientName , String deliverStatus, String companyName, String departOfPatient, boolean noDisplayTerminatedIP, String customColumnName1, Map<String, Object> parametMap, Long materialId, boolean showNoInvoie, String tousseDefinitionName) {
+			String timeType, String startDay, String endDay, String goodsName, String deptName , String patientName , String deliverStatus, String companyName, String departOfPatient, boolean noDisplayTerminatedIP, String customColumnName1, Map<String, Object> parametMap, Long materialId, boolean showNoInvoie, String tousseDefinitionName, String used) {
 		boolean filterConpanyName = false;//是否过滤供应商
 		if(StringUtils.isNotBlank(companyName)){
 			filterConpanyName = true;
@@ -12980,6 +12980,14 @@
 		}else{
 			showNoInvoieSql = "";
 		}
+		String usedSql = null;
+		if("否".equals(used)){
+			usedSql = " and tit.useRecord_id is null";
+		}else if("是".equals(used)){
+			usedSql = " and tit.useRecord_id is not null ";
+		}else{
+			usedSql = "";
+		}
 		String timeSql = null;
 		startDay = dateQueryAdapter.dateAdapter(startDay);
 		endDay = dateQueryAdapter.dateAdapter(endDay);
@@ -12992,7 +13000,7 @@
 			timeSql = String.format("and (f.receiveTime between %s and %s)", startDay, endDay);
 		}
 		String sql = String
-				.format("select case when tit.invoiceSendTime2 is not null then tit.invoiceSendTime2 else tit.invoiceSendTime end invoiceSendTime,f.receiveTime,tit.tousseName,tit.price,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus %s,f.doctor,f.processType,count(distinct tit.id) amount,f.bedNumber %s from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id left join TousseDefinition td on td.id = tit.tousseDefinition_id %s where (tit.id is null or td.parentID is null and ti.tousseDefinitionId=tit.tousseDefinition_id or ti.tousseDefinitionId=td.parentID) %s %s %s %s  ",
+				.format("select case when tit.invoiceSendTime2 is not null then tit.invoiceSendTime2 else tit.invoiceSendTime end invoiceSendTime,f.receiveTime,tit.tousseName,tit.price,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus %s,f.doctor,f.processType,count(distinct tit.id) amount,f.bedNumber,tit.useRecord_id %s from %s f join %s i on f.id=i.id left join %s ti on ti.recyclingApplication_ID=i.id left join %s tit on tit.foreignTousseApp_id=f.id left join TousseDefinition td on td.id = tit.tousseDefinition_id %s where (tit.id is null or td.parentID is null and ti.tousseDefinitionId=tit.tousseDefinition_id or ti.tousseDefinitionId=td.parentID) %s %s %s %s %s ",
 						customColumnName1Sql,
 						queryMaterialNameSql,
 						ForeignTousseApplication.class.getSimpleName(),
@@ -13003,7 +13011,8 @@
 						materialInstanceSql,
 						showNoInvoieSql,
 						tousseSql,
-						timeSql);
+						timeSql,
+						usedSql);
 		sqlBuilder.append(sql);
 		if (StringUtils.isNotBlank(goodsName)) {
 			sql = String
@@ -13031,7 +13040,7 @@
 		if(noDisplayTerminatedIP){
 			sqlBuilder.append(" and (i.deliverStatus<>'").append(InvoicePlan.STATUS_END).append("' or i.deliverStatus is null) ");
 		}
-		sqlBuilder.append(" group by tit.invoiceSendTime,tit.invoiceSendTime2,f.receiveTime,tit.tousseName,tit.price,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.bedNumber ");
+		sqlBuilder.append(" group by tit.invoiceSendTime,tit.invoiceSendTime2,f.receiveTime,tit.tousseName,tit.price,f.id,ti.supplierName,i.applicant,i.remark,f.patient,f.surgery,f.hospitalNumber,i.depart,i.deliverStatus,f.bedNumber,tit.useRecord_id ");
 		sqlBuilder.append(customColumnName1Sql);
 		sqlBuilder.append(groupByMaterialInstanceSql);
 		sqlBuilder.append(",f.doctor,f.processType order by f.id asc ");
@@ -13091,7 +13100,7 @@
 					}
 					double price = rs.getDouble("price");
 					String supplierName = rs.getString("supplierName");
-					
+					Long useRecord_id = rs.getLong("useRecord_id");
 					int materialCount = 0;
 					if(!enableShowForeignTousseApplicationReportMaterials){
 						tousseItemVO = new TousseItemVO();
@@ -13100,7 +13109,7 @@
 						if(materialCount <= 0){
 							continue;
 						}
-						String key = id + "_"+ tousseName + "_" + price + "_" + invoiceSendTime + "_" + supplierName;
+						String key = id + "_"+ tousseName + "_" + price + "_" + invoiceSendTime + "_" + supplierName + "_" + useRecord_id;
 						if(tousseItemVOMap.containsKey(key)){
 							tousseItemVO = tousseItemVOMap.get(key);
 							isContinue = true;
@@ -13136,6 +13145,7 @@
 					tousseItemVO.setTousseInstanceAmount(amount);
 					tousseItemVO.setPrice(price);
 					tousseItemVO.setInvoiceSendTimeStr(invoiceSendTimeStr);
+					tousseItemVO.setUsed(useRecord_id == 0?"否":"是");
 					totalAmount += amount;
 					if(StringUtils.isNotBlank(supplierName)){
 						tousseItemVO.setSupplierName(supplierName);
@@ -15391,7 +15401,7 @@
 			// 材料或者包数量和
 			Integer qmTousseAndMaterialAmount = 0;
 			if(materialAndTousse){
-				sql =  " select 0 count,sum(t.bAmount) total from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
+				sql =  " select sum(t.bAmount) total from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
 						+ " join QualityMonitoringDefinition qmdf on qmdf.id=fd.id join ( select qmi.id qid,sum(case when qmd.material is null or qmd.material='' then 0 else qmd.amount end) bAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id "
 						+ tousseNameSql
 						+ " group by qmi.id ) t on t.qid=qmi.id "
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jrxml
===================================================================
diff -u -r31145 -r32513
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jrxml	(.../foreignTousseApplicationShowMaterialsReport_subreport1.jrxml)	(revision 31145)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport_subreport1.jrxml	(.../foreignTousseApplicationShowMaterialsReport_subreport1.jrxml)	(revision 32513)
@@ -45,6 +45,9 @@
 	<field name="supplierName" class="java.lang.String">
 		<fieldDescription><![CDATA[supplierName]]></fieldDescription>
 	</field>
+	<field name="used" class="java.lang.String">
+		<fieldDescription><![CDATA[used]]></fieldDescription>
+	</field>
 	<variable name="totalAmount" class="java.lang.Long" calculation="Sum">
 		<variableExpression><![CDATA[$F{tousseInstanceAmount}]]></variableExpression>
 	</variable>
@@ -122,6 +125,17 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" stretchType="RelativeToBandHeight" x="805" y="0" width="115" height="35" backcolor="#CCCCCC"/>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{used}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jrxml
===================================================================
diff -u -r31145 -r32513
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jrxml	(.../foreignTousseApplicationShowMaterialsReport.jrxml)	(revision 31145)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jrxml	(.../foreignTousseApplicationShowMaterialsReport.jrxml)	(revision 32513)
@@ -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="foreignTousseApplicationReport" language="groovy" pageWidth="1659" pageHeight="790" columnWidth="1659" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
+<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="foreignTousseApplicationReport" language="groovy" pageWidth="1774" pageHeight="790" columnWidth="1774" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d106b113-d222-4760-9b2f-8e43b4db22dc">
 	<property name="ireport.zoom" value="0.9090909090909091"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="330"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -234,7 +234,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1659" height="30"/>
+				<reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1774" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -252,7 +252,7 @@
 				<text><![CDATA[接收时间]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1529" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1644" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -266,7 +266,7 @@
 				<text><![CDATA[病人姓名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1385" y="0" width="144" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1500" y="0" width="144" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -280,7 +280,7 @@
 				<text><![CDATA[住院号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1325" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1440" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -301,14 +301,14 @@
 				<text><![CDATA[申请科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1265" y="0" width="60" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="cfca2b34-ddee-440a-ab00-8f2561900444" style="table_CH" x="1380" y="0" width="60" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货状态]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1589" y="0" width="70" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="25eb82e0-820d-46f1-882f-fc3a993a4b38" style="table_CH" x="1704" y="0" width="70" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
@@ -363,6 +363,13 @@
 				</textElement>
 				<text><![CDATA[材料明细]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="000349bd-47a1-41da-8a8c-c110ff8cc01a" style="table_CH" x="1265" y="0" width="115" height="30" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[外来器械包已使用]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -382,7 +389,7 @@
 				<textFieldExpression><![CDATA[$F{applicationTimeStr}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1529" y="0" width="60" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1644" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -396,14 +403,14 @@
 				<textFieldExpression><![CDATA[$F{patient}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1385" y="0" width="144" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1500" y="0" width="144" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{surgery}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="1325" y="0" width="60" height="35"/>
+				<reportElement uuid="bb6508ce-66fa-4559-bbf9-57d42dbb6724" style="table_TD" stretchType="RelativeToBandHeight" x="1440" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -424,21 +431,21 @@
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="1265" y="0" width="60" height="35"/>
+				<reportElement uuid="f3f65a07-dce0-440c-a5ac-6b7337fcdc25" style="table_TD" stretchType="RelativeToBandHeight" x="1380" y="0" width="60" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{deliverStatus}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1589" y="0" width="70" height="35"/>
+				<reportElement uuid="eef7d363-7929-4919-9657-f3e6f0723302" style="table_TD" stretchType="RelativeToBandHeight" x="1704" y="0" width="70" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{processType}]]></textFieldExpression>
 			</textField>
 			<subreport>
-				<reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="460" y="0" width="805" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="ad5c7c02-0be2-4736-820c-5595b0ffba32" stretchType="RelativeToBandHeight" x="460" y="0" width="920" height="35" isPrintWhenDetailOverflows="true"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{tousseItems})]]></dataSourceExpression>
 				<returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/>
 				<returnValue subreportVariable="totalPrice" toVariable="sum_price" calculation="Sum"/>
@@ -496,7 +503,7 @@
 				<textFieldExpression><![CDATA[$P{totalMaterialDetails}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="0d3e5ce2-e82f-46f2-a0bf-947ceaca805c" style="table_TD" positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="1000" y="0" width="659" height="30" backcolor="#FFFFFF"/>
+				<reportElement uuid="0d3e5ce2-e82f-46f2-a0bf-947ceaca805c" style="table_TD" positionType="Float" stretchType="RelativeToBandHeight" mode="Opaque" x="1000" y="0" width="774" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<paragraph lineSpacing="Proportional" lineSpacingSize="1.2"/>
 				</textElement>
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationShowMaterialsReport.jasper
===================================================================
diff -u -r31145 -r32513
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport.jasper
===================================================================
diff -u -r31145 -r32513
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r32170 -r32513
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 32170)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 32513)
@@ -1548,9 +1548,10 @@
 			}
 			Long materialId = StrutsParamUtils.getPraramLongValue("materialId", null);
 			boolean showNoInvoie = "true".equals(StrutsParamUtils.getPraramValue("showNoInvoie",""))?true:false;
+			String used = StrutsParamUtils.getPraramValue("used",null);
 			String foreignTousseName = StrutsParamUtils.getPraramValue("foreignTousseName", null);
 			String timeType = StrutsParamUtils.getPraramValue("timeType", null);
-			return jasperReportManager.getForeignTousseApplicationReport(timeType, startDay, endDay, goodsName, deptName , patientName , deliverStatus, companyName, departOfPatient, noDisplayTerminatedIP, customColumnName1FieldName, parametMap, materialId, showNoInvoie, foreignTousseName);
+			return jasperReportManager.getForeignTousseApplicationReport(timeType, startDay, endDay, goodsName, deptName , patientName , deliverStatus, companyName, departOfPatient, noDisplayTerminatedIP, customColumnName1FieldName, parametMap, materialId, showNoInvoie, foreignTousseName, used);
 		}else if("foreignTousseApplicationReport-xjjqzyy".equals(reportName)){//xjjqzyy定制的外来器械申请统计报表
 			String startDay = StrutsParamUtils.getPraramValue("startDay", "");
 			String endDay = StrutsParamUtils.getPraramValue("endDay", "");
Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml
===================================================================
diff -u -r31145 -r32513
--- ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml	(.../foreignTousseApplicationReport_subreport1.jrxml)	(revision 31145)
+++ ssts-web/src/main/webapp/jasperRtp/foreignTousseApplicationReport_subreport1.jrxml	(.../foreignTousseApplicationReport_subreport1.jrxml)	(revision 32513)
@@ -42,6 +42,9 @@
 	<field name="supplierName" class="java.lang.String">
 		<fieldDescription><![CDATA[supplierName]]></fieldDescription>
 	</field>
+	<field name="used" class="java.lang.String">
+		<fieldDescription><![CDATA[used]]></fieldDescription>
+	</field>
 	<variable name="totalAmount" class="java.lang.Long" calculation="Sum">
 		<variableExpression><![CDATA[$F{tousseInstanceAmount}]]></variableExpression>
 	</variable>
@@ -106,6 +109,17 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{supplierName}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e085637d-70a5-4bd7-a830-de7589085aed" style="table_TD" x="605" y="0" width="115" height="35" backcolor="#CCCCCC"/>
+				<box>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{used}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>