Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r36378 -r36379 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 36378) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 36379) @@ -2081,6 +2081,7 @@ if(enableUrgentFunction){ queryUrgentLevel_id = SqlUtils.isExistColumn(rs, "urgentLevel_id"); } + Map urgentLevelMap = new HashMap(); while(rs.next()){ Long id = rs.getLong("id"); String tiStatus = rs.getString("status"); @@ -2095,12 +2096,18 @@ if(queryUrgentLevel_id){ Long urgentLevel_id = rs.getLong("urgentLevel_id"); if(DatabaseUtil.isPoIdValid(urgentLevel_id)){ - UrgentLevel urgentLevel = new UrgentLevel(); - urgentLevel.setId(urgentLevel_id); - urgentLevel.setColorCode(rs.getString("colorCode")); - urgentLevel.setColorName(rs.getString("colorName")); - urgentLevel.setGrade(rs.getInt("grade")); - urgentLevel.setName(rs.getString("urgentName")); + UrgentLevel urgentLevel = null; + if(urgentLevelMap.containsKey(urgentLevel_id)){ + urgentLevel = urgentLevelMap.get(urgentLevel_id); + }else{ + urgentLevel = new UrgentLevel(); + urgentLevel.setId(urgentLevel_id); + urgentLevel.setColorCode(rs.getString("colorCode")); + urgentLevel.setColorName(rs.getString("colorName")); + urgentLevel.setGrade(rs.getInt("grade")); + urgentLevel.setName(rs.getString("urgentName")); + urgentLevelMap.put(urgentLevel_id, urgentLevel); + } ti.setUrgentLevel(urgentLevel); ti.setIsUrgentTousse(Constants.STR_YES); }