Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21057 -r21066
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21057)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21066)
@@ -11546,22 +11546,22 @@
 	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 " 
+				+ "ti.tousseName name,'' specification,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
 				+ "from useRecord ur "
 				+ "inner join tousseInstance ti on ti.useRecord_id=ur.id "
 				+ "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 "
+				+ "udgi.name name,'' specification,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 expensiveGoodsSql = 
 				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
-				+ "eg.name name,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
+				+ "eg.name name,eg.specification specification,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
 				+ "from useRecord ur "
 				+ "inner join ExpensiveGoodsInstance egi on egi.userecordId=ur.id "
 				+ "inner join ExpensiveGoods eg on eg.id=egi.expensiveGoods_id "
@@ -11622,22 +11622,22 @@
 	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 " 
+				+ "ti.tousseName name, '' specification,1 amount,bd.barcode barcode,ti.idCardInstanceBarcode idCardInstanceBarcode,ti.useAmount useAmount " 
 				+ "from useRecord ur "
 				+ "inner join tousseInstance ti on ti.useRecord_id=ur.id "
 				+ "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 "
+				+ "udgi.name name,'' specification,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 expensiveGoodsSql = 
 				"select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
-				+ "eg.name name,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
+				+ "eg.name name,eg.specification specification,1 amount,bd.barcode barcode,'' idCardInstanceBarcode,0 useAmount "
 				+ "from useRecord ur "
 				+ "inner join ExpensiveGoodsInstance egi on egi.userecordId=ur.id "
 				+ "inner join ExpensiveGoods eg on eg.id=egi.expensiveGoods_id "
@@ -11742,7 +11742,6 @@
 				sql = getSqlByGoodsId(goodsId, goodsType, showOther);
 			}
 			
-			
 			sql = "select * from ( " + sql + " ) m  where 1=1 ";
 			if(StringUtils.isNotBlank(depart) && !depart.equals("全部")){  //使用科室的名称
 				sql += " and m.depart='"+ depart +"' ";
@@ -11785,7 +11784,14 @@
 					}
 					
 					UseRecordEnteringTousse tousse = new UseRecordEnteringTousse();
-					tousse.setTousseName(StringTools.defaultString(rs.getString("name")));
+					String name = StringTools.defaultString(rs.getString("name"));
+					
+					if (StringTools.equals(ExpensiveGoods.TYPE_NAME, goodsType)) {
+						String specification = StringTools.defaultString(rs.getString("specification"));
+						name = CssdUtils.buildShowName(name, specification);
+					}
+					
+					tousse.setTousseName(name);
 					tousse.setAmount(rs.getInt("amount"));
 					tousse.setBarcode(StringTools.defaultString(rs.getString("barcode")));
 					tousse.setIdCardInstanceBarcode(StringTools.defaultString(rs.getString("idCardInstanceBarcode")));
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r21057 -r21066
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 21057)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 21066)
@@ -82,6 +82,7 @@
 	var comboGoodsRecord = Ext.data.Record.create([
    		    {name : 'id',mapping : 'id'},
 		    {name : 'type',mapping : 'type'}, 
+		    {name : 'showName',mapping : 'showName'}, 
 		    {name : 'name',mapping : 'name'}
 	]);
 	//物品选择下拉框Store