From 0973f1837b6f642d6465a499e8997c92334c5f24 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 29 Dec 2020 15:12:49 +0800 Subject: [PATCH] update --- .../com/lyms/platform/query/BabyModelQuery.java | 38 ++++++++++++++++++++++ .../web/controller/BabyBuildController.java | 6 +++- .../web/controller/BabyCheckController.java | 3 +- .../operate/web/facade/BabyCheckFacade.java | 11 ++++++- .../operate/web/request/BabyManageRequest.java | 21 ++++++++++++ .../operate/web/result/BabyManageListResult.java | 9 +++++ .../platform/operate/web/utils/BabyListTask.java | 2 +- 7 files changed, 86 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index e3eead4..459f764 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -366,6 +366,27 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //是否开通疾病发生推送 1或者空没有开通 2开通 private String openDisease; + //分娩孕周 + private Integer dueWeekStart; + //分娩孕周 + private Integer dueWeekEnd; + + public Integer getDueWeekEnd() { + return dueWeekEnd; + } + + public void setDueWeekEnd(Integer dueWeekEnd) { + this.dueWeekEnd = dueWeekEnd; + } + + public Integer getDueWeekStart() { + return dueWeekStart; + } + + public void setDueWeekStart(Integer dueWeekStart) { + this.dueWeekStart = dueWeekStart; + } + public String getOpenDiseaseType() { return openDiseaseType; } @@ -1686,6 +1707,23 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + + if (null != dueWeekStart) { + if (null != c) { + c = c.and("dueWeek").gte(dueWeekStart); + } else { + c = Criteria.where("dueWeek").gte(dueWeekStart); + } + } + + if (null != dueWeekEnd) { + if (null != c) { + c = c.lte(dueWeekEnd); + } else { + c = Criteria.where("dueWeek").lte(dueWeekEnd); + } + } + if (null != startAge && null != endAge) { if (null != c) { c.and("mbirth").lte(startAge).gte(endAge); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 0d24236..e2488cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -262,7 +262,9 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "isArea", required = false) String isArea, @RequestParam(value = "fmHospitalId", required = false) String fmHospitalId, @RequestParam(value = "openDisease", required = false) String openDisease, - @RequestParam(value = "endCase", required = false) Integer endCase + @RequestParam(value = "endCase", required = false) Integer endCase, + @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart, + @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd ) { if (CollectionUtils.isNotEmpty(highRiskInfos)) { @@ -319,6 +321,8 @@ public class BabyBuildController extends BaseController { request.setLiveType(liveType); request.setEndCase(endCase); request.setOpenDisease(openDisease); + request.setDueWeekStart(dueWeekStart); + request.setDueWeekEnd(dueWeekEnd); return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); } 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 c7e70d3..e2a1d26 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 @@ -186,8 +186,9 @@ public class BabyCheckController extends BaseController { @RequestParam(value = "nextDate", required = false) String nextDate, @RequestParam(value = "highRisk", required = false) Integer highRisk, @RequestParam(value = "waskSon", required = false) Integer waskSon, + @RequestParam(value = "checkDoctorId", required = false) String checkDoctorId, Integer page, Integer limit, HttpServletRequest request) { - return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request)); + return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon,checkDoctorId, page, limit, getUserId(request)); } /** 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 a48ec2a..e1f3ecf 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 @@ -1038,7 +1038,8 @@ public class BabyCheckFacade extends BaseServiceImpl { return br; } - public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) { + public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, + Integer highRisk, Integer waskSon, String checkDoctorId,Integer page, Integer limit, Integer userId) { boolean flag = false; // List hospital = groupsFacade.findGroupHospital(userId, false); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -1082,6 +1083,9 @@ public class BabyCheckFacade extends BaseServiceImpl { if (null != waskSon) { criteria.and("waskSon").is(waskSon); } + if (null != checkDoctorId) { + criteria.and("checkDoctor").is(checkDoctorId); + } if (null != checkMonthAge && null != endCheckMonthAge) { criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge); } @@ -1118,6 +1122,11 @@ public class BabyCheckFacade extends BaseServiceImpl { } else { map.put("waskSon", "-"); } + + if (org.apache.commons.lang.StringUtils.isNotEmpty(babyCheckModel.getCheckDoctor())) { + map.put("checkDoctor", usersService.getUsers(Integer.valueOf(babyCheckModel.getCheckDoctor())).getName()); + } + map.put("height", babyCheckModel.getHeight()); map.put("weight", babyCheckModel.getWeight()); list.add(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index e806b44..3f54f8b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -100,6 +100,27 @@ public class BabyManageRequest extends BaseQuery { //是否开通疾病发生推送 1或者空没有开通 2开通 private String openDisease; + //分娩孕周 + private Integer dueWeekStart; + //分娩孕周 + private Integer dueWeekEnd; + + public Integer getDueWeekEnd() { + return dueWeekEnd; + } + + public void setDueWeekEnd(Integer dueWeekEnd) { + this.dueWeekEnd = dueWeekEnd; + } + + public Integer getDueWeekStart() { + return dueWeekStart; + } + + public void setDueWeekStart(Integer dueWeekStart) { + this.dueWeekStart = dueWeekStart; + } + public String getOpenDisease() { return openDisease; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 9d01f30..728bf3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -80,6 +80,15 @@ public class BabyManageListResult { private String mcertTypeId; //是否开通疾病发生推送 1或者空没有开通 2开通 private String openDisease; + private Integer dueWeek; + + public Integer getDueWeek() { + return dueWeek; + } + + public void setDueWeek(Integer dueWeek) { + this.dueWeek = dueWeek; + } public String getOpenDisease() { return openDisease; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index ba746f9..a9aa3c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -94,7 +94,7 @@ public class BabyListTask implements Callable { String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(model.getHighRiskInfo()); result.setHighRiskInfo(highRiskInfos); result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); - + result.setDueWeek(model.getDueWeek()); result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); result.setBabyName(StringUtils.emptyDeal(model.getName())); -- 1.8.3.1