Commit ac10ce86867f4e1c8d14ee496f8b21f882f59801

Authored by yangfei
1 parent 3e8d10b0d0

自动生成追访信息

Showing 3 changed files with 59 additions and 46 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java View file @ ac10ce8
... ... @@ -75,10 +75,10 @@
75 75 * @return
76 76 */
77 77 @ResponseBody
78   - @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET)
  78 + @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET)
79 79 @TokenRequired
80   - public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) {
81   - return trackDownService.info(parentId, trackType);
  80 + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) {
  81 + return trackDownService.info(parentId, trackType,buildType);
82 82 }
83 83  
84 84 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java View file @ ac10ce8
... ... @@ -18,7 +18,7 @@
18 18  
19 19 BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId,Integer type);
20 20  
21   - BaseObjectResponse info(String patientId, Integer trackType);
  21 + BaseObjectResponse info(String patientId, Integer trackType,Integer buildType);
22 22  
23 23 BaseObjectResponse init();
24 24  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ ac10ce8
... ... @@ -133,6 +133,7 @@
133 133 } else if (archiveModel.getVcCardNo() != null) {
134 134 patientsQuery.setVcCardNo(archiveModel.getVcCardNo());
135 135 }
  136 + patientsQuery.setTypeList(Arrays.asList(1, 3));
136 137 //怀孕建档
137 138 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
138 139  
139 140  
140 141  
141 142  
142 143  
... ... @@ -637,53 +638,65 @@
637 638 }
638 639  
639 640 @Override
640   - public BaseObjectResponse info(String patientId, Integer trackType) {
  641 + public BaseObjectResponse info(String patientId, Integer trackType,Integer buildType) {
641 642 List<Map<String, Object>> tabList = new ArrayList<>();
642 643 if (trackType == 0) {
643   - List<TrackDown> trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
644   - List<Map<String, Object>> hqjcList = new ArrayList<>(); // 婚前检查
645   - List<Map<String, Object>> hyjdList = new ArrayList<>(); // 怀孕建档
646   - List<Map<String, Object>> cqjcList = new ArrayList<>(); // 产前检查
647   - List<Map<String, Object>> cqscList = new ArrayList<>(); // 产前筛查
648   - List<Map<String, Object>> zyfmList = new ArrayList<>(); // 住院分娩
649   - List<Map<String, Object>> chfsList = new ArrayList<>(); // 产后访视
650   - List<Map<String, Object>> chfcList = new ArrayList<>(); // 产后复查
651   - for (TrackDown trackDown : trackDowns) {
652   - Map<String, Object> temp = new HashMap<>();
653   - temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
654   - temp.put("trackDownUser", trackDown.getTrackDownUserId());
655   - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
656   - temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
657   - Date resDate = trackDown.getReservatDate();
658   - temp.put("reservatDate", resDate == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
659   - temp.put("trackDownTransfer", trackDown.getTrackDownTransfer());
660   - if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) {
661   - hqjcList.add(temp);
662   - } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) {
663   - hyjdList.add(temp);
664   - } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) {
665   - cqjcList.add(temp);
666   - } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) {
667   - cqscList.add(temp);
668   - } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) {
669   - zyfmList.add(temp);
670   - } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) {
671   - chfsList.add(temp);
672   - } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
673   - chfcList.add(temp);
674   - } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) {
675   - cqscList.add(temp);
676   - } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) {
677   - cqjcList.add(temp);
678   - } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) {
679   - chfcList.add(temp);
680   - } else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) {
681   - chfsList.add(temp);
  644 + TrackDownRecordQuery query = new TrackDownRecordQuery();
  645 + if(buildType == 1){//妇女
  646 + query.setResidentsArchiveId(patientId);
  647 + }else if(buildType == 2){//孕妇
  648 + query.setParentId(patientId);
  649 + }else{
  650 + return RespBuilder.buildErro(ResponseCode.DATA_ERROR);
  651 + }
  652 +
  653 + List<TrackDownRecord> trackDownRecords = trackDownRecordService.queryTrackDown(query);
  654 + if (CollectionUtils.isNotEmpty(trackDownRecords)) {
  655 + TrackDownRecord trackDownRecord = trackDownRecords.get(0);
  656 + 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);
  657 + List<Map<String, Object>> hqjcList = new ArrayList<>(); // 婚前检查
  658 + List<Map<String, Object>> hyjdList = new ArrayList<>(); // 怀孕建档
  659 + List<Map<String, Object>> cqjcList = new ArrayList<>(); // 产前检查
  660 + List<Map<String, Object>> cqscList = new ArrayList<>(); // 产前筛查
  661 + List<Map<String, Object>> zyfmList = new ArrayList<>(); // 住院分娩
  662 + List<Map<String, Object>> chfsList = new ArrayList<>(); // 产后访视
  663 + List<Map<String, Object>> chfcList = new ArrayList<>(); // 产后复查
  664 + for (TrackDown trackDown : trackDowns) {
  665 + Map<String, Object> temp = new HashMap<>();
  666 + temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate()));
  667 + temp.put("trackDownUser", trackDown.getTrackDownUserId());
  668 + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType()));
  669 + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
  670 + Date resDate = trackDown.getReservatDate();
  671 + temp.put("reservatDate", resDate == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
  672 + temp.put("trackDownTransfer", trackDown.getTrackDownTransfer());
  673 + if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) {
  674 + hqjcList.add(temp);
  675 + } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) {
  676 + hyjdList.add(temp);
  677 + } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) {
  678 + cqjcList.add(temp);
  679 + } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) {
  680 + cqscList.add(temp);
  681 + } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) {
  682 + zyfmList.add(temp);
  683 + } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) {
  684 + chfsList.add(temp);
  685 + } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) {
  686 + chfcList.add(temp);
  687 + } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) {
  688 + cqscList.add(temp);
  689 + } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) {
  690 + cqjcList.add(temp);
  691 + } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) {
  692 + chfcList.add(temp);
  693 + } else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) {
  694 + chfsList.add(temp);
  695 + }
682 696 }
  697 + return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
683 698 }
684   - return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList);
685 699 }
686   -
687 700 Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1);
688 701  
689 702 if (TrackDownDateEnums.C.getId() == trackType) {