Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java =================================================================== diff -u -r36758 -r36774 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 36758) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/dwr/table/UseRecordTableManager.java (.../UseRecordTableManager.java) (revision 36774) @@ -231,16 +231,8 @@ //ascriptionDepartment = "400902NEW"; if(StringUtils.isNotBlank(ascriptionDepartment) && !StringUtils.equals(ascriptionDepartment, "全部")){ Collection orgUnitCodes = StringTools.toCollectionIgnoreNullAndBlank(ascriptionDepartment, ";"); - Map orgUnitCodeAndNameMap = orgUnitManager.getOrgUnitCodeAndNameMapByOrgUnitCodes(orgUnitCodes); - if(MapUtils.isNotEmpty(orgUnitCodeAndNameMap)){ - Collection orgUnitCodeAndNames = new HashSet(); - for (Entry entry : orgUnitCodeAndNameMap.entrySet()) { - orgUnitCodeAndNames.add(entry.getKey()); - orgUnitCodeAndNames.add(entry.getValue()); - } - sql += String.format(" and %s ", - SqlUtils.getStringFieldInLargeCollectionsPredicate("po.ascriptionDepartment", orgUnitCodeAndNames)); - } + sql += String.format(" and %s ", + SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCodeOfpatient", orgUnitCodes)); } String status = sqlWhereParamMap.get("status");