From 831e7114cbe9ad201177f1027d4fe986f8a9a17f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 6 Jul 2016 15:40:29 +0800 Subject: [PATCH] update code --- .../platform/common/enums/ServiceStatusEnums.java | 2 +- .../com/lyms/platform/query/BabyModelQuery.java | 27 ++++++++ .../web/controller/BabyBookbuildingController.java | 31 +++++++-- .../operate/web/facade/BabyBookbuildingFacade.java | 80 +++++++++++++++++----- .../operate/web/facade/SmsTemplateFacade.java | 2 +- .../operate/web/request/BabyManageRequest.java | 61 +++++++++-------- .../operate/web/result/BabyManageListResult.java | 25 +++++-- 7 files changed, 165 insertions(+), 63 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java index 1440cd6..a4c4aec 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java @@ -74,7 +74,7 @@ public enum ServiceStatusEnums { return list; } - public static String getNameByPid(int id) + public static String getNameById(Integer id) { for(ServiceStatusEnums s : ServiceStatusEnums.values()) { if (s.getId() == id) 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 2e7db0c..58b7d35 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 @@ -131,6 +131,27 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Integer hospitalId; + private Integer serviceType; + + //诊断 + private String diagnose; + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + public Integer getHospitalId() { return hospitalId; } @@ -257,6 +278,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=hospitalId){ condition=condition.and("hospitalId", hospitalId, MongoOper.IS); } + if(null!=diagnose){ + condition=condition.and("diagnose", diagnose, MongoOper.LIKE); + } @@ -267,6 +291,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=serviceStatus){ condition=condition.and("serviceStatus", serviceStatus, MongoOper.IS); } + if(null!=serviceType){ + condition=condition.and("serviceType", serviceType, MongoOper.IS); + } if (null != keyword) { if (null != keyword) { 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 38943f4..bb7b7f4 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 @@ -155,22 +155,41 @@ public class BabyBookbuildingController extends BaseController{ * @param mcardNo 母亲身份证 * @param page * @param limit - * @param serviceStatus 服务状态 + * @param serviceType 服务状态 * @param name 儿童姓名 + * @param highRiskType 0 非高危 1 高危 2/空 全部 * @return */ @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET) @ResponseBody public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo, + @RequestParam(value = "bcardNo", required = false) String bcardNo, + @RequestParam(value = "mphone", required = false) String mphone, + @RequestParam(value = "monthAge", required = false) Integer startMonthAge, + @RequestParam(value = "monthAge", required = false) Integer endMonthAge, + @RequestParam(value = "birth", required = false) String birth, + @RequestParam(value = "nextDate", required = false) String nextDate, + @RequestParam(value = "expVip", required = false) Integer expVip, + @RequestParam(value = "serviceType", required = false) Integer serviceType, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "highRiskType", required = false) Integer highRiskType, + @RequestParam(value = "diagnose", required = false) String diagnose, @RequestParam("page") Integer page, - @RequestParam("limit") Integer limit, - @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus, - @RequestParam(value = "name", required = false) String name){ + @RequestParam("limit") Integer limit){ BabyManageRequest request = new BabyManageRequest(); + request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); - request.setServiceStatus(serviceStatus); - request.setName(request.getName()); + request.setMphone(mphone); + request.setMonthAgeStart(startMonthAge); + request.setMonthAgeEnd(endMonthAge); + request.setBirth(birth); + request.setNextDate(nextDate); + request.setExpVip(expVip); + request.setHighRiskType(highRiskType); + request.setServiceType(serviceType); + request.setDiagnose(diagnose); + request.setName(name); request.setLimit(limit); request.setPage(page); 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 2a52a06..b87e2a3 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 @@ -393,7 +393,7 @@ public class BabyBookbuildingFacade { String diagnoseStr = model.getDiagnose(); if (!StringUtils.isEmpty(diagnoseStr)) { - List diagnoses = JsonUtil.toList(diagnoseStr,List.class); + List diagnoses = JsonUtil.toList(diagnoseStr, List.class); for (Object obj : diagnoses) { if (obj != null) @@ -701,34 +701,51 @@ public class BabyBookbuildingFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setNeed("1"); babyQuery.setMcertNo(request.getMcardNo()); - babyQuery.setServiceStatus(request.getServiceStatus()); + babyQuery.setCardNo(request.getBcardNo()); babyQuery.setName(request.getName()); - babyQuery.setNeed("1"); + babyQuery.setMphone(request.getMphone()); + if (request.getMonthAgeStart() != null || request.getMonthAgeEnd() != null) + { + if (request.getMonthAgeStart() != null) + { + request.setMonthAgeEnd(request.getMonthAgeStart()); + } + else + { + request.setMonthAgeStart(request.getMonthAgeEnd()); + } + Date start = DateUtil.addMonth(new Date(),request.getMonthAgeStart()); + Date end = DateUtil.addMonth(new Date(),request.getMonthAgeEnd()); + babyQuery.setBirthStart(end); + babyQuery.setBirthEnd(start); + } + + babyQuery.setDiagnose(request.getDiagnose()); + // babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart())); +// babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd())); + +// babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart())); +// babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd())); + + if (request.getServiceType() != null && request.getServiceType() != 0) + { + babyQuery.setServiceType(request.getServiceType()); + } + + babyQuery.setExpVip(request.getExpVip()); babyQuery.setPage(request.getPage()); babyQuery.setLimit(request.getLimit()); - babyQuery.setMname(request.getMname()); //0 非高危 1 高危 2 全部 if (request.getHighRiskType() != null && request.getHighRiskType() != 2) { babyQuery.setHighRisk(request.getHighRiskType()); } - babyQuery.setMphone(request.getMphone()); - babyQuery.setServiceStatus(request.getServiceStatus()); - babyQuery.setSex(request.getSex()); - - babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart())); - babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd())); - - babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart())); - babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd())); - - - List list = new ArrayList<>(); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); @@ -739,16 +756,41 @@ public class BabyBookbuildingFacade { { BabyManageListResult result = new BabyManageListResult(); result.setId(model.getId()); - result.setHighRisk(model.getHighRisk()); - result.setSex(model.getSex()); + if (model.getHighRisk()== null || model.getHighRisk() == 1) + { + result.setHighRisk("正常"); + } + else + { + result.setHighRisk("高危"); + } + result.setSex(SexTypeEnums.getTitleById(model.getSex())); result.setBabyName(model.getName()); result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); result.setMommyName(model.getMname()); result.setMommnyPhone(model.getMphone()); - result.setServiceStatus(String.valueOf(model.getServiceStatus())); + result.setServiceStatus(ServiceStatusEnums.getNameById(model.getServiceStatus())); result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); result.setPatientId(model.getParentId()); + + String diagnose = "正常"; + if (!StringUtils.isEmpty(model.getDiagnose())) + { + List diagList = JsonUtil.toList(model.getDiagnose(),List.class); + if (CollectionUtils.isNotEmpty(diagList)) + { + for(Object obj : diagList) + { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById((String)obj); + if (basicConfig != null) + { + diagnose = basicConfig.getName() + " "; + } + } + } + } + result.setDiagnose(diagnose); list.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index 10aec43..246671c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -194,7 +194,7 @@ public class SmsTemplateFacade { result.put("serviceObjName", serviceObjName); result.put("serviceTypeName", ServiceTypeEnums.getTitleById(temp.getServiceType())); - result.put("serviceStatusName", ServiceStatusEnums.getNameByPid(temp.getServiceStatus())); + result.put("serviceStatusName", ServiceStatusEnums.getNameById(temp.getServiceStatus())); result.put("content", temp.getContent()); //发送频次 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 f47fc9c..31f8481 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 @@ -15,6 +15,9 @@ public class BabyManageRequest extends BaseQuery { //服务状态 private Integer serviceStatus; + //服务类型 + private Integer serviceType; + //妈咪身份证号 private String mcardNo; @@ -31,15 +34,12 @@ public class BabyManageRequest extends BaseQuery { private Integer monthAgeEnd; //生日 - private String birthStart; + private String birth; - private String birthEnd; //下次预约时间 - private String nextDateStart; + private String nextDate; - //下次预约时间 - private String nextDateEnd; //母亲联系方式 private String mphone; @@ -53,6 +53,25 @@ public class BabyManageRequest extends BaseQuery { //体检会员 0非体验会员 1体验会员 private Integer expVip; + //诊断 + private String diagnose; + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + public Integer getSex() { return sex; } @@ -125,36 +144,20 @@ public class BabyManageRequest extends BaseQuery { this.monthAgeEnd = monthAgeEnd; } - public String getBirthStart() { - return birthStart; - } - - public void setBirthStart(String birthStart) { - this.birthStart = birthStart; - } - - public String getBirthEnd() { - return birthEnd; - } - - public void setBirthEnd(String birthEnd) { - this.birthEnd = birthEnd; - } - - public String getNextDateStart() { - return nextDateStart; + public String getNextDate() { + return nextDate; } - public void setNextDateStart(String nextDateStart) { - this.nextDateStart = nextDateStart; + public void setNextDate(String nextDate) { + this.nextDate = nextDate; } - public String getNextDateEnd() { - return nextDateEnd; + public String getBirth() { + return birth; } - public void setNextDateEnd(String nextDateEnd) { - this.nextDateEnd = nextDateEnd; + public void setBirth(String birth) { + this.birth = birth; } public String getMphone() { 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 f8860e6..f831193 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 @@ -10,7 +10,7 @@ public class BabyManageListResult { private String babyName; //性别 - private Integer sex; + private String sex; //月龄 private String monthAge; @@ -30,12 +30,23 @@ public class BabyManageListResult { //服务状态 private String serviceStatus; - //是否高危 0非高危 1高危 - private Integer highRisk; + //是否高危 + private String highRisk; //孕妇Id private String patientId; + //诊断 + private String diagnose; + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + public String getPatientId() { return patientId; } @@ -53,11 +64,11 @@ public class BabyManageListResult { } - public Integer getSex() { + public String getSex() { return sex; } - public void setSex(Integer sex) { + public void setSex(String sex) { this.sex = sex; } @@ -118,11 +129,11 @@ public class BabyManageListResult { this.serviceStatus = serviceStatus; } - public Integer getHighRisk() { + public String getHighRisk() { return highRisk; } - public void setHighRisk(Integer highRisk) { + public void setHighRisk(String highRisk) { this.highRisk = highRisk; } } -- 1.8.3.1