jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 902fb5942d858bd01757b60de1ecf63d278afd06

Authored by jiangjiazhi
1 parent fb1949f1b4
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

1

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 902fb59
... ... @@ -244,7 +244,7 @@
244 244 temp.put("trackDownDateType", downRecord.getTrackType());
245 245 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
246 246 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
247   - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  247 + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
248 248 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
249 249 // 婚检追访结果
250 250 temp.put("result", trackDown == null ? "--" : trackDown.getResult());
... ... @@ -289,7 +289,7 @@
289 289 temp.put("trackDownDateType", downRecord.getTrackType());
290 290 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
291 291 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
292   - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  292 + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
293 293 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
294 294 // 婚检追访结果
295 295 temp.put("result", trackDown == null ? "--" : trackDown.getResult());
... ... @@ -318,7 +318,7 @@
318 318 temp.put("cardNo", downRecord.getCardNo());
319 319 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
320 320 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
321   - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  321 + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
322 322 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
323 323 // 婚检追访结果
324 324 temp.put("result", trackDown == null ? "--" : trackDown.getResult());
... ... @@ -383,7 +383,7 @@
383 383 temp.put("cjDate", ""); /** 产检日期 */
384 384 temp.put("yycjDate", ""); /** 预约产检日期 */
385 385 temp.put("cjzfDate", ""); /** 产检追访时间 */
386   - TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  386 + TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId()).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
387 387 if (trackDown != null) {
388 388 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 婚检追访结果
389 389 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间