Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r15075 -r15078
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 15075)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 15078)
@@ -1867,13 +1867,14 @@
 		if (StringUtils.isNotBlank(barcode)) {
 		    sql = " and po.barcode = '" + barcode + "'";
 		}
-
+		// 不追溯 固定条码的器械包实例，不导出
 		String listSql = "select po from "
 				+ TousseInstance.class.getSimpleName()
 		        + " po where 1=1 "
+		        + " and (po.unTraceableTousse = 0 or po.tousseFixedBarcode = 0) "
 		        + sql + " order by po.operationTime desc ";
 		
-		tousseInstanceManager.exportQueryTousseInstance(listSql,selectAll,response.getOutputStream());
+		tousseInstanceManager.exportQueryTousseInstance(listSql,response.getOutputStream());
 		servletOutputStream.flush();
 	}catch(Exception e){
 		e.printStackTrace();
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r14959 -r15078
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 14959)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 15078)
@@ -306,7 +306,9 @@
 				sqlBuilder.append(String.format(" AND po.tousseDefinition.handlerDepartCode='%s'", currentOrgUnitCode));
 			}
 		}*/
-
+		// 器械包不追溯且是固定条码  不显示
+		sqlBuilder.append(" AND (po.unTraceableTousse = 0 or po.tousseFixedBarcode = 0) ");
+				
 		String sql = sqlBuilder.toString();
 		if(StringUtils.isNotBlank(orderStr)){
 			orderStr += ", id desc ";
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r15003 -r15078
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 15003)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 15078)
@@ -106,7 +106,7 @@
 	public boolean checkTousseInstanceHasRecallByTousseInstanceId(
 			Long tousseInstanceId);
 	
-	public void exportQueryTousseInstance(String sql,boolean selectAll,OutputStream ops);
+	public void exportQueryTousseInstance(String sql,OutputStream ops);
 	
 	public List<TousseInstance> getTousseInstanceBySql(String sql);
 	
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r15060 -r15078
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15060)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15078)
@@ -875,17 +875,12 @@
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void exportQueryTousseInstance(String sql,boolean selectAll, OutputStream ops) {
+	public void exportQueryTousseInstance(String sql, OutputStream ops) {
 		List<TousseInstance> tousseList = new ArrayList<TousseInstance>();
-		if (selectAll) {
-			tousseList = objectDao.findAllObjects(TousseInstance.class
-					.getSimpleName());
-		} else {
-			if (StringUtils.isNotBlank(sql)) {
-				Query basketQr = objectDao.getHibernateSession().createQuery(
-						sql);
-				tousseList = basketQr.list();
-			}
+		if (StringUtils.isNotBlank(sql)) {
+			Query basketQr = objectDao.getHibernateSession().createQuery(
+					sql);
+			tousseList = basketQr.list();
 		}
 		//createExportFile(tousseList, ops);
 		createExportFileByJxl(tousseList, ops);