Commit 5e09b1137846b8595000869e542862864c39c86c
1 parent
93d238363a
Exists in
master
and in
6 other branches
追访相关
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
View file @
5e09b11
| ... | ... | @@ -228,7 +228,7 @@ |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - if(trackType == TrackDownDateEnums.B.getId()) { | |
| 231 | + if(trackType == TrackDownDateEnums.A.getId()) { | |
| 232 | 232 | Criteria c = new Criteria(); |
| 233 | 233 | if(StringUtils.isNotEmpty(provinceId)) { |
| 234 | 234 | c.and("provinceId").is(provinceId); |
| ... | ... | @@ -262,7 +262,7 @@ |
| 262 | 262 | TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("residentsArchiveId").is(residentsArchiveModel.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); |
| 263 | 263 | temp.put("age", DateUtil.getAge(residentsArchiveModel.getBirthday())); |
| 264 | 264 | // 婚检追访结果 |
| 265 | - temp.put("end", trackDown == null ? "--" : TrackDownTransferEnums.getName(trackDown.getTrackDownType())); | |
| 265 | + temp.put("result", trackDown == null ? "--" : TrackDownTransferEnums.getName(trackDown.getTrackDownType())); | |
| 266 | 266 | // 婚检追访时间 |
| 267 | 267 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); |
| 268 | 268 | // 预约时间 |
| 269 | 269 | |
| ... | ... | @@ -282,11 +282,11 @@ |
| 282 | 282 | temp.put("id", patient.getId()); |
| 283 | 283 | TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(patient.getId())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); |
| 284 | 284 | if(trackDown != null) { |
| 285 | - temp.put("end", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 | |
| 285 | + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果 | |
| 286 | 286 | temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 |
| 287 | 287 | temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); // 预约时间 |
| 288 | 288 | } else { |
| 289 | - temp.put("end", "--"); // 婚检追访结果 | |
| 289 | + temp.put("result", "--"); // 婚检追访结果 | |
| 290 | 290 | temp.put("trackDownTime", "--"); // 追访时间 |
| 291 | 291 | temp.put("yyTime", "--"); // 预约时间 |
| 292 | 292 | } |