Commit d35a045bba24346ef03acd68f26be8124859accb
1 parent
1d691e4aac
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 3 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
d35a045
... | ... | @@ -83,18 +83,8 @@ |
83 | 83 | } |
84 | 84 | //result.addAll(queryPacsCheckList(cardNo)); |
85 | 85 | List<String> keyList = new ArrayList<>(); |
86 | - // 去重 | |
87 | - List<CheckResponse> list = new ArrayList<>(); | |
88 | - Date tempDate = null; | |
89 | - for (CheckResponse check:result) { | |
90 | - if (check.getModified() != null && check.getModified().equals(tempDate)) { | |
91 | - continue; | |
92 | - } | |
93 | - list.add(check); | |
94 | - tempDate = check.getModified(); | |
95 | - } | |
96 | 86 | // 排序 |
97 | - Collections.sort(list, new Comparator() { | |
87 | + Collections.sort(result, new Comparator() { | |
98 | 88 | public int compare(Object a, Object b) { |
99 | 89 | if (((CheckResponse)a).getApplyDate() == null) { |
100 | 90 | return -1; |
... | ... | @@ -109,8 +99,8 @@ |
109 | 99 | } |
110 | 100 | }); |
111 | 101 | |
112 | - for (CheckResponse check:list) { | |
113 | - Date date = check.getModified() == null ? check.getApplyDate() : check.getModified(); | |
102 | + for (CheckResponse check:result) { | |
103 | + Date date = check.getApplyDate() == null ? check.getModified() : check.getApplyDate(); | |
114 | 104 | String ymd = DateUtil.getyyyy_MM_dd(date); |
115 | 105 | if (!keyList.contains(ymd)) { |
116 | 106 | keyList.add(ymd); |