jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0dd72f3c1ba69224a626841c7e5ce2557dc47aac

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

自动生成追访信息

Showing 2 changed files with 64 additions and 49 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ 0dd72f3
... ... @@ -40,7 +40,32 @@
40 40 return downFacade.mother(parentId,trackType,getUserId(request));
41 41 }
42 42  
  43 +
  44 + /**
  45 + * @param parentId
  46 + * @param trackType 产考TrackDownDateEnums里面的值 0代表所有
  47 + * @return
  48 + */
43 49 @ResponseBody
  50 + @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET)
  51 + @TokenRequired
  52 + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) {
  53 + return trackDownService.info(parentId, trackType,buildType);
  54 + }
  55 +
  56 + /**
  57 + * @param parentId
  58 + * @param trackType 产考TrackDownDateEnums里面的值 0代表所有
  59 + * @return
  60 + */
  61 + @ResponseBody
  62 + @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET)
  63 + @TokenRequired
  64 + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) {
  65 + return trackDownService.info(parentId, trackType,0);
  66 + }
  67 +
  68 + @ResponseBody
44 69 @RequestMapping(value = "/init", method = RequestMethod.GET)
45 70 public BaseResponse init() {
46 71 return trackDownService.init();
... ... @@ -69,17 +94,6 @@
69 94 trackDownService.export(provinceId, cityId, areaId, streetId, key, trackType, getUserId(request), response);
70 95 }
71 96  
72   - /**
73   - * @param parentId
74   - * @param trackType 产考TrackDownDateEnums里面的值 0代表所有
75   - * @return
76   - */
77   - @ResponseBody
78   - @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET)
79   - @TokenRequired
80   - public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) {
81   - return trackDownService.info(parentId, trackType,buildType);
82   - }
83 97  
84 98 @ResponseBody
85 99 @RequestMapping(value = "/run", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 0dd72f3
... ... @@ -638,15 +638,15 @@
638 638 }
639 639  
640 640 @Override
641   - public BaseObjectResponse info(String patientId, Integer trackType,Integer buildType) {
  641 + public BaseObjectResponse info(String patientId, Integer trackType, Integer buildType) {
642 642 List<Map<String, Object>> tabList = new ArrayList<>();
643 643 if (trackType == 0) {
644 644 TrackDownRecordQuery query = new TrackDownRecordQuery();
645   - if(buildType == 1){//妇女
  645 + if (buildType == 1) {//妇女
646 646 query.setResidentsArchiveId(patientId);
647   - }else if(buildType == 2){//孕妇
  647 + } else if (buildType == 2) {//孕妇
648 648 query.setParentId(patientId);
649   - }else{
  649 + } else {
650 650 return RespBuilder.buildErro(ResponseCode.DATA_ERROR);
651 651 }
652 652 List<TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(query);
... ... @@ -660,7 +660,7 @@
660 660  
661 661 if (CollectionUtils.isNotEmpty(trackDownRecords)) {
662 662 TrackDownRecord trackDownRecord = trackDownRecords.get(0);
663   - List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("trackDownRecId").is( trackDownRecord.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  663 + List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("trackDownRecId").is(trackDownRecord.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
664 664  
665 665 for (TrackDown trackDown : trackDowns) {
666 666 Map<String, Object> temp = new HashMap<>();
667 667  
668 668  
669 669  
670 670  
671 671  
... ... @@ -697,42 +697,43 @@
697 697 }
698 698 }
699 699 return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
700   - }
701   - Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
702   -
703   - if (TrackDownDateEnums.C.getId() == trackType) {
704   - criteria.and("trackDownDateType").in(3, 9);
705   - } else if (TrackDownDateEnums.D.getId() == trackType) {
706   - criteria.and("trackDownDateType").in(4, 8);
707   - } else if (TrackDownDateEnums.F.getId() == trackType) {
708   - criteria.and("trackDownDateType").in(6, 11);
709   - } else if (TrackDownDateEnums.G.getId() == trackType) {
710   - criteria.and("trackDownDateType").in(7, 10);
711 700 } else {
712   - criteria.and("trackDownDateType").in(trackType);
713   - }
714   - List<TrackDown> trackDowns = mongoTemplate.find(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
  701 + Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
715 702  
716   - for (TrackDown trackDown : trackDowns) {
717   - Map<String, Object> temp = new HashMap<>();
718   - temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
719   - temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
720   - if (trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()) {
721   - trackDown.setTrackDownType(4);
722   - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()) {
723   - trackDown.setTrackDownType(3);
724   - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()) {
725   - trackDown.setTrackDownType(7);
726   - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()) {
727   - trackDown.setTrackDownType(6);
  703 + if (TrackDownDateEnums.C.getId() == trackType) {
  704 + criteria.and("trackDownDateType").in(3, 9);
  705 + } else if (TrackDownDateEnums.D.getId() == trackType) {
  706 + criteria.and("trackDownDateType").in(4, 8);
  707 + } else if (TrackDownDateEnums.F.getId() == trackType) {
  708 + criteria.and("trackDownDateType").in(6, 11);
  709 + } else if (TrackDownDateEnums.G.getId() == trackType) {
  710 + criteria.and("trackDownDateType").in(7, 10);
  711 + } else {
  712 + criteria.and("trackDownDateType").in(trackType);
728 713 }
  714 + List<TrackDown> trackDowns = mongoTemplate.find(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
729 715  
730   - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
731   - temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
732   - temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
733   - tabList.add(temp);
  716 + for (TrackDown trackDown : trackDowns) {
  717 + Map<String, Object> temp = new HashMap<>();
  718 + temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
  719 + temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId());
  720 + if (trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()) {
  721 + trackDown.setTrackDownType(4);
  722 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()) {
  723 + trackDown.setTrackDownType(3);
  724 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()) {
  725 + trackDown.setTrackDownType(7);
  726 + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()) {
  727 + trackDown.setTrackDownType(6);
  728 + }
  729 +
  730 + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
  731 + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
  732 + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  733 + tabList.add(temp);
  734 + }
  735 + return RespBuilder.buildSuccess(tabList);
734 736 }
735   - return RespBuilder.buildSuccess(tabList);
736 737 }
737 738  
738 739 @Override