From ac10ce86867f4e1c8d14ee496f8b21f882f59801 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 9 Mar 2018 11:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E8=BF=BD?= =?UTF-8?q?=E8=AE=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/TrackDownController.java | 6 +- .../operate/web/service/ITrackDownService.java | 2 +- .../web/service/impl/TrackDownServiceImpl.java | 97 ++++++++++++---------- 3 files changed, 59 insertions(+), 46 deletions(-) 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 6f21e5f..13a3e8d 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 @@ -75,10 +75,10 @@ public class TrackDownController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET) + @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET) @TokenRequired - public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) { - return trackDownService.info(parentId, trackType); + public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) { + return trackDownService.info(parentId, trackType,buildType); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java index d9f9808..13675f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java @@ -18,7 +18,7 @@ public interface ITrackDownService extends IBaseService { BaseObjectResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId,Integer type); - BaseObjectResponse info(String patientId, Integer trackType); + BaseObjectResponse info(String patientId, Integer trackType,Integer buildType); BaseObjectResponse init(); 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 8399fc0..5a82ed8 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 @@ -133,6 +133,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } else if (archiveModel.getVcCardNo() != null) { patientsQuery.setVcCardNo(archiveModel.getVcCardNo()); } + patientsQuery.setTypeList(Arrays.asList(1, 3)); //怀孕建档 List patientsList = patientsService.queryPatient(patientsQuery); @@ -637,53 +638,65 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } @Override - public BaseObjectResponse info(String patientId, Integer trackType) { + public BaseObjectResponse info(String patientId, Integer trackType,Integer buildType) { List> tabList = new ArrayList<>(); if (trackType == 0) { - List trackDowns = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class); - List> hqjcList = new ArrayList<>(); // 婚前检查 - List> hyjdList = new ArrayList<>(); // 怀孕建档 - List> cqjcList = new ArrayList<>(); // 产前检查 - List> cqscList = new ArrayList<>(); // 产前筛查 - List> zyfmList = new ArrayList<>(); // 住院分娩 - List> chfsList = new ArrayList<>(); // 产后访视 - List> chfcList = new ArrayList<>(); // 产后复查 - for (TrackDown trackDown : trackDowns) { - Map temp = new HashMap<>(); - temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); - temp.put("trackDownUser", trackDown.getTrackDownUserId()); - temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); - temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); - Date resDate = trackDown.getReservatDate(); - temp.put("reservatDate", resDate == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); - temp.put("trackDownTransfer", trackDown.getTrackDownTransfer()); - if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) { - hqjcList.add(temp); - } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) { - hyjdList.add(temp); - } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) { - cqjcList.add(temp); - } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) { - cqscList.add(temp); - } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) { - zyfmList.add(temp); - } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) { - chfsList.add(temp); - } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) { - chfcList.add(temp); - } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) { - cqscList.add(temp); - } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) { - cqjcList.add(temp); - } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) { - chfcList.add(temp); - } else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) { - chfsList.add(temp); + TrackDownRecordQuery query = new TrackDownRecordQuery(); + if(buildType == 1){//妇女 + query.setResidentsArchiveId(patientId); + }else if(buildType == 2){//孕妇 + query.setParentId(patientId); + }else{ + return RespBuilder.buildErro(ResponseCode.DATA_ERROR); + } + + List trackDownRecords = trackDownRecordService.queryTrackDown(query); + 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> hqjcList = new ArrayList<>(); // 婚前检查 + List> hyjdList = new ArrayList<>(); // 怀孕建档 + List> cqjcList = new ArrayList<>(); // 产前检查 + List> cqscList = new ArrayList<>(); // 产前筛查 + List> zyfmList = new ArrayList<>(); // 住院分娩 + List> chfsList = new ArrayList<>(); // 产后访视 + List> chfcList = new ArrayList<>(); // 产后复查 + for (TrackDown trackDown : trackDowns) { + Map temp = new HashMap<>(); + temp.put("trackDownDate", DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); + temp.put("trackDownUser", trackDown.getTrackDownUserId()); + temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownType())); + temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); + Date resDate = trackDown.getReservatDate(); + temp.put("reservatDate", resDate == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getReservatDate())); + temp.put("trackDownTransfer", trackDown.getTrackDownTransfer()); + if (TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) { + hqjcList.add(temp); + } else if (TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) { + hyjdList.add(temp); + } else if (TrackDownDateEnums.C.getId().equals(trackDown.getTrackDownDateType())) { + cqjcList.add(temp); + } else if (TrackDownDateEnums.D.getId().equals(trackDown.getTrackDownDateType())) { + cqscList.add(temp); + } else if (TrackDownDateEnums.E.getId().equals(trackDown.getTrackDownDateType())) { + zyfmList.add(temp); + } else if (TrackDownDateEnums.F.getId().equals(trackDown.getTrackDownDateType())) { + chfsList.add(temp); + } else if (TrackDownDateEnums.G.getId().equals(trackDown.getTrackDownDateType())) { + chfcList.add(temp); + } else if (TrackDownDateEnums.H.getId().equals(trackDown.getTrackDownDateType())) { + cqscList.add(temp); + } else if (TrackDownDateEnums.I.getId().equals(trackDown.getTrackDownDateType())) { + cqjcList.add(temp); + } else if (TrackDownDateEnums.J.getId().equals(trackDown.getTrackDownDateType())) { + chfcList.add(temp); + } else if (TrackDownDateEnums.K.getId().equals(trackDown.getTrackDownDateType())) { + chfsList.add(temp); + } } + return RespBuilder.buildSuccess("hqjcList", hqjcList, "hyjdList", hyjdList, "cqjcList", cqjcList, "cqscList", cqscList, "zyfmList", zyfmList, "chfsList", chfsList, "chfcList", chfcList); } - 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) { -- 1.8.3.1