Commit 8b05d29e332eb563d1836e630c7d08ca8a6627ec
1 parent
e354382c26
Exists in
master
and in
6 other branches
自动生成追访信息
Showing 1 changed file with 20 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
8b05d29
... | ... | @@ -205,8 +205,23 @@ |
205 | 205 | } |
206 | 206 | } |
207 | 207 | map.put("checkTime", "--"); /** 产检日期 */ |
208 | + | |
209 | + List<Integer> trackTypes = new ArrayList<>(); | |
210 | + //产检和产后数据特殊处理 | |
211 | + if (null != trackType && TrackDownDateEnums.C.getId() == trackType) { | |
212 | + trackTypes = Arrays.asList(3, 9); | |
213 | + } else if (null != trackType && TrackDownDateEnums.D.getId() == trackType) { | |
214 | + trackTypes =Arrays.asList(3, 8); | |
215 | + } else if (null != trackType && TrackDownDateEnums.F.getId() == trackType) { | |
216 | + trackTypes =Arrays.asList(6, 11); | |
217 | + } else if (null != trackType && TrackDownDateEnums.G.getId() == trackType) { | |
218 | + trackTypes =Arrays.asList(6, 10); | |
219 | + } else { | |
220 | + trackTypes = Arrays.asList(trackType); | |
221 | + } | |
222 | + | |
208 | 223 | //查询追访记录 |
209 | - TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").is(trackType).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); | |
224 | + TrackDown tc = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("trackDownDateType").in(trackTypes).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); | |
210 | 225 | if (tc != null) { |
211 | 226 | map.put("nextCheckTime", tc.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(tc.getReservatDate())); // 预约预约时间 |
212 | 227 | map.put("yyfsDate", DateUtil.getyyyy_MM_dd(tc.getReservatDate())); /** 预约访视日期 */ |
... | ... | @@ -328,6 +343,7 @@ |
328 | 343 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); |
329 | 344 | // 预约时间 |
330 | 345 | temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); |
346 | + | |
331 | 347 | //预约复查时间默认用追访时间 |
332 | 348 | temp.put("yyfcDate", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); |
333 | 349 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
334 | 350 | |
335 | 351 | |
... | ... | @@ -364,10 +380,11 @@ |
364 | 380 | /** 复查次数 */ |
365 | 381 | temp.put("fcNum", list.size()); |
366 | 382 | if (CollectionUtils.isNotEmpty(list)) { |
383 | + | |
367 | 384 | /** 初次复查日期 */ |
368 | - temp.put("ccfcDate", list.get(list.size() - 1).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getCheckTime())); | |
385 | + temp.put("ccfcDate", list.get(0).getCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getCheckTime())); | |
369 | 386 | /** 预约复查日期 */ |
370 | - temp.put("yyfcDate ", list.get(0).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime())); | |
387 | + temp.put("yyfcDate", list.get(list.size() - 1).getNextCheckTime() == null ? "--" : DateUtil.getyyyy_MM_dd(list.get(list.size() - 1).getNextCheckTime())); | |
371 | 388 | } |
372 | 389 | return temp; |
373 | 390 | } |