From 35838cde2ee5739dca6c5099e49d8088f3027bd8 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Mon, 24 Jun 2019 11:53:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E5=8F=8A?= =?UTF-8?q?=E5=84=BF=E4=BF=9D=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyCheckController.java | 19 ++++-- .../controller/DischargeAbstractController.java | 5 +- .../operate/web/facade/BabyCheckFacade.java | 76 +++++++++++++--------- .../web/facade/DischargeAbstractFacade.java | 33 ++++++++-- 4 files changed, 87 insertions(+), 46 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 21cb408..4361245 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -151,10 +151,19 @@ public class BabyCheckController extends BaseController { * * @param */ - public BaseResponse list(Integer page, Integer limit) { - - - return null; + @RequestMapping(value = "/queryBabyCheckAll", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse list( + @RequestParam(value = "checkTime", required = false) String checkTime, + @RequestParam(value = "queryNo", required = false) String queryNo, + @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge, + @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge, + @RequestParam(value = "nextDate", required = false) String nextDate, + @RequestParam(value = "highRisk", required = false) String highRisk, + @RequestParam(value = "waskSon", required = false) String waskSon, + Integer page, Integer limit, HttpServletRequest request) { + return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, limit, page, getUserId(request)); } @@ -277,7 +286,7 @@ public class BabyCheckController extends BaseController { * @param request * @return */ - @RequestMapping("/currentCheckBabyList") + @RequestMapping("/ currentCheckBabyList") @ResponseBody @TokenRequired public BaseObjectResponse currentCheckBabyList(HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java index 82ecc67..aa4210f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java @@ -118,8 +118,9 @@ public class DischargeAbstractController extends BaseController { @RequestParam(value = "limit") Integer limit, @RequestParam(value = "leaveHospitalDate", required = false) String leaveHospitalDate, @RequestParam(value = "queryNo", required = false) String queryNo, - @RequestParam(value = "postpartumDays", required = false) Integer postpartumDays, + @RequestParam(value = "startPostpartumDays", required = false) Integer startPostpartumDays, + @RequestParam(value = "endPostpartumDays", required = false) Integer endPostpartumDays, @RequestParam(value = "rmDate", required = false) String fmDate) { - return dischargeAbstractFacade.list(page, limit, getUserId(request), leaveHospitalDate, postpartumDays, fmDate, queryNo); + return dischargeAbstractFacade.list(page, limit, getUserId(request), leaveHospitalDate, startPostpartumDays,endPostpartumDays, fmDate, queryNo); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 8a957f4..40112a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -756,54 +756,66 @@ public class BabyCheckFacade extends BaseServiceImpl { } - public BaseResponse babyCheckList(Integer page, Integer limit, Integer userId) { - - - boolean flag = true; + public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, String highRisk, String waskSon, Integer page, Integer limit, Integer userId) { + boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); - /*if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { - pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key), Criteria.where("cardID").regex(key)); - flag = true; - } - if (stateWeek != null && endWeek != null) { - Date start = DateUtil.getWeekStart(endWeek); - Date end = DateUtil.getWeekEnd(stateWeek); - pCriteria.and("lastMenses").gt(start).lte(end); + if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { + pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo)); flag = true; } - if (age != null) { - Date start = DateUtil.getBeforeAge(age); - Date end = DateUtil.getBeforeAge(age + 1); - pCriteria.and("birth").gt(end).lte(start); - flag = true; - }*/ if (flag) { - List babyCheckModelsList = mongoTemplate.find(Query.query(pCriteria), BabyCheckModel.class); + List babykModelsList = mongoTemplate.find(Query.query(pCriteria), BabyModel.class); List ids = new ArrayList<>(); - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babyCheckModelsList)) { - for (BabyCheckModel babyCheckModel : babyCheckModelsList) { - ids.add(babyCheckModel.getId()); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(babykModelsList)) { + for (BabyModel babyModel : babykModelsList) { + ids.add(babyModel.getId()); } } - criteria.and("_id").in(ids); + criteria.and("buildId").in(ids); + } + if (null != checkTime) { + try { + Date start = (DateUtil.getSNDate(checkTime)[0]); + Date end = (DateUtil.getSNDate(checkTime)[1]); + criteria.and("checkDate").gte(start).lte(end); + } catch (Exception e) { + } + } + if (null != checkTime) { + try { + Date start = (DateUtil.getSNDate(nextDate)[0]); + Date end = (DateUtil.getSNDate(nextDate)[1]); + criteria.and("nextDate").gte(start).lte(end); + } catch (Exception e) { + } + } + if (StringUtils.isNotEmpty(highRisk)) { + criteria.and("highRisk").is(highRisk); + } + if (StringUtils.isNotEmpty(waskSon)) { + criteria.and("waskSon").and(waskSon); } PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List) pageResult.getGrid(); - List list = new ArrayList(); + List> list = new ArrayList(); for (BabyCheckModel babyCheckModel : babyCheckModelList) { Map map = new HashMap<>(); if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { - /*** - *儿保列表展示暂未开放 - */ - - - - - + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); + map.put("babyName", babyModel.getName()); + map.put("sex", babyModel.getSex()); + map.put("mName", babyModel.getMname()); + map.put("mCardNo", babyModel.getCardNo()); + map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); } + map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); + map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); + map.put("highRisk", babyCheckModel.getHighRisk() == 1 ? "高危儿" : "-"); + map.put("waskSon", babyCheckModel.getWaskSon() == 1 ? "低弱儿" : "-"); + map.put("height", babyCheckModel.getHeight()); + map.put("weight", babyCheckModel.getWeight()); list.add(map); } pageResult.setGrid(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 569d4de..7be235f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -11,12 +11,14 @@ import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; -import com.lyms.platform.operate.web.request.DischargeSummaryRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.*; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.DischargeAbstractBabyModel; +import com.lyms.platform.pojo.DischargeAbstractMotherModel; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DischargeAbstractBabyQuery; import com.lyms.platform.query.DischargeAbstractMotherQuery; @@ -396,7 +398,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS); } - public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, String fmDate, String queryNo) { + public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, Integer endPostpartumDays, String fmDate, String queryNo) { List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); @@ -407,9 +409,15 @@ public class DischargeAbstractFacade extends BaseServiceImpl { , Criteria.where("vcCardNo").is(queryNo)); flag = true; } - if (StringUtils.isNotEmpty(fmDate) && StringUtils.isNotEmpty(fmDate)) { - - + if (StringUtils.isNotEmpty(fmDate)) { + try { + Date start = DateUtil.getSNDate(fmDate)[0]; + Date end = DateUtil.getSNDate(fmDate)[1]; + pCriteria.and("fmDate").gte(start).lte(end); + } catch (Exception e) { + // 什么都不做，这里是数据传入错误了 + } + flag = true; } if (flag) { List patients = mongoTemplate.find(Query.query(pCriteria), Patients.class); @@ -419,7 +427,18 @@ public class DischargeAbstractFacade extends BaseServiceImpl { ids.add(patients1.getId()); } } - criteria.and("_id").in(ids); + criteria.and("patientId").in(ids); + } + if (null != postpartumDays && null != endPostpartumDays) { + criteria.and("afterMakeBabyDays").gte(postpartumDays).lte(endPostpartumDays); + } + if (null != leaveHospitalDate) { + try { + Date startLeave = (DateUtil.getSNDate(leaveHospitalDate)[0]); + Date endLeave = (DateUtil.getSNDate(leaveHospitalDate)[1]); + criteria.and("leaveHospitalDate").gte(startLeave).lte(endLeave); + } catch (Exception e) { + } } PageResult pageResult = findMongoPage(DischargeAbstractMotherModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "createDate")), page, limit); List discharge = (List) pageResult.getGrid(); -- 1.8.3.1