Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r14913 -r14930
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 14913)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 14930)
@@ -111,7 +111,7 @@
 	public boolean checkTousseInstanceHasRecallByTousseInstanceId(
 			Long tousseInstanceId);
 	
-	public void exportQueryTousseInstance(String sql,String sql2,boolean selectAll,OutputStream ops);
+	public void exportQueryTousseInstance(String sql,boolean selectAll,OutputStream ops);
 	
 	public List<TousseInstance> getTousseInstanceBySql(String sql);
 	
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp
===================================================================
diff -u -r14919 -r14930
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp	(.../exportQueryTousse.jsp)	(revision 14919)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp	(.../exportQueryTousse.jsp)	(revision 14930)
@@ -1,6 +1,7 @@
 <%@page import="com.forgon.disinfectsystem.entity.packing.ReviewedBasket"%>
 <%@page import="com.forgon.databaseadapter.service.DateQueryAdapter"%>
 <%@page import="com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance"%>
 <%@page import="java.util.Date"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="com.forgon.disinfectsystem.stocktakerecordmanager.service.StockTakeRecordManager"%>
@@ -14,48 +15,52 @@
 DateQueryAdapter dateQueryAdapter = (DateQueryAdapter)SpringBeanManger.getBean("dateQueryAdapter");
 
 String barcode  = request.getParameter("barcode");
-String sterilizationDate  = request.getParameter("sterilizationDate");
+String tousseName  = request.getParameter("tousseName");
+String sterilizationStartDate  = request.getParameter("sterilizationDate");
 String sterilizationEndDate  = request.getParameter("sterilizationEndDate");
 String sterilizerName  = request.getParameter("sterilizerName");
 String frequency = request.getParameter("frequency");
-String sql = " where 1=1 ";
+String sql = "";
 boolean selectAll = true;
-if (StringUtils.isNotBlank(sterilizationDate)
+if (StringUtils.isNotBlank(sterilizationStartDate)
+		|| StringUtils.isNotBlank(sterilizationEndDate)
         || StringUtils.isNotBlank(sterilizerName)
-        || StringUtils.isNotBlank(frequency)) {
+        || StringUtils.isNotBlank(frequency)
+        || StringUtils.isNotBlank(tousseName)
+        || StringUtils.isNotBlank(barcode)) {
 	selectAll = false;
 }
 
-if (StringUtils.isNotBlank(sterilizationDate)) {
-    sql += " and sr.startDate >= "
-            + dateQueryAdapter.dateAdapter(sterilizationDate
+if (StringUtils.isNotBlank(sterilizationStartDate)) {
+    sql += " and " +  dateQueryAdapter.stringFieldToDate("po.sterileStartTime")
+            + " >= " + dateQueryAdapter.dateAdapter(sterilizationStartDate
                     + " 00:00:00");
 }
 
 if (StringUtils.isNotBlank(sterilizationEndDate)) {
-    sql += " and sr.startDate <= "
-            + dateQueryAdapter.dateAdapter(sterilizationEndDate
+    sql += " and " +  dateQueryAdapter.stringFieldToDate("po.sterileEndTime")
+            + " <= " +dateQueryAdapter.dateAdapter(sterilizationEndDate
                     + " 23:59:59");
 }
 if (StringUtils.isNotBlank(sterilizerName)) {
-    sql += " and sr.sterilizer.name = '" + sterilizerName + "'";
+    sql += " and po.sterilizerName = '" + sterilizerName + "'";
 }
 if (StringUtils.isNotBlank(frequency)) {
-    sql += " and sr.frequency = " + frequency;
+    sql += " and po.sterileFrequency = '" + frequency + "'";
 }
+if (StringUtils.isNotBlank(tousseName)) {
+    sql += " and po.tousseName = '" + tousseName + "'";
+}
 if (StringUtils.isNotBlank(barcode)) {
-    sql = " where 1=1 and po.barcode = '" + barcode + "'";
+    sql = " and po.barcode = '" + barcode + "'";
 }
+
 String listSql = "select po from "
-        + ReviewedBasket.class.getSimpleName()
-        + " rb right join rb.tousseInstances po inner join po.sterilizationRecords sr "
+		+ TousseInstance.class.getSimpleName()
+        + " po where 1=1 "
         + sql + " order by po.operationTime desc ";
-String basketTousseSql = "select po from "
-        + ReviewedBasket.class.getSimpleName()
-        + " rb right join rb.tousseInstances po inner join rb.sterilizationRecords sr "
-        + sql + " order by po.operationTime desc";
 
-tousseInstanceManager.exportQueryTousseInstance(listSql,basketTousseSql,selectAll,response.getOutputStream());
+tousseInstanceManager.exportQueryTousseInstance(listSql,selectAll,response.getOutputStream());
 servletOutputStream.flush();
 out.clear();
 out = pageContext.pushBody();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r14924 -r14930
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 14924)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 14930)
@@ -858,8 +858,7 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void exportQueryTousseInstance(String sql, String sql2,
-			boolean selectAll, OutputStream ops) {
+	public void exportQueryTousseInstance(String sql,boolean selectAll, OutputStream ops) {
 		List<TousseInstance> tousseList = new ArrayList<TousseInstance>();
 		if (selectAll) {
 			tousseList = objectDao.findAllObjects(TousseInstance.class
@@ -870,14 +869,6 @@
 						sql);
 				tousseList = basketQr.list();
 			}
-			if (StringUtils.isNotBlank(sql2)) {
-				Query basketQr = objectDao.getHibernateSession().createQuery(
-						sql2);
-				List<TousseInstance> list = basketQr.list();
-				for (TousseInstance tousseInstance : list) {
-					tousseList.add(tousseInstance);
-				}
-			}
 		}
 		createExportFile(tousseList, ops);
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r14553 -r14930
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 14553)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 14930)
@@ -375,14 +375,16 @@
 				var sterilizationEndDate = $Id('sterilizationEndDate').value;
 				var sterilizerName = $Id('sterilizerName').value;
 				var frequency = $Id('frequency').value;
+				var tousseName = $Id('tousseName').value;
 				location.href = WWWROOT
 						+ "/disinfectsystem/toussemanager/tousseinstancemanager/exportQueryTousse.jsp?barcode="
 						+ barcodeSearch + "&sterilizationDate="
 						+ sterilizationDate
 						+ "&sterilizationEndDate="
 						+ sterilizationEndDate + "&sterilizerName="
 						+ sterilizerName + "&frequency="
-						+ frequency;
+						+ frequency + "&tousseName="
+						+ tousseName;
 			}
 		}];