From 36b9a86578c05d57c6bb736b1839c6434abccd3f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 29 Apr 2016 16:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/PatientsQuery.java | 3 +++ .../operate/web/facade/BabyManagerFacade.java | 14 +++++++---- .../platform/operate/web/facade/PatientFacade.java | 2 ++ .../web/request/BabyManagerQueryRequest.java | 20 ++++++++++++++++ .../web/request/PuerperaManagerQueryRequest.java | 28 ++++++++++++++++++---- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 0248a59..7e6b18a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -199,6 +199,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ if(null!=phone){ condition=condition.and("phone", phone, MongoOper.IS); } + if(null!=name){ + condition=condition.and("username", name, MongoOper.IS); + } if(-1!=yn){ condition=condition.and("yn", yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index 2d9d1ed..6b95c5b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -1,9 +1,6 @@ package com.lyms.platform.operate.web.facade; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.utils.DateUtil; @@ -54,8 +51,15 @@ public class BabyManagerFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setType(2); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setBirthEnd(DateUtil.parseYMD(babyManagerRequest.getdEnd())); + Date date = DateUtil.parseYMD(babyManagerRequest.getdEnd()); + if (null != date) { + long d = date.getTime() + 86398000; + date = new Date(d); + } + patientsQuery.setBirthEnd(date); patientsQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart())); + patientsQuery.setPhone(babyManagerRequest.getPhone()); + patientsQuery.setName(babyManagerRequest.getName()); patientsQuery.setVisitstatus(babyManagerRequest.getVisitstatus()); patientsQuery.setPage(babyManagerRequest.getPage()); patientsQuery.setLimit(babyManagerRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index c73580f..2bfce96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -80,6 +80,8 @@ public class PatientFacade { long d = date.getTime() + 86398000; date = new Date(d); } + puerperaQuery.setName(managerRequest.getName()); + puerperaQuery.setPhone(managerRequest.getPhone()); puerperaQuery.setDueDateEnd(date); puerperaQuery.setDueDateStart(DateUtil.parseYMD(managerRequest.getDueDateStart())); puerperaQuery.setKeyword(managerRequest.getKeyword()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java index 3981ce1..c88aef7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java @@ -23,6 +23,26 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest { */ @FormParam("keywords") private String keyword; + @FormParam + private String phone; + @FormParam + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } /** * 访视状态 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java index f97c99f..ee2df48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java @@ -1,20 +1,18 @@ package com.lyms.platform.operate.web.request; -import java.util.Date; - import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; /** * 产妇管理请求 - * + * * @author Administrator */ @Form public class PuerperaManagerQueryRequest extends BasePageQueryRequest { /** - * + * */ private static final long serialVersionUID = 1L; @@ -23,6 +21,26 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest { */ @FormParam("keywords") private String keyword; + @FormParam + private String phone; + @FormParam + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } /** * 社区名称 @@ -77,7 +95,7 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest { } public void setDueDateStart(String dueDateStart) { - this.dueDateStart =dueDateStart; + this.dueDateStart = dueDateStart; } public String getDueDateEnd() { -- 1.8.3.1