Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper
===================================================================
diff -u -r14664 -r16986
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper
===================================================================
diff -u -r14664 -r16986
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r15836 -r16986
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 15836)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 16986)
@@ -1,341 +1,365 @@
 var entityName = "使用记录录入统计报表";
-var grid;
+var form = null;
 
+/**
+ * 加载报表的数据
+ * @param isFirstRoomPeople	当前登录用户的当前科室是否为一级供应室
+ * @param currentOrgUnitName	当前登录用户的当前科室名称
+ * @param operatorSearch	录入人
+ * 
+ * 
+ */
 var myMask;
-function reloadReport(isFirstRoomPeople,orgName,operatorSearch){
-	var departSearch = "";
-	var startTime= $Id('startTime').value;
-	var endTime = $Id('endTime').value;
-	var hospitalNum = Ext.getCmp('hospitalNumSearch').getValue();
-	var goodsId = Ext.getCmp('goodsSearch').getValue();
-	var showOther = Ext.getCmp('othersGoods').getValue();
-	var goodsType = Ext.getCmp('goodsType').getValue();
-
-	//不是一级供应室
-	if(!isFirstRoomPeople){
-		departSearch = orgName;/*Ext.getCmp('departSearch').getValue();*/////
-	}else{
-		departSearch = $Id('departSearch').value;
+function reloadReport(){
+	
+	if (!form.getForm().isValid()) {
+		showResult('请正确填写表单各值');
+		return false;
 	}
+	
+	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 departSearch = (!isFirstRoomPeople ? currentOrgUnitName : $Id('departSearch').value);  //不是一级供应室，只能查自己的
+	var barcode = $Id('barcodeSearch').value;  //条码字符串
+	var barcodeReg = /(\d){9}/;
+	if (!(barcode.length == 9 && barcodeReg.test(barcode))) {  //条码字符串为9数字,扫描码才有意义，否则清空
+		barcode = '';
+	}
+	
 	myMask = new Ext.LoadMask(Ext.getBody(), {
 		msg: '正在加载，请稍候！',
 		removeMask: true
 	});
 	myMask.show();
-	window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=useRecordItemView.jasper&startDay="
-			+startTime+"&endDay="+endTime+"&reportName=useRecordItemView&depart="+departSearch+"&operatorSearch="+operatorSearch 
-			+ "&hospitalNum=" + hospitalNum + "&goodsId=" + goodsId + "&goodsType=" + goodsType 
-			+ "&showOther=" + showOther,'thisIframe','_self');
+	window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" +
+			"?jasperreportName=useRecordItemView.jasper&reportName=useRecordItemView" +
+			"&startDay=" + startTime +
+			"&endDay=" + endTime +
+			"&depart=" + departSearch +
+			"&operatorSearch=" + operatorSearch +  
+			"&hospitalNum=" + hospitalNum +
+			"&goodsId=" + goodsId + 
+			"&goodsType=" + Ext.getCmp('goodsType').getValue() +  
+			"&showOther=" + showOther +
+			"&barcode=" + barcode,
+			'thisIframe', '_self');
+	
 }
+
 Ext.onReady(function(){
 	Ext.QuickTips.init();
+	
+	var dt = new Date();
+	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+	
 	var departRecord = Ext.data.Record.create([ {
 		name : 'id'
 	}, {
 		name : 'name'
 	} ]);
+	//科室选择下拉框Store
 	var departJsonStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do',
 			method : 'POST'
 		}),
-		reader : new Ext.data.JsonReader({
-			root : 'data'
-		},departRecord
-		),
+		reader : new Ext.data.JsonReader({root : 'data'}, departRecord),
 		listeners:{
 			load : function(thiz,records,options){
 				thiz.insert(0, new departRecord({id:"-1",name:"全部"}));
 			}
 		}
 	});
+	
 	var comboGoodsRecord = Ext.data.Record.create([
    		    {name : 'id',mapping : 'id'},
 		    {name : 'tousseDefinitionID'},
 		    {name : 'type',mapping : 'type'}, 
 		    {name : 'tousseType',mapping : 'tousseType'},
 		    {name : 'name',mapping : 'name'}
-		]);
-	//物品选择下拉框数据源
+	]);
+	//物品选择下拉框Store
 	var comboGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			//type : 'ajax',
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchComboGoodsData.do'
 		}),
 		reader : new Ext.data.JsonReader({
-			//totalProperty : 'totalCount',
-			//idProperty: 'noneExsist',
 			root : 'data'
 		},comboGoodsRecord)
 	});
-	//是否显示同单明细
-	var yesNoStore = new Ext.data.SimpleStore( {
-		fields : [ 'value'],
-		data : [[STR_YES],[STR_NO]]
-	});
-	var dt = new Date();
-	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
 	
-	 var readerDetail = Ext.data.Record.create([ {
-								name : 'id'
-							}, {
-								name : 'name'
-							} ]);
+	var readerDetail = Ext.data.Record.create([{name : 'id'},{name : 'name'}]);
+	//用户选择下拉框Store
 	var userJsonStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do',
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
 			root : 'data'
-		},readerDetail)
+		},readerDetail),
+		baseParams : {
+			departId : (!isFirstRoomPeople ? currentOrgUnitCode : '')  //当前科室编码如果不是第一供应室用户，只加载本科室的所有用户
+		}
 	});
-	//不是第一供应室的人
-	if(!isFirstRoomPeople){
-		userJsonStore.baseParams.departId = currentOrgCode;
-		userJsonStore.reload();
-	}
 		
-		var form = new Ext.form.FormPanel({
-			title : '使用记录录入明细报表',
-			region : 'north',
-			labelAlign : 'right',
-			buttonAlign : 'center',
-			collapsible : true,
-			collapseMode : 'mini',
-			split : true,
-			border : 0,
-			frame : true,
-			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 135,
+	form = new Ext.form.FormPanel({
+		title : '使用记录录入明细报表',
+		region : 'north',
+		labelAlign : 'right',
+		buttonAlign : 'center',
+		collapsible : true,
+		collapseMode : 'mini',
+		split : true,
+		border : 0,
+		frame : true,
+		bodyStyle : 'padding:0px auto;margin:0px',
+		height : 135,
+		buttons:[{
+		    xtype : 'button',
+			text : '查询',
+			minWidth : 70,
+			iconCls : 'icon_search',
+			handler : function() {
+				reloadReport();
+			}
+		},{
+			xtype : 'button',
+			text : '重置',
+			minWidth : 70,
+			iconCls : 'icon_set',
+			handler : function() {
+				form.getForm().reset();
+			}
+		}],
+		items : [{
+			layout : 'column',
+			labelWidth : 60,
+			width : 1000,
 			items : [{
-				layout : 'column',
-//				height : 40,
-				labelWidth : 60,
-				items : [{
-						xtype : 'hidden',
-						name : 'goodsType',
-						id : 'goodsType'
-					},{
-					layout:'form',
-					columnWidth:.2,
-					items:[{
-						xtype : 'datefieldWithMin',
-						fieldLabel : '开始日期',
-						id : 'startTime',
-						name : 'startTime',
-						editable : false,
-						format : 'Y-m-d H:i:s',
-						allowBlank : true,
-						anchor : '95%',
-						value: new Date(startDayofMonth),
-						listeners : {
-							specialkey : function(field, e) {
-								if (e.getKey() == Ext.EventObject.ENTER) {
-									var isOK = field.validate();
-									if(isOK){
-										var value = field.getValue();
-										field.setValue(value);
-										var endTime = Ext.getCmp('endTime');
-										endTime.setValue('');
-										endTime.focus();
-									}
+				xtype : 'hidden',
+				name : 'goodsType',
+				id : 'goodsType'
+			},{
+				layout:'form',
+				columnWidth:.25,
+				items:[{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '开始日期',
+					id : 'startTime',
+					name : 'startTime',
+					editable : false,
+					format : 'Y-m-d H:i:s',
+					allowBlank : false,
+					anchor : '95%',
+					value: new Date(startDayofMonth),
+					listeners : {
+						specialkey : function(field, e) {
+							if (e.getKey() == Ext.EventObject.ENTER) {
+								var isOK = field.validate();
+								if(isOK){
+									var value = field.getValue();
+									field.setValue(value);
+									var endTime = Ext.getCmp('endTime');
+									endTime.setValue('');
+									endTime.focus();
 								}
 							}
 						}
-					}]
-				},{
-					layout:'form',
-					columnWidth:.2,
-					items:[{
-						xtype : 'datefieldWithMin',
-						fieldLabel : '结束日期',
-						id : 'endTime',
-						name : 'endTime',
-						editable : false,
-						format : 'Y-m-d H:i:s',
-						allowBlank : true,
-						anchor : '95%',
-						value: new Date(),
-						listeners : {
-							specialkey : function(field, e) {
-								if (e.getKey() == Ext.EventObject.ENTER) {
-									var isOK = field.validate();
-									if(isOK){
-										var value = field.getValue();
-										field.setValue(value);
-									}
-								}
+					}
+				}]
+			},{
+				columnWidth : .25,
+				layout : 'form',
+				labelWidth : 40,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '条码',
+					name : 'barcodeSearch',
+					id : 'barcodeSearch',
+					anchor : '95%',
+					listeners : {
+						specialkey : function(field, ee) {
+							if (ee.getKey() == Ext.EventObject.ENTER) {
+								reloadReport();
 							}
 						}
-					}]
-				},{
-					layout:'form',
-					columnWidth:.22,
-					labelWidth:40,
-					items:[{
-						xtype : 'combo',
-						id : 'departSearch',
-						name : 'departSearch',
-						queryParam : 'spell',
-						fieldLabel : '科室',
-						minChars : 0,
-						valueField : 'id',
-						displayField : 'name',
-						store : departJsonStore,
-						forceSelection : false,
-						lazyInit : true,
-						anchor : '95%',
-						listWidth:200,
-						disabled :!isFirstRoomPeople,
-						triggerAction : 'all',
-						hideTrigger : true,
-						typeAhead : false,
-						allowBlank : true,
-						listeners:{
-							specialkey:function(field,event){
-								if(event.getKey()==Ext.EventObject.ENTER){
-									userJsonStore.removeAll();
-									userJsonStore.baseParams.departId = field.getValue();
-									userJsonStore.reload();
-									Ext.getCmp('operatorSearch').focus();
-								}
+					}
+				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:50,
+				items:[{
+					xtype : 'combo',
+					id : 'departSearch',
+					name : 'departSearch',
+					queryParam : 'spell',
+					fieldLabel : '科室',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : departJsonStore,
+					forceSelection : false,
+					lazyInit : true,
+					anchor : '95%',
+					listWidth : 200,
+					disabled :!isFirstRoomPeople,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					listeners:{
+						specialkey:function(field,event){
+							if(event.getKey()==Ext.EventObject.ENTER){
+								userJsonStore.removeAll();
+								userJsonStore.baseParams.departId = field.getValue();
+								userJsonStore.reload();
+								Ext.getCmp('operatorSearch').focus();
 							}
 						}
-					}]
-				},{
-					layout:'form',
-					columnWidth:.18,
-					labelWidth:60,
-					items:[{
-						xtype : 'combo',
-						id : 'operatorSearch',
-						name : 'operatorSearch',
-						queryParam : 'spell',
-						fieldLabel : '录入人',
-						minChars : 0,
-						valueField : 'id',
-						displayField : 'name',
-						store : userJsonStore,
-						forceSelection : true,
-						lazyInit : true,
-						anchor : '95%',
-						listWidth:150,
-						triggerAction : 'all',
-						hideTrigger : true,
-						typeAhead : false,
-						allowBlank : true,
-						listeners:{
-							specialkey:function(field,event){
-								if(event.getKey()==Ext.EventObject.ENTER){
-									reloadReport(isFirstRoomPeople,orgName,field.getRawValue());
+					}
+				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:100,
+				items:[{
+					xtype : 'textfield',
+					id : 'hospitalNumSearch',
+					name : 'hospitalNumSearch',
+					fieldLabel : '住院号/诊疗号',
+					minChars : 0
+				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				items:[{
+					xtype : 'datefieldWithMin',
+					fieldLabel : '结束日期',
+					id : 'endTime',
+					name : 'endTime',
+					editable : false,
+					format : 'Y-m-d H:i:s',
+					allowBlank : false,
+					anchor : '95%',
+					value: new Date(),
+					listeners : {
+						specialkey : function(field, e) {
+							if (e.getKey() == Ext.EventObject.ENTER) {
+								var isOK = field.validate();
+								if(isOK){
+									var value = field.getValue();
+									field.setValue(value);
 								}
 							}
 						}
-					}]
-				},{
-					layout:'form',
-					columnWidth:.18,
-					labelWidth:100,
-					items:[{
-						xtype : 'textfield',
-						id : 'hospitalNumSearch',
-						name : 'hospitalNumSearch',
-						fieldLabel : '住院号/诊疗号',
-						minChars : 0
-					}]
-				},{
-					layout:'form',
-					columnWidth:.18,
-					labelWidth:60,
-					items:[{
-						xtype : 'combo',
-						id : 'goodsSearch',
-						name : 'goodsSearch',
-						queryParam : 'spell',
-						fieldLabel : '物品',
-						minChars : 0,
-						valueField : 'id',
-						displayField : 'name',
-						store : comboGoodsStore,
-						forceSelection : true,
-						lazyInit : true,
-						anchor : '95%',
-						listWidth:150,
-						triggerAction : 'all',
-						hideTrigger : true,
-						typeAhead : false,
-						allowBlank : true,
-						listeners:{
-							select : function(combo, record, index) {
-								Ext.getCmp('goodsType').setValue(record.data.type);
-							}
+					}
+				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:40,
+				items:[{
+					xtype : 'combo',
+					id : 'goodsSearch',
+					name : 'goodsSearch',
+					queryParam : 'spell',
+					fieldLabel : '物品',
+					listWidth : 200,
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : comboGoodsStore,
+					forceSelection : true,
+					lazyInit : true,
+					anchor : '95%',
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					listeners:{
+						select : function(combo, record, index) {
+							Ext.getCmp('goodsType').setValue(record.data.type);
 						}
-					}]
-				},{
-					layout:'form',
-					columnWidth:.18,
-					labelWidth:100,
-					items:[{
-						xtype : 'combo',
-						id : 'othersGoods',
-						name : 'othersGoods',
-						fieldLabel : '显示同单明细',
-						minChars : 0,
-						valueField : 'value',
-						displayField : 'value',
-						store : yesNoStore,
-						mode : 'local',
-						forceSelection : true,
-						lazyInit : true,
-						anchor : '95%',
-						listWidth:100,
-						triggerAction : 'all',
-						hideTrigger : true,
-						typeAhead : false,
-						allowBlank : true
-					}]
+					}
 				}]
-			}],
-			buttons:[{
-			    xtype : 'button',
-				text : '查询',
-				minWidth : 70,
-				iconCls : 'icon_search',
-				handler : function() {
-					reloadReport(isFirstRoomPeople,orgName,Ext.getCmp('operatorSearch').getRawValue());
-				}
 			},{
-				xtype : 'button',
-				text : '重置',
-				minWidth : 70,
-				iconCls : 'icon_set',
-				handler : function() {
-					form.getForm().reset();
-					$Id('startTime').value = "";
-					$Id('endTime').value = "";
-				}
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:50,
+				items:[{
+					xtype : 'combo',
+					id : 'operatorSearch',
+					name : 'operatorSearch',
+					queryParam : 'spell',
+					fieldLabel : '录入人',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					store : userJsonStore,
+					forceSelection : true,
+					lazyInit : true,
+					anchor : '95%',
+					listWidth:150,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true
+				}]
+			},{
+				layout:'form',
+				columnWidth:.25,
+				labelWidth:100,
+				items:[{
+					xtype : 'combo',
+					id : 'othersGoods',
+					name : 'othersGoods',
+					fieldLabel : '显示同单明细',
+					minChars : 0,
+					valueField : 'value',
+					displayField : 'value',
+					value : STR_YES,
+					store : new Ext.data.SimpleStore({
+						fields : [ 'value'],
+						data : [[STR_YES],[STR_NO]]
+					}),
+					mode : 'local',
+					forceSelection : true,
+					lazyInit : true,
+					anchor : '95%',
+					listWidth:100,
+					triggerAction : 'all',
+					typeAhead : false,
+					listWidth : 130,
+					allowBlank : true
+				}]
 			}]
-		});
-		
-		
-		var reportForm = new Ext.Panel({
-	         frame:false,//渲染面板
-	         autoScroll:true,//自动显示滚动条   
-	         collapsible:true,//允许展开和收缩   
-	         bodyPadding:5,
-	         html:'<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
+		}]
+	});
+	
+	
+	var reportForm = new Ext.Panel({
+         frame:false,//渲染面板
+         autoScroll:true,//自动显示滚动条   
+         collapsible:true,//允许展开和收缩   
+         bodyPadding:5,
+         html:'<iframe id="thisIframe" name="thisIframe" width="100%" height="100%" frameborder=0 src=""></iframe>'
 
-		});
-		
-		var viewport = new Ext.Viewport({
-			layout : 'border',
-			items : [form, {
-				region : 'center',
-				margins : '0 0 0 0',
-				layout : 'fit',
-				items : reportForm
-			}]
-		});
-		reloadReport(isFirstRoomPeople,orgName,userName);
-	});
\ No newline at end of file
+	});
+	
+	var viewport = new Ext.Viewport({
+		layout : 'border',
+		items : [form, {
+			region : 'center',
+			margins : '0 0 0 0',
+			layout : 'fit',
+			items : reportForm
+		}]
+	});
+});
+
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml
===================================================================
diff -u -r14664 -r16986
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml	(.../useRecordItemView.jrxml)	(revision 14664)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml	(.../useRecordItemView.jrxml)	(revision 16986)
@@ -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="1195" pageHeight="800" columnWidth="1195" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="aa4ec591-ebfb-4670-9304-2bfaaab2f169">
-	<property name="ireport.zoom" value="1.1269722013523709"/>
-	<property name="ireport.x" value="423"/>
+<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"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -57,7 +57,7 @@
 	<title>
 		<band height="40" splitType="Stretch">
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1195" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1515" height="40" 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"/>
@@ -97,20 +97,13 @@
 				<text><![CDATA[病人姓名]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="915" y="0" width="230" height="40"/>
+				<reportElement uuid="c2c7241a-6b37-4464-9269-f6ca6b480889" style="table_TH" mode="Opaque" x="1445" y="0" width="70" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械包/一次性物品]]></text>
+				<text><![CDATA[标识牌使用次数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2c7241a-6b37-4464-9269-f6ca6b480889" style="table_TH" mode="Opaque" x="1145" y="0" width="50" height="40"/>
-				<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"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
@@ -131,6 +124,27 @@
 				</textElement>
 				<text><![CDATA[手术名称]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="f8fb14b8-f1ee-4a6b-9abd-362e9a7cd180" style="table_TH" x="915" y="0" width="150" height="40"/>
+				<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="1065" y="0" width="150" height="40"/>
+				<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"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[器械包/一次性物品]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -197,7 +211,7 @@
 					<textFieldExpression><![CDATA[$F{patient}]]></textFieldExpression>
 				</textField>
 				<subreport isUsingCache="false">
-					<reportElement uuid="8d36ec22-bd1f-4d2e-86cc-2f5aa5155d96" stretchType="RelativeToTallestObject" x="915" y="0" width="280" height="40"/>
+					<reportElement uuid="8d36ec22-bd1f-4d2e-86cc-2f5aa5155d96" stretchType="RelativeToTallestObject" x="915" y="0" width="600" height="40"/>
 					<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{enteringTousses})]]></dataSourceExpression>
 					<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "useRecordItemViewSub.jasper"]]></subreportExpression>
 				</subreport>
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java
===================================================================
diff -u -r12331 -r16986
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java	(.../UseRecordEnteringTousse.java)	(revision 12331)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringTousse.java	(.../UseRecordEnteringTousse.java)	(revision 16986)
@@ -7,6 +7,21 @@
 	
 	private Integer amount;
 	
+	/**
+	 * 器械包条码
+	 */
+	private String barcode;
+	
+	/**
+	 * 标识牌条码
+	 */
+	private String idCardInstanceBarcode;
+	
+	/**
+	 * 装配时所绑定的标识牌定义的使用次数
+	 */
+	private Integer useAmount;
+	
 
 	public String getTousseName() {
 		return tousseName;
@@ -23,6 +38,30 @@
 	public void setAmount(Integer amount) {
 		this.amount = amount;
 	}
+
+	public String getBarcode() {
+		return barcode;
+	}
+
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+
+	public String getIdCardInstanceBarcode() {
+		return idCardInstanceBarcode;
+	}
+
+	public void setIdCardInstanceBarcode(String idCardInstanceBarcode) {
+		this.idCardInstanceBarcode = idCardInstanceBarcode;
+	}
+
+	public Integer getUseAmount() {
+		return useAmount;
+	}
+
+	public void setUseAmount(Integer useAmount) {
+		this.useAmount = useAmount;
+	}
+
 	
-	
 }
Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml
===================================================================
diff -u -r14664 -r16986
--- ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml	(.../useRecordItemViewSub.jrxml)	(revision 14664)
+++ ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml	(.../useRecordItemViewSub.jrxml)	(revision 16986)
@@ -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="useRecordItemViewSub.jasper" language="groovy" pageWidth="280" pageHeight="40" columnWidth="280" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0e8c3824-f646-49cc-be24-3d9eb59acb9e">
+<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"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -12,10 +12,17 @@
 	<field name="tousseName" class="java.lang.String">
 		<fieldDescription><![CDATA[tousseName]]></fieldDescription>
 	</field>
+	<field name="barcode" class="java.lang.String">
+		<fieldDescription><![CDATA[barcode]]></fieldDescription>
+	</field>
+	<field name="idCardInstanceBarcode" class="java.lang.String">
+		<fieldDescription><![CDATA[idCardInstanceBarcode]]></fieldDescription>
+	</field>
+	<field name="useAmount" class="java.lang.Integer"/>
 	<detail>
 		<band height="40" splitType="Stretch">
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
-				<reportElement uuid="f0ebf4f1-7bd3-4e2b-ab0d-5083e23aaefb" positionType="Float" stretchType="RelativeToTallestObject" mode="Transparent" x="0" y="0" width="230" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<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"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -30,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="230" y="0" width="50" height="40" forecolor="#000000" backcolor="#FFFFFF"/>
+				<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"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -42,8 +49,38 @@
 					<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{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"/>
+				<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{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"/>
+				<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{idCardInstanceBarcode}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 </jasperReport>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
===================================================================
diff -u -r15836 -r16986
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 15836)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 16986)
@@ -8,18 +8,13 @@
 <%
 SupplyRoomConfigManager configManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
 LoginUserData userData = AcegiHelper.getLoginUser();
-String currentUserOfCoding = userData.getCurrentOrgUnitCode();
-String orgName = userData.getOrgUnitNameCodingFromSupplyRoomConfig();
-String userName = userData.getUserFullName();
-String firstRoomCode = configManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
-request.setAttribute("currentOrgCode", currentUserOfCoding);
-request.setAttribute("orgName", orgName);
-request.setAttribute("userName", userName);
-if(StringUtils.equals(currentUserOfCoding,firstRoomCode)){
-	request.setAttribute("isFirstRoomPeople", true);
-}else{
-	request.setAttribute("isFirstRoomPeople", false);
-}
+String currentOrgUnitCode = userData.getCurrentOrgUnitCode();
+String currentOrgUnitName = userData.getCurrentOrgUnitName();
+
+request.setAttribute("isFirstRoomPeople", configManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
+request.setAttribute("currentOrgUnitCode", currentOrgUnitCode);
+request.setAttribute("currentOrgUnitName", currentOrgUnitName);
+
 %>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -55,10 +50,11 @@
 enableSaveBtn = true;
 </c:if>
 
-var isFirstRoomPeople = ${isFirstRoomPeople};
-var currentOrgCode = ${currentOrgCode};
-var orgName = '${orgName}';
-var userName = '${userName}';
+
+var isFirstRoomPeople = ${isFirstRoomPeople};  //当前登录用户的当前科室是否为一级供应室
+var currentOrgUnitName = '${currentOrgUnitName}';  //当前登录用户的当前科室名称
+var currentOrgUnitCode = '${currentOrgUnitCode}';
+
 var date = new Date();
 var mon = date.getMonth()+1;
 if(mon<10){
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16966 -r16986
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16966)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16986)
@@ -33,6 +33,7 @@
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
+import org.apache.commons.collections4.Transformer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.log4j.Logger;
@@ -45,6 +46,7 @@
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.directory.vo.LoginUserData;
+import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
@@ -79,6 +81,7 @@
 import com.forgon.disinfectsystem.entity.disposablegoods.DisposableGoodsInventory;
 import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
+import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
@@ -245,6 +248,12 @@
 	
 	private FormDefinitionManager formDefinitionManager;
 	
+	private BarcodeManager barcodeManager;
+	
+	public void setBarcodeManager(BarcodeManager barcodeManager) {
+		this.barcodeManager = barcodeManager;
+	}
+	
 	public void setQualityMonitoringDefinitionManager(
 			QualityMonitoringDefinitionManager qualityMonitoringDefinitionManager) {
 		this.qualityMonitoringDefinitionManager = qualityMonitoringDefinitionManager;
@@ -8846,85 +8855,159 @@
 		
 		return mainList;
 	}
+	
+
 	/**
+	 * 获取根据物品id查询的sql语句（注意：此方法适用于本类的getUseRecordItemDataSource方法，其他地方别用）
+	 * @param goodsId	物品id
+	 * @param goodsType	物品类型（器械包或者一次性物品）
+	 * @param showOther	是否显示同单明细
+	 * @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 " 
+				+ "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,'' barcode,'' idCardInstanceBarcode,'' useAmount "
+				+ "from useRecord ur "
+				+ "inner join useDiposableGoodsItem udgi on udgi.userecord_id=ur.id "
+				+ "where 1=1 ";
+		
+		String tempSql = "";
+		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 + ") ";
+				}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
+					String useRecordIds = "select distinct useRecord_id from tousseInstance where tousseDefinition_id in (" + toussedefIds + ") ";
+					tousseInstanceSql += " and ur.id in (" + useRecordIds + ") ";
+				}else{
+					tousseInstanceSql += " and ti.tousseDefinition_id in ( " + toussedefIds + " ) ";
+				}
+				tempSql = tousseInstanceSql;
+			} 
+		} else {
+			tempSql = tousseInstanceSql + " union all " + disposableGoodsSql;
+		}
+		return tempSql;
+		
+	}
+	
+	/**
+	 * 获取扫描条码查询的sql语句（注意：此方法适用于本类的getUseRecordItemDataSource方法，其他地方别用）
+	 * @param barcode	条码（器械包条码或者标识牌条码）
+	 * @param showOther	是否显示同单明细
+	 * @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 " 
+				+ "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 " ;
+		
+		BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode);
+		if (barcodeDevice instanceof IDCardInstance) {  //是标识牌条码
+			IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice;
+			List<TousseInstance> tousseInstances = idCardInstance.getTousseInstances(objectDao);
+			Collection<String> idCollection = CollectionUtils.collect(
+					tousseInstances, new Transformer<TousseInstance, String>() {
+						@Override
+						public String transform(TousseInstance input) {
+							return input.getId().toString();
+						}
+			});
+			
+			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 + ") ";
+			} else {
+				tousseInstanceSql += "and " + tousseInstanceIds;
+			}
+		} 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();
+				} else {
+					tousseInstanceSql += "and ur.id is null ";
+				}
+			} else {
+				tousseInstanceSql += "and ti.id=" + ti.getId();
+			}
+		} else {
+			tousseInstanceSql += "and 1=0 ";
+		}
+		return tousseInstanceSql;
+		
+	}
+	
+	
+	/**
 	 * 使用记录录入明细主数据源
 	 * @throws ParseException 
 	 */
 	@Override
 	public List<UseRecordEnteringBean> getUseRecordItemDataSource(Map<String,String> requestParameters) throws ParseException {
-		String startDay = requestParameters.get("startDay");
-		String endDay = requestParameters.get("endDay");
-		String depart = requestParameters.get("depart");
-		String operatorSearch = requestParameters.get("operatorSearch");
-		String hospitalNumSearch = requestParameters.get("hospitalNum");
-		String goodsId = requestParameters.get("goodsId");
-		String goodsType = requestParameters.get("goodsType");//主要是区分一次性物品和器械包,然后根据这个类型,就知道goodsId是TousseDefinition的id还是DisposableGoods的id
-		boolean showOther = !StringTools.equals("否",requestParameters.get("showOther"));
-		List<UseRecordEnteringBean> enteringBeans = new ArrayList<UseRecordEnteringBean>();
-		//只有选择了起始时间和结束时间才返回数据,避免返回太大数据量
+		String startDay = requestParameters.get("startDay");  //开始时间
+		String endDay = requestParameters.get("endDay");  //结束时间
+		String depart = requestParameters.get("depart");  //使用科室的名称
+		String operatorSearch = requestParameters.get("operatorSearch");  //录入人名字
+		String hospitalNumSearch = requestParameters.get("hospitalNum");  //住院号/诊疗号
+		String goodsId = requestParameters.get("goodsId");  //物品id
+		boolean showOther  = !StringTools.equals("否",requestParameters.get("showOther"));  //是否需要显示同单明细
+		String goodsType = requestParameters.get("goodsType");  //主要是区分一次性物品和器械包,然后根据这个类型,就知道goodsId是TousseDefinition的id还是DisposableGoods的id
+		String barcode = requestParameters.get("barcode");  //条码
+		
+		
 		if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
-			if(StringTools.equals("全部",depart)){
-				depart = "";
-			}
-			String datePattern = "yyyy-MM-dd HH:mm:ss";
-			SimpleDateFormat dateFormat = new SimpleDateFormat(datePattern);
-			List<Object> params = new ArrayList<Object>();
-			String tousseInstanceSql = " select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate" 
-					+ ",ur.doctorName,ur.operation"  //（陈家儒改）
-					+ ",ti.tousseName as name,1 as amount" + " from "
-					+ UseRecord.class.getSimpleName() +" ur inner join " 
-					+ TousseInstance.class.getSimpleName() + " ti on ti.useRecord_id=ur.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 as name,udgi.amount as amount from "+UseRecord.class.getSimpleName() + " ur inner join "
-					+ UseDiposableGoodsItem.class.getSimpleName() + " udgi on udgi.userecord_id=ur.id where 1=1 ";
 			String sql = "";
-			if(StringTools.isNotBlank(goodsId)){
-				if(StringTools.equals("一次性物品", goodsType)){
-					if(showOther){
-						//显示同单的其他物品,使用子查询,使用记录的id必须是使用此物品的使用记录的id
-						String useRecordIds = " select distinct userecord_id from " + UseDiposableGoodsItem.class.getSimpleName() 
-									+  " where disposableGoodsId=" + goodsId;
-						disposableGoodsSql += " and ur.id in ( " + useRecordIds + " ) ";
-					}else{
-						//不显示同单下的其他的物品,直接比较一次性物品定义的id就可以了
-						disposableGoodsSql += " and udgi.disposableGoodsId=" + goodsId;
-					}
-					sql = disposableGoodsSql;
-				}else{
-					//由于器械包的包定义的id,有可能是由其他包定义生成的(消毒物品\自定义器械包),而goodsId是祖先id,所以要先查出goodsId的后代id
-					String toussedefIds = " select id from " + TousseDefinition.class.getSimpleName() + " where ancestorID=" + goodsId;
-					if(showOther){
-						//显示同单的其他物品,使用子查询,使用记录的id必须是使用此物品的使用记录的id
-						String useRecordIds = " select distinct useRecord_id from " + TousseInstance.class.getSimpleName() 
-									+  " where tousseDefinition_id in ( " + toussedefIds + " ) ";
-						tousseInstanceSql += " and ur.id in ( " + useRecordIds + " ) ";
-					}else{
-						//不显示同单下的其他的物品,直接比较器械包定义的id就可以了
-						tousseInstanceSql += " and ti.tousseDefinition_id in ( " + toussedefIds + " ) ";
-					}
-					sql = tousseInstanceSql;
-				}
-			}else{
-				sql = tousseInstanceSql + " union all " + disposableGoodsSql;
+			if (StringUtils.isNotBlank(barcode)) {  //扫条码查询（器械包条码或者标识牌条码）
+				sql = getSqlByBarcode(barcode, showOther);
+			} else {  //如果不是扫条码，则按照物品id查询
+				sql = getSqlByGoodsId(goodsId, goodsType, showOther);
 			}
+			
+			
 			sql = "select * from ( " + sql + " ) m  where 1=1 ";
-			if(StringUtils.isNotBlank(depart)){
+			if(StringUtils.isNotBlank(depart) && !depart.equals("全部")){  //使用科室的名称
 				sql += " and m.depart='"+ depart +"' ";
 			}
-			if(StringUtils.isNotBlank(operatorSearch)){
+			
+			if(StringUtils.isNotBlank(operatorSearch)){  //录入人名字
 				sql += " and m.operator='"+ operatorSearch +"' ";
 			}
-			if(StringTools.isNotBlank(hospitalNumSearch)){
+			
+			if(StringTools.isNotBlank(hospitalNumSearch)){  //住院号/诊疗号
 				sql += " and (m.hospitalNum='" + hospitalNumSearch + "' or m.treatmentNum='"+ hospitalNumSearch +"') ";
 			}
-			sql += " and " + dateQueryAdapter.dateAreaSql("m.enteringDate", startDay, endDay, false);
 			
+			sql += " and " + dateQueryAdapter.dateAreaSql("m.enteringDate", startDay, endDay, false);  //查询的时间段
 			sql += " order by m.enteringDate desc ";
 			
-			logger.debug("getUseRecordItemDataSource sql=" + sql);
+			List<UseRecordEnteringBean> enteringBeans = new ArrayList<UseRecordEnteringBean>();
 			ResultSet rs = objectDao.executeSql(sql);
-			 try {
+			try {
 				while (rs.next()) {
 					Long userecordId = rs.getLong("id");
 					UseRecordEnteringBean enteringBean = CollectionUtils.find(enteringBeans, new Predicate<UseRecordEnteringBean>(){
@@ -8935,41 +9018,190 @@
 					});
 					if(enteringBean == null){
 						enteringBean = new UseRecordEnteringBean();
-						String hospitalNum = StringTools.defaultString(
-								StringTools.defaultIfEmpty(rs.getString("hospitalNum"),rs.getString("treatmentNum"))); 
+						String hospitalNum = StringTools.defaultString(StringTools.defaultIfEmpty(rs.getString("hospitalNum"),rs.getString("treatmentNum")));
+						
 						enteringBean.setUseRecordId(userecordId);
 						enteringBean.setDepart(StringTools.defaultString(rs.getString("depart")));
 						enteringBean.setPatient(StringTools.defaultString(rs.getString("patientName")));
 						enteringBean.setHospotalNum(hospitalNum);
 						enteringBean.setOperator(StringTools.defaultString(rs.getString("operator")));
-						enteringBean.setEnterTime(dateFormat.format(rs.getTimestamp("enteringDate")));
-						enteringBean.setDoctorName(rs.getString("doctorName"));  //（陈家儒改）
-						enteringBean.setOperation(rs.getString("operation"));  //（陈家儒改）
+						enteringBean.setEnterTime(Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS.format(rs.getTimestamp("enteringDate")));
+						enteringBean.setDoctorName(rs.getString("doctorName"));
+						enteringBean.setOperation(rs.getString("operation"));
 						enteringBeans.add(enteringBean);
 					}
 					String name = StringTools.defaultString(rs.getString("name"));
 					int amount = rs.getInt("amount");
-					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());
+					String tousseInstanceBarcode = rs.getString("barcode");
+					String idCardInstanceBarcode = rs.getString("idCardInstanceBarcode");
+					int useAmount = rs.getInt("useAmount");
+					
+					
+					UseRecordEnteringTousse tousse = new UseRecordEnteringTousse();
+					tousse.setTousseName(name);
+					tousse.setAmount(amount);
+					tousse.setBarcode(tousseInstanceBarcode);
+					tousse.setIdCardInstanceBarcode(idCardInstanceBarcode);
+					tousse.setUseAmount(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);
 			}
+			return enteringBeans;
 		}
-		return enteringBeans;
+		
+		return new ArrayList<UseRecordEnteringBean>();
+		
 	}
+//	/**
+//	 * 使用记录录入明细主数据源
+//	 * @throws ParseException 
+//	 */
+//	@Override
+//	public List<UseRecordEnteringBean> getUseRecordItemDataSource3(Map<String,String> requestParameters) throws ParseException {
+//		String startDay = requestParameters.get("startDay");
+//		String endDay = requestParameters.get("endDay");
+//		String depart = requestParameters.get("depart");
+//		String operatorSearch = requestParameters.get("operatorSearch");
+//		String hospitalNumSearch = requestParameters.get("hospitalNum");
+//		String goodsId = requestParameters.get("goodsId");
+//		String goodsType = requestParameters.get("goodsType");//主要是区分一次性物品和器械包,然后根据这个类型,就知道goodsId是TousseDefinition的id还是DisposableGoods的id
+//		boolean showOther = !StringTools.equals("否",requestParameters.get("showOther"));
+//		List<UseRecordEnteringBean> enteringBeans = new ArrayList<UseRecordEnteringBean>();
+//		//只有选择了起始时间和结束时间才返回数据,避免返回太大数据量
+//		if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
+//			if(StringTools.equals("全部",depart)){
+//				depart = "";
+//			}
+//			String datePattern = "yyyy-MM-dd HH:mm:ss";
+//			SimpleDateFormat dateFormat = new SimpleDateFormat(datePattern);
+//			List<Object> params = new ArrayList<Object>();
+//			String tousseInstanceSql = " select ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate" 
+//					+ ",ur.doctorName,ur.operation"  //（陈家儒改）
+//					+ ",ti.tousseName as name,1 as amount" + " from "
+//					+ UseRecord.class.getSimpleName() +" ur inner join " 
+//					+ TousseInstance.class.getSimpleName() + " ti on ti.useRecord_id=ur.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 as name,udgi.amount as amount from "+UseRecord.class.getSimpleName() + " ur inner join "
+//					+ UseDiposableGoodsItem.class.getSimpleName() + " udgi on udgi.userecord_id=ur.id where 1=1 ";
+//			String sql = "";
+//			if(StringTools.isNotBlank(goodsId)){
+//				if(StringTools.equals("一次性物品", goodsType)){
+//					if(showOther){
+//						//显示同单的其他物品,使用子查询,使用记录的id必须是使用此物品的使用记录的id
+//						String useRecordIds = " select distinct userecord_id from " + UseDiposableGoodsItem.class.getSimpleName() 
+//									+  " where disposableGoodsId=" + goodsId;
+//						disposableGoodsSql += " and ur.id in ( " + useRecordIds + " ) ";
+//					}else{
+//						//不显示同单下的其他的物品,直接比较一次性物品定义的id就可以了
+//						disposableGoodsSql += " and udgi.disposableGoodsId=" + goodsId;
+//					}
+//					sql = disposableGoodsSql;
+//				}else{
+//					//由于器械包的包定义的id,有可能是由其他包定义生成的(消毒物品\自定义器械包),而goodsId是祖先id,所以要先查出goodsId的后代id
+//					String toussedefIds = " select id from " + TousseDefinition.class.getSimpleName() + " where ancestorID=" + goodsId;
+//					if(showOther){
+//						//显示同单的其他物品,使用子查询,使用记录的id必须是使用此物品的使用记录的id
+//						String useRecordIds = " select distinct useRecord_id from " + TousseInstance.class.getSimpleName() 
+//									+  " where tousseDefinition_id in ( " + toussedefIds + " ) ";
+//						tousseInstanceSql += " and ur.id in ( " + useRecordIds + " ) ";
+//					}else{
+//						//不显示同单下的其他的物品,直接比较器械包定义的id就可以了
+//						tousseInstanceSql += " and ti.tousseDefinition_id in ( " + toussedefIds + " ) ";
+//					}
+//					sql = tousseInstanceSql;
+//				}
+//			}else{
+//				sql = tousseInstanceSql + " union all " + disposableGoodsSql;
+//			}
+//			sql = "select * from ( " + sql + " ) m  where 1=1 ";
+//			if(StringUtils.isNotBlank(depart)){
+//				sql += " and m.depart='"+ depart +"' ";
+//			}
+//			if(StringUtils.isNotBlank(operatorSearch)){
+//				sql += " and m.operator='"+ operatorSearch +"' ";
+//			}
+//			if(StringTools.isNotBlank(hospitalNumSearch)){
+//				sql += " and (m.hospitalNum='" + hospitalNumSearch + "' or m.treatmentNum='"+ hospitalNumSearch +"') ";
+//			}
+//			sql += " and " + dateQueryAdapter.dateAreaSql("m.enteringDate", startDay, endDay, false);
+//			
+//			sql += " order by m.enteringDate desc ";
+//			
+//			logger.debug("getUseRecordItemDataSource sql=" + sql);
+//			ResultSet rs = objectDao.executeSql(sql);
+//			 try {
+//				while (rs.next()) {
+//					Long userecordId = rs.getLong("id");
+//					UseRecordEnteringBean enteringBean = CollectionUtils.find(enteringBeans, new Predicate<UseRecordEnteringBean>(){
+//						@Override
+//						public boolean evaluate(UseRecordEnteringBean object) {
+//							return MathTools.equals(userecordId, object.getUseRecordId());
+//						}
+//					});
+//					if(enteringBean == null){
+//						enteringBean = new UseRecordEnteringBean();
+//						String hospitalNum = StringTools.defaultString(
+//								StringTools.defaultIfEmpty(rs.getString("hospitalNum"),rs.getString("treatmentNum"))); 
+//						enteringBean.setUseRecordId(userecordId);
+//						enteringBean.setDepart(StringTools.defaultString(rs.getString("depart")));
+//						enteringBean.setPatient(StringTools.defaultString(rs.getString("patientName")));
+//						enteringBean.setHospotalNum(hospitalNum);
+//						enteringBean.setOperator(StringTools.defaultString(rs.getString("operator")));
+//						enteringBean.setEnterTime(dateFormat.format(rs.getTimestamp("enteringDate")));
+//						enteringBean.setDoctorName(rs.getString("doctorName"));  //（陈家儒改）
+//						enteringBean.setOperation(rs.getString("operation"));  //（陈家儒改）
+//						enteringBeans.add(enteringBean);
+//					}
+//					
+//					String name = StringTools.defaultString(rs.getString("name"));
+//					int amount = rs.getInt("amount");
+//					
+//					UseRecordEnteringTousse tousse = new UseRecordEnteringTousse();
+//					tousse.setTousseName(name);
+//					tousse.setAmount(amount);
+//					enteringBean.getEnteringTousses().add(tousse);
+//					
+////					String name = StringTools.defaultString(rs.getString("name"));
+////					int amount = rs.getInt("amount");
+////					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);
+//			}
+//		}
+//		return enteringBeans;
+//	}
 	
 	@Override
 	public List<UseRecordOperatorBean> getUseRecordOperatorTotalViewData(
Index: forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
===================================================================
diff -u -r15634 -r16986
--- forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 15634)
+++ forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 16986)
@@ -248,10 +248,9 @@
 	}
 
 	/**
-	 * 根据部门id加载该部门下的所有用户
-	 * @return
-	 * 2014-8-28
-	 * forgonString
+	 * 根据科室编码加载该科室下的所有用户
+	 * 
+	 * @param departId	如果departId为空则返回所有科室的所有用户
 	 */
 	public void loadUserByOrgId(){
 		String id = StrutsParamUtils.getPraramValue("departId", "-1");
@@ -273,7 +272,9 @@
 			for (User user : users) {
 				falg = true;
 				buffer.append("{'id':'").append(user.getId()).append("'");
-				buffer.append(",'name':'").append(user.getFullName()).append("'},");
+				String fullName = user.getFullName();
+				fullName = (StringUtils.isNotBlank(fullName) ? fullName.replaceAll("\r\n", "") : "");  //旧数据的人员名字有换行符，在此替换掉
+				buffer.append(",'name':'").append(fullName).append("'},");
 			}
 		}
 		if(falg){