Commit c23abccf82a294db8a4ec874f22290eee551bf13
1 parent
f24cea6434
Exists in
master
and in
6 other branches
追访数据个节点更新bug第三轮自测bug修改
Showing 1 changed file with 10 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
c23abcc
| ... | ... | @@ -341,24 +341,28 @@ |
| 341 | 341 | temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */ |
| 342 | 342 | temp.put("phone", StringUtils.encryPhone(downRecord.getPhone())); |
| 343 | 343 | |
| 344 | - | |
| 344 | + temp.put("fmDate","--"); | |
| 345 | + temp.put("result","--"); | |
| 346 | + temp.put("trackDownTime","--"); | |
| 347 | + temp.put("yyTime","--"); | |
| 348 | + temp.put("trackCount","--"); | |
| 345 | 349 | List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").in(6,11)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); |
| 346 | 350 | temp.put("age", DateUtil.getAge(downRecord.getBirth())); |
| 347 | - if (CollectionUtils.isNotEmpty(trackDowns)) { | |
| 351 | + if (CollectionUtils.isNotEmpty(trackDowns)&&trackDowns.get(0)!=null) { | |
| 348 | 352 | TrackDown trackDown = trackDowns.get(0); |
| 349 | 353 | // 追访结果 |
| 350 | - temp.put("result", trackDown == null ? "--" : trackDown.getResult()); | |
| 354 | + temp.put("result", trackDown.getResult() == null ? "--" : trackDown.getResult()); | |
| 351 | 355 | // 追访时间 |
| 352 | - temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); | |
| 356 | + temp.put("trackDownTime", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); | |
| 353 | 357 | // 预约时间 |
| 354 | - temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
| 358 | + temp.put("yyTime", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); | |
| 355 | 359 | //访视次数 |
| 356 | 360 | temp.put("trackCount", trackDowns.size()); |
| 357 | 361 | } |
| 358 | 362 | Patients patients = patientsService.findOnePatientById(downRecord.getParentId()); |
| 359 | 363 | if (patients != null) { |
| 360 | 364 | //分娩日期 |
| 361 | - temp.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); | |
| 365 | + temp.put("fmDate", patients.getFmDate()==null?"--":DateUtil.getyyyy_MM_dd(patients.getFmDate())); | |
| 362 | 366 | } |
| 363 | 367 | |
| 364 | 368 |