Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r23794 -r23795 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23794) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 23795) @@ -12667,11 +12667,12 @@ && StringUtils.isNotBlank(departmentCode)){ SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj(); //外来器械包默认处理科室及任务组 - String defalutTaskGroup = null; + /*String defalutTaskGroup = null; JSONObject foreignTousseHandleDepartAndTaskGroupJsonobject = systemParamsObj.getOneForeignTousseHandleDepartAndTaskGroupByDepartCode(AcegiHelper.getCurrentOrgUnitCode()); if(foreignTousseHandleDepartAndTaskGroupJsonobject != null){ defalutTaskGroup = foreignTousseHandleDepartAndTaskGroupJsonobject.optString("taskGroup"); - } + }*/ + String defalutTaskGroup = systemParamsObj.getDefalutTaskGroup(); String customTousseDefaultTaskGroup = systemParamsObj.getCustomTousseDefaultTaskGroup(); //自定义器械包的默认装配组 //1、按装配任务的开始时间过滤