Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java
===================================================================
diff -u -r36429 -r36769
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java	(.../UseRecordEnterReportHelper.java)	(revision 36429)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/UseRecordEnterReportHelper.java	(.../UseRecordEnterReportHelper.java)	(revision 36769)
@@ -454,9 +454,9 @@
 		String instrumentSetTypesSql = null;
 		if(CollectionUtils.isNotEmpty(instrumentSetTypesSet)){
 			instrumentSetTypesSql = reportSqlUtil.getInstrumentSetTypeSql(instrumentSetTypesSet);
+			onlyQueryTousse = " and 1=2 ";
 		}else{
 			instrumentSetTypesSql = "";
-			onlyQueryTousse = " and 1=2 ";
 		}
 		String tousseInstanceSql = 
 				"select '器械包' selectType"+ doctorAccountDepartSql+ ascriptionDepartmentSql+urgentSql+tousseGroupNameSql+doctorNameSql +", ur.id,ur.depart,ur.patientName,ur.hospitalNum,ur.treatmentNum,ur.operator,ur.enteringDate,ur.doctorName,ur.operation,"
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InvoiceQueryHelper.java
===================================================================
diff -u -r36429 -r36769
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InvoiceQueryHelper.java	(.../InvoiceQueryHelper.java)	(revision 36429)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/InvoiceQueryHelper.java	(.../InvoiceQueryHelper.java)	(revision 36769)
@@ -88,13 +88,13 @@
 		}
 		String instrumentSetTypes = requestParams.get("instrumentSetTypeIds");
 		String instrumentSetTypesSql = null;
-		String nolyQueryTousse = null;
+		String onlyQueryTousse = null;
 		if(StringUtils.isNotBlank(instrumentSetTypes)){
 			instrumentSetTypesSql = reportSqlUtil.getInstrumentSetTypeSql(SqlUtils.splitStringToSet(instrumentSetTypes, ";",false));
-			nolyQueryTousse = "";
+			onlyQueryTousse = " and 1=2 ";
 		}else{
 			instrumentSetTypesSql = "";
-			nolyQueryTousse = " and 1=2 ";
+			onlyQueryTousse = "";
 		}
 		String tousseTypeSql = " 1=1 ";
 		String disposableTypeSql = " 1=1 ";
@@ -253,23 +253,23 @@
 				+ Invoice.class.getSimpleName() + " po," + DiposableGoodsItem.class.getSimpleName()+" bo," 
 				+ DisposableGoods.class.getSimpleName() + " dg,"+ DisposableGoodsBatchStock.class.getSimpleName() +" dgbs where po.id = bo.invoice_id and "
 				+ " bo.disposableGoodsBatchStockID=dgbs.id and "
-				+ "bo.disposableGoodsID = dg.id " + remarkCondition + hospitalNumberSql + " and " + disposableTypeSql + nolyQueryTousse;
+				+ "bo.disposableGoodsID = dg.id " + remarkCondition + hospitalNumberSql + " and " + disposableTypeSql + onlyQueryTousse;
 		
 		String expensiveGoods = "select '高值耗材' as type"+noQuerySupplierName+",po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,bd.barcode barcode,ii.tousseName name,ii.amount,ii.settlementPrice as totalPrice,"
 				+ "po.sendTime,po.applicant,'' batch,eg.externalCode"+ remarkSql +",'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency,"
 				+ "po.hospitalNumber as hospitalNumber,po.sender,po.assistantSender,ei.expDate from " 
 				+ Invoice.class.getSimpleName() + " po join " + InvoiceItem.class.getSimpleName()+" ii on ii.invoice_id = po.id" 
 				+ " join " + ExpensiveGoodsInstance.class.getSimpleName() + " ei on ei.id = ii.expensiveGoodsInstanceId join "+ BarcodeDevice.class.getSimpleName() +" bd on bd.id = ei.id"
 				+ " join " + ExpensiveGoods.class.getSimpleName() + " eg on eg.id = ei.expensiveGoods_id"
-				+ " where (1=1) " + remarkCondition + hospitalNumberSql + " and " + expensiveGoodsSql + nolyQueryTousse;
+				+ " where (1=1) " + remarkCondition + hospitalNumberSql + " and " + expensiveGoodsSql + onlyQueryTousse;
 		
 		String materialSql = "select '材料' as type"+noQuerySupplierName+",po.orgUnitCoding, po.settleAccountsDepart,po.departCoding,po.depart,'' as barcode,bo.name as name,bo.amount,bo.price*bo.amount as totalPrice,"
 				+ "po.sendTime,'' as applicant,'' as batch,dg.externalCode "+ remarkSql +",'' as sterileEndTime,'' as sterilizerName,'' as sterileFrequency,"
 				+ "'' as hospitalNumber,po.sender,'' as assistantSender,null as expDate from " + MaterialInvoice.class.getSimpleName() + " po inner join " 
 				+ MaterialItem.class.getSimpleName() + " bo on po.id = bo.materialInvoice_id " 
 				+ " inner join " + GoodsStock.class.getSimpleName() + " gs on gs.id = bo.goodsStockId inner join " 
 				+ MaterialDefinition.class.getSimpleName() + " dg on gs.materialDefinitionId = dg.id "
-				+ "where (1=1)  " + remarkCondition + " and " + materialTypeSql + nolyQueryTousse;
+				+ "where (1=1)  " + remarkCondition + " and " + materialTypeSql + onlyQueryTousse;
 		
 		if(StringUtils.isNotBlank(hospitalNumberSql)){
 			materialSql += " and 1=2 ";