Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r30688 -r30694
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 30688)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 30694)
@@ -26,11 +26,9 @@
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
-import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
-import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
@@ -81,18 +79,8 @@
 	 */
 	public static String getTaskGroupFilterSQL(SupplyRoomConfigManager supplyRoomConfigManager,String taskGroup){
 		String taskGroupSqlWithAliasOfTousseDefinitionIsTd = "";
-		
-		// 该falseSqlCondition需要评估是否能去掉
-		String taskGroupFalseSqlCondition = "";
 		if (StringTools.isNotBlank(taskGroup)) {
 			taskGroupSqlWithAliasOfTousseDefinitionIsTd = String.format(" and td.taskGroup='%s' ", taskGroup);
-			//TODO:需要将该参数传入，每次查询效率很低
-			SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
-			//外来器械包默认处理科室及任务组
-			JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode());
-			if (foreignTousseHandleDepartAndTaskGroupJsonobject == null || !StringTools.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))) {
-				taskGroupFalseSqlCondition = " and 1=2 ";
-			}
 		}
 		return taskGroupSqlWithAliasOfTousseDefinitionIsTd;
 	}
@@ -105,13 +93,9 @@
 	public static String getTousseGroupFilterSQL(String tousseGroup) {
 		// 器械包分组的过滤
 		String tousseGroupSqlWithAliasOfTousseDefinitionIsTd = "";
-
-		// 该falseSqlCondition需要评估是否能去掉
-		String tousseGroupFalseSqlCondition = "";
 		if (StringTools.isNotBlank(tousseGroup)) {
 			tousseGroupSqlWithAliasOfTousseDefinitionIsTd = String.format(
 					" and td.tousseGroupName='%s' ", tousseGroup);
-			tousseGroupFalseSqlCondition = " and 1=2 ";
 		}
 		return tousseGroupSqlWithAliasOfTousseDefinitionIsTd;
 	}