diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 13a3e8d..b55a08a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -40,6 +40,31 @@ public class TrackDownController extends BaseController { return downFacade.mother(parentId,trackType,getUserId(request)); } + + /** + * @param parentId + * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 + * @return + */ + @ResponseBody + @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET) + @TokenRequired + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) { + return trackDownService.info(parentId, trackType,buildType); + } + + /** + * @param parentId + * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 + * @return + */ + @ResponseBody + @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET) + @TokenRequired + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) { + return trackDownService.info(parentId, trackType,0); + } + @ResponseBody @RequestMapping(value = "/init", method = RequestMethod.GET) public BaseResponse init() { @@ -69,17 +94,6 @@ public class TrackDownController extends BaseController { trackDownService.export(provinceId, cityId, areaId, streetId, key, trackType, getUserId(request), response); } - /** - * @param parentId - * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 - * @return - */ - @ResponseBody - @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET) - @TokenRequired - public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) { - return trackDownService.info(parentId, trackType,buildType); - } @ResponseBody @RequestMapping(value = "/run", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 072ba9a..4e20a9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -638,15 +638,15 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } @Override - public BaseObjectResponse info(String patientId, Integer trackType,Integer buildType) { + public BaseObjectResponse info(String patientId, Integer trackType, Integer buildType) { List> tabList = new ArrayList<>(); if (trackType == 0) { TrackDownRecordQuery query = new TrackDownRecordQuery(); - if(buildType == 1){//妇女 + if (buildType == 1) {//妇女 query.setResidentsArchiveId(patientId); - }else if(buildType == 2){//孕妇 + } else if (buildType == 2) {//孕妇 query.setParentId(patientId); - }else{ + } else { return RespBuilder.buildErro(ResponseCode.DATA_ERROR); } List trackDownRecords = trackDownRecordService.queryTrackDown(query); @@ -660,7 +660,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS if (CollectionUtils.isNotEmpty(trackDownRecords)) { TrackDownRecord trackDownRecord = trackDownRecords.get(0); - List trackDowns = mongoTemplate.find(Query.query(Criteria.where("trackDownRecId").is( trackDownRecord.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + List trackDowns = mongoTemplate.find(Query.query(Criteria.where("trackDownRecId").is(trackDownRecord.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); for (TrackDown trackDown : trackDowns) { Map temp = new HashMap<>(); @@ -697,42 +697,43 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } } return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList); - } - Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1); - - if (TrackDownDateEnums.C.getId() == trackType) { - criteria.and("trackDownDateType").in(3, 9); - } else if (TrackDownDateEnums.D.getId() == trackType) { - criteria.and("trackDownDateType").in(4, 8); - } else if (TrackDownDateEnums.F.getId() == trackType) { - criteria.and("trackDownDateType").in(6, 11); - } else if (TrackDownDateEnums.G.getId() == trackType) { - criteria.and("trackDownDateType").in(7, 10); } else { - criteria.and("trackDownDateType").in(trackType); - } - List trackDowns = mongoTemplate.find(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); + Criteria criteria = Criteria.where("parentId").is(patientId).and("yn").is(1); + + if (TrackDownDateEnums.C.getId() == trackType) { + criteria.and("trackDownDateType").in(3, 9); + } else if (TrackDownDateEnums.D.getId() == trackType) { + criteria.and("trackDownDateType").in(4, 8); + } else if (TrackDownDateEnums.F.getId() == trackType) { + criteria.and("trackDownDateType").in(6, 11); + } else if (TrackDownDateEnums.G.getId() == trackType) { + criteria.and("trackDownDateType").in(7, 10); + } else { + criteria.and("trackDownDateType").in(trackType); + } + List trackDowns = mongoTemplate.find(Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); - for (TrackDown trackDown : trackDowns) { - Map temp = new HashMap<>(); - temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); - temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); - if (trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()) { - trackDown.setTrackDownType(4); - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()) { - trackDown.setTrackDownType(3); - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()) { - trackDown.setTrackDownType(7); - } else if (trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()) { - trackDown.setTrackDownType(6); - } - - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); - temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); - temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); - tabList.add(temp); + for (TrackDown trackDown : trackDowns) { + Map temp = new HashMap<>(); + temp.put("trackDownDate", trackDown.getTrackDownDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); + temp.put("trackDownUser", StringUtils.isEmpty(trackDown.getTrackDownUserId()) ? "--" : trackDown.getTrackDownUserId()); + if (trackDown.getTrackDownType() == TrackDownDateEnums.H.getId()) { + trackDown.setTrackDownType(4); + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.I.getId()) { + trackDown.setTrackDownType(3); + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.J.getId()) { + trackDown.setTrackDownType(7); + } else if (trackDown.getTrackDownType() == TrackDownDateEnums.K.getId()) { + trackDown.setTrackDownType(6); + } + + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); + temp.put("reservatDate", trackDown.getReservatDate() == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + tabList.add(temp); + } + return RespBuilder.buildSuccess(tabList); } - return RespBuilder.buildSuccess(tabList); } @Override