Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r23791 -r23794 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23791) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23794) @@ -12390,9 +12390,12 @@ taskGroupSql = String.format(" and td.taskGroup='%s' ", taskGroup); SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj(); //外来器械包默认处理科室及任务组 - JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode()); + /*JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = supplyRoomConfig.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode()); if (foreignTousseHandleDepartAndTaskGroupJsonobject == null || !StringTools.equals(taskGroup, foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"))) { taskGroupSql2 = " and 1=2 "; + }*/ + if (!StringTools.equals(taskGroup, systemParamsObj.getDefalutTaskGroup())) { + taskGroupSql2 = " and 1=2 "; } }