Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp
===================================================================
diff -u -r12331 -r14181
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp	(.../useRecordItemView.jsp)	(revision 14181)
@@ -1,4 +1,5 @@
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
@@ -21,6 +22,7 @@
 %>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js"></script>
@@ -34,6 +36,9 @@
 
 <script type="text/javascript">
 
+var STR_YES = '<%=Constants.STR_YES %>';//是
+var STR_NO = '<%=Constants.STR_NO %>';//否
+
 var SSTS_USERECORD_TOTAL_VIEW = true;
 <operation:authorize ifAnyGranted="SSTS_USERECORD_TOTAL_VIEW">
 SSTS_USERECORD_TOTAL_VIEW = false;
Index: forgon-tools/src/main/java/com/forgon/tools/MathTools.java
===================================================================
diff -u -r13158 -r14181
--- forgon-tools/src/main/java/com/forgon/tools/MathTools.java	(.../MathTools.java)	(revision 13158)
+++ forgon-tools/src/main/java/com/forgon/tools/MathTools.java	(.../MathTools.java)	(revision 14181)
@@ -83,6 +83,15 @@
 		return new BigDecimal(a.doubleValue()).add(new BigDecimal(b.doubleValue()));
 	}
 	/**
+	 * 判断a和b是否相等
+	 * @param a 可能为null
+	 * @param b 可能为null
+	 * @return
+	 */
+	public static boolean equals(Number a,Number b){
+		return a == null?b==null:a.equals(b);
+	}
+	/**
 	 * 计算两个数的差
 	 * @param a 被减数,可以为null,此时认为值为0.0
 	 * @param b 减数,可以为null,此时认为值为0.0
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r14169 -r14181
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14169)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14181)
@@ -212,29 +212,25 @@
 	 * javabean做数据源。
 	 */
 	public String createReportFromJavaBeanSource() {
+		Map<String,String> parameters = StrutsParamUtils.getParameters();
 		String fileName = "未命名";
-		String jasperreportName = StrutsParamUtils.getPraramValue(
-				"jasperreportName", "");
+		String jasperreportName = parameters.get("jasperreportName");
 		String rootPath = StrutsParamUtils.getRequest().getSession()
 				.getServletContext().getRealPath("");
 		String realPath = rootPath + "\\jasperRtp\\" + jasperreportName;// 报表文件workload.jasper路径
 		if (StringUtils
 				.equals("workQualityCollection.jasper", jasperreportName)) {
-			if (StringUtils.equals(StrutsParamUtils.getPraramValue("type", ""),
-					"split")) {
+			if (StringUtils.equals(parameters.get("type"),"split")) {
 				realPath = rootPath
 						+ "\\jasperRtp\\workQualityCollection2.jasper";
-			} else if (StringUtils.equals(
-					StrutsParamUtils.getPraramValue("type", ""),
-					"compareToLastYear")) {
+			} else if (StringUtils.equals(parameters.get("type"),"compareToLastYear")) {
 				realPath = rootPath
 						+ "\\jasperRtp\\workQualityCollection3.jasper";
 			}
 		}
 		try {
-			String reportName = StrutsParamUtils.getPraramValue("reportName",
-					"");// 模块名称，根据不同的报表配置不同的参数
-			List dataSourceList = getDataSourceList(reportName);
+			String reportName = parameters.get("reportName");// 模块名称，根据不同的报表配置不同的参数
+			List dataSourceList = getDataSourceList(reportName,parameters);
 			JRDataSource dataSource = new JRBeanCollectionDataSource(
 					dataSourceList);
 			Map<String, Object> parametMap = getParametMap(reportName);
@@ -256,12 +252,13 @@
 	/**
 	 * 获取需要的bean数据源
 	 * 
-	 * @param reportName
+	 * @param reportName 报表的名称,不同的报表有不同的名称,加以区分
+	 * @param requestParameters http请求的参数
 	 * @return
 	 * @throws SQLException
 	 * @throws ParseException
 	 */
-	public List getDataSourceList(String reportName) throws SQLException,
+	public List getDataSourceList(String reportName,Map<String,String> requestParameters) throws SQLException,
 			ParseException {
 		if (reportName.equals("stocktakereport")) {// 物资收发明细
 			Long warehouseId = StrutsParamUtils.getPraramLongValue("warehouseId", null);
@@ -677,9 +674,9 @@
 					
 		}else if (reportName.equals("useRecordTotalView")) {//使用记录录入统计报表
 			return getUseRecordDataSource();
-		}else if (reportName.equals("useRecordItemView")) {//使用记录录入统计报表
-			return getUserRecordItemDataSource();
-		}else if (reportName.equals("useRecordOperatorTotalView")) {//使用记录明细报表
+		}else if (reportName.equals("useRecordItemView")) {//使用记录录入明细报表
+			return jasperReportManager.getUseRecordItemDataSource(requestParameters);
+		}else if (reportName.equals("useRecordOperatorTotalView")) {//使用记录人员汇总报表
 			return getUserRecordOperatorTotalViewDataSource();
 		} else if ("materialDamageItemView".equals(reportName)) {
 			return getMaterialDamageItemViewDataSource();
@@ -918,27 +915,6 @@
 	}
 	
 	/**
-	 * 使用记录录入明细报表数据源
-	 * @return
-	 * 2014-8-27
-	 * forgonList
-	 */
-	private List<UseRecordEnteringBean> getUserRecordItemDataSource() throws ParseException {
-		List<UseRecordEnteringBean> list = new ArrayList<UseRecordEnteringBean>();
-		String startDay = StrutsParamUtils.getPraramValue("startDay", null);
-		String endDay = StrutsParamUtils.getPraramValue("endDay", null);
-		String depart = StrutsParamUtils.getPraramValue("depart", "");
-		String operatorSearch = StrutsParamUtils.getPraramValue("operatorSearch", "");
-		if(depart.equals("全部")){
-			depart = "";
-		}
-		if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
-			list = jasperReportManager.getUseRecordItemDataSource(startDay , endDay,depart,operatorSearch);
-		}
-		return list;
-	}
-	
-	/**
 	 * 获取包装区工作量不合格率数据源
 	 * 
 	 * @return 返回不合格率bean集合
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js
===================================================================
diff -u -r12607 -r14181
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 12607)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js	(.../useRecordItemView.js)	(revision 14181)
@@ -6,6 +6,11 @@
 	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();*/////
@@ -17,7 +22,10 @@
 		removeMask: true
 	});
 	myMask.show();
-	window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName=useRecordItemView.jasper&startDay="+startTime+"&endDay="+endTime+"&reportName=useRecordItemView&depart="+departSearch+"&operatorSearch="+operatorSearch,'thisIframe','_self');
+	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');
 }
 Ext.onReady(function(){
 	Ext.QuickTips.init();
@@ -41,7 +49,30 @@
 			}
 		}
 	});
-	
+	var comboGoodsRecord = Ext.data.Record.create([
+   		    {name : 'id',mapping : 'id'},
+		    {name : 'tousseDefinitionID'},
+		    {name : 'type',mapping : 'type'}, 
+		    {name : 'tousseType',mapping : 'tousseType'},
+		    {name : 'name',mapping : 'name'}
+		]);
+	//物品选择下拉框数据源
+	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";
 	
@@ -76,12 +107,16 @@
 			border : 0,
 			frame : true,
 			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 105,
+			height : 135,
 			items : [{
 				layout : 'column',
 //				height : 40,
 				labelWidth : 60,
 				items : [{
+						xtype : 'hidden',
+						name : 'goodsType',
+						id : 'goodsType'
+					},{
 					layout:'form',
 					columnWidth:.2,
 					items:[{
@@ -198,6 +233,68 @@
 							}
 						}
 					}]
+				},{
+					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:.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:[{
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r14153 -r14181
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 14153)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 14181)
@@ -257,8 +257,7 @@
 	 * 2014-9-3
 	 * @throws ParseException 
 	 */
-	public List<UseRecordEnteringBean> getUseRecordItemDataSource(
-			String startDay, String endDay, String depart, String operatorSearch) throws ParseException;
+	public List<UseRecordEnteringBean> getUseRecordItemDataSource(Map<String,String> requestParameters) throws ParseException;
 
 	/**
 	 * @param sql
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java
===================================================================
diff -u -r14163 -r14181
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java	(.../UseRecordEnteringBean.java)	(revision 14163)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/UseRecordEnteringBean.java	(.../UseRecordEnteringBean.java)	(revision 14181)
@@ -18,6 +18,10 @@
 	
 	private String patient;//病人
 	/**
+	 * 使用记录id
+	 */
+	private Long useRecordId;
+	/**
 	 * 住院号或者诊疗号
 	 */
 	private String hospotalNum;
@@ -64,13 +68,19 @@
 		this.patient = patient;
 	}
 
+	public Long getUseRecordId() {
+		return useRecordId;
+	}
+
+	public void setUseRecordId(Long useRecordId) {
+		this.useRecordId = useRecordId;
+	}
+
 	public String getHospotalNum() {
 		return hospotalNum;
 	}
 
 	public void setHospotalNum(String hospotalNum) {
 		this.hospotalNum = hospotalNum;
 	}
-
-	
 }
Index: forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java
===================================================================
diff -u -r12331 -r14181
--- forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java	(.../StrutsParamUtils.java)	(revision 12331)
+++ forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java	(.../StrutsParamUtils.java)	(revision 14181)
@@ -1,11 +1,16 @@
 package com.forgon.tools;
 
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.ServletActionContext;
+import com.forgon.tools.string.StringTools;
 
 /**
  * @author yuanbin
@@ -77,4 +82,19 @@
 	public static ServletContext getServletContext(){
 		return ServletActionContext.getServletContext();
 	}
+	/**
+	 * 获取request中所有的参数,以key-value的map形式返回。这个方法只获取参数的值只有一个的情况。如果参数值有多个,只返回第一个值
+	 * @return 包含参数名称的参数值的map，key为参数名称,value为参数值
+	 */
+	public static Map<String,String> getParameters(){
+		HttpServletRequest request = getRequest();
+		HashMap<String,String> map = new HashMap<String,String>();
+		Enumeration<String> it = request.getParameterNames();
+		while(it.hasMoreElements()){
+			String name = it.nextElement();
+			String value = StringTools.defaultIfEmpty(request.getParameter(name),StringTools.EMPTY);
+			map.put(name, value);
+		}
+		return map;
+	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14180 -r14181
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14180)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14181)
@@ -6785,94 +6785,125 @@
 		
 		return mainList;
 	}
-
 	/**
 	 * 使用记录录入明细主数据源
 	 * @throws ParseException 
 	 */
 	@Override
-	public List<UseRecordEnteringBean> getUseRecordItemDataSource(String startDay,
- String endDay,String departSearch,String operatorSearch) throws ParseException {
-		String datePattern = "yyyy-MM-dd HH:mm:ss";
-		SimpleDateFormat dateFormat = new SimpleDateFormat(datePattern);
-		List<Object> params = new ArrayList<Object>();
-		//Date start = startDay == null? dateFormat.parse(nowStr +" 00:00:00"):dateFormat.parse(startDay +" 00:00:00");
-		//Date end = endDay == null?dateFormat.parse(nowStr +" 23:59:59"):dateFormat.parse(endDay +" 23:59:59");
-		String sql = " from "+ UseRecord.class.getSimpleName() +" po where 1=1 " ;
-		if(StringUtils.isNotBlank(departSearch)){
-			sql += " and po.depart=? ";
-			params.add(departSearch);
-		}
-		if(StringUtils.isNotBlank(operatorSearch)){
-			sql += " and po.operator=? ";
-			params.add(operatorSearch);
-		}
-		if(StringUtils.isNotBlank(startDay)){
-			sql += " and po.enteringDate >= ? ";
-			params.add(dateFormat.parse(startDay));
-		}
-		if(StringUtils.isNotBlank(endDay)){
-			sql += " and po.enteringDate <= ? ";
-			params.add(dateFormat.parse(endDay));
-		}
-		sql += " order by po.enteringDate desc ";
-		List<UseRecord> useRecords = objectDao.findByParam(sql,params.toArray() );
+	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>();
-
-		for (UseRecord record : useRecords) {
-			String hospitalNum = StringTools.defaultIfEmpty(
-					StringTools.isNotBlank(record.getHospitalNum())?record.getHospitalNum():record.getTreatmentNum(), ""); 
-			UseRecordEnteringBean enteringBean = new UseRecordEnteringBean();
-			enteringBean.setDepart(record.getDepart());
-			enteringBean.setPatient(record.getPatientName());
-			enteringBean.setHospotalNum(hospitalNum);
-			enteringBean.setOperator(record.getOperator());
-			enteringBean.setEnterTime(dateFormat.format(record
-					.getEnteringDate()));
-			List<UseRecordEnteringTousse> enteringTousses = getEnteringTousses(record);
-			enteringBean.setEnteringTousses(enteringTousses);
-			enteringBeans.add(enteringBean);
-		}
-		/*System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
-		System.out.println(JSONArray.fromObject(enteringBeans).toString());
-		System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");*/
-		
-		return enteringBeans;
-	}
-
-	/**
-	 * @param record
-	 * @return
-	 * 2014-9-3
-	 */
-	private List<UseRecordEnteringTousse> getEnteringTousses(UseRecord record) {
-
-		List<UseRecordEnteringTousse> enteringTousses = new ArrayList<UseRecordEnteringTousse>();
-		List<TousseInstance> instances = tousseInstanceManager.findTousseInstanceListByUseRecordId(record.getId());
-		Map<String, Integer> map = new HashMap<String, Integer>();
-		for (TousseInstance tousseInstance : instances) {
-			String tousseName = tousseInstance.getTousseDefinitionName();
-			if(map.containsKey(tousseName)){
-				map.put(tousseName, map.get(tousseName)+1);
-			}else{
-				map.put(tousseName, 1);
+		//只有选择了起始时间和结束时间才返回数据,避免返回太大数据量
+		if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){
+			if(StringTools.equals("全部",depart)){
+				depart = "";
 			}
-		}
-		for(UseDiposableGoodsItem item : record.getDiposableGoodsItems()){
-			if(map.containsKey(item.getName())){
-				map.put(item.getName(),MathTools.add(map.get(item.getName()), item.getAmount()).intValue());
+			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" 
+					+ ",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"
+					+ ",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{
-				map.put(item.getName(), item.getAmount());
+				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 ";
+			
+			System.out.println("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")));
+						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());
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}finally {
+				DatabaseUtil.closeResultSetAndStatement(rs);
+			}
 		}
-		for (Entry<String, Integer> entry : map.entrySet()) {
-			UseRecordEnteringTousse enteringTousse = new UseRecordEnteringTousse();
-			enteringTousse.setTousseName(entry.getKey());
-			enteringTousse.setAmount(entry.getValue());
-			enteringTousses.add(enteringTousse);
-		}
-		return enteringTousses;
-	
+		return enteringBeans;
 	}
 	
 	@Override
