diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index daa1022..2125001 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -171,6 +171,7 @@ public class BabyBookbuildingController extends BaseController { @RequestParam(value = "nextDate", required = false) String nextDate, @RequestParam(value = "expVip", required = false) Integer expVip, @RequestParam(value = "serviceType", required = false) Integer serviceType, + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, @RequestParam(value = "name", required = false) String name, @RequestParam(value = "highRiskType", required = false) Integer highRiskType, @RequestParam(value = "diagnose", required = false) String diagnose, @@ -192,6 +193,7 @@ public class BabyBookbuildingController extends BaseController { request.setName(name); request.setLimit(limit); request.setPage(page); + request.setServiceStatus(serviceStatus); return babyBookbuildingFacade.queryBabyList(request,loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 3d6e940..47d43f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1523,6 +1523,7 @@ public class BabyBookbuildingFacade { result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone())); result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone())); result.setServiceStatus(StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()))); + result.setServiceType(StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType()))); result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); result.setPatientId(model.getParentId()); @@ -1630,6 +1631,13 @@ public class BabyBookbuildingFacade { babyQuery.setServiceType(request.getServiceType()); } + if (request.getServiceStatus() != null) { + if (!(request.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId() || request.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())) + { + babyQuery.setServiceStatus(request.getServiceStatus()); + } + } + if (request.getExpVip() != null && request.getExpVip() == 1) { babyQuery.setExpVip(request.getExpVip()); } 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 c8dafb4..97a007a 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 @@ -33,6 +33,9 @@ public class BabyManageListResult { //服务状态 private String serviceStatus; + //服务类型 + private String serviceType; + //是否高危 private String highRisk; @@ -42,6 +45,14 @@ public class BabyManageListResult { //诊断 private String diagnose; + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + public String getMommnyEncryptPhone() { return mommnyEncryptPhone; }