From 7cc5ab7027cae33dc5a3fb8d50b445753dc778c3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 24 Jun 2016 10:57:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/PatientsQuery.java | 50 +++++++++++++--------- .../platform/operate/web/facade/PatientFacade.java | 1 + .../web/request/RiskPatientsQueryRequest.java | 30 +++++++++++++ 3 files changed, 61 insertions(+), 20 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 aa2499f..a31f8ae 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 @@ -1,6 +1,7 @@ package com.lyms.platform.query; import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; @@ -29,22 +30,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Boolean isHighRisk; - public Boolean getIsHighRisk() { - return isHighRisk; - } - - public void setIsHighRisk(Boolean isHighRisk) { - this.isHighRisk = isHighRisk; - } - - public Boolean getIsNull() { - return isNull; - } - - public void setIsNull(Boolean isNull) { - this.isNull = isNull; - } - /** * 产妇名称 */ @@ -61,7 +46,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String areaId; //社区id private String areaIdOrRestId; - + //服务状态 + private Integer serviceStatus; + //体验会员 0非会员 1会员 + private Integer expVip; /** * 产妇手机号 @@ -106,7 +94,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { */ private String serviceType; - private String serviceStatus; /** * 风险等级 @@ -130,12 +117,35 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { * 1:孕妇,2:儿童 */ private int type = -1; + public Boolean getIsHighRisk() { + return isHighRisk; + } + + public void setIsHighRisk(Boolean isHighRisk) { + this.isHighRisk = isHighRisk; + } + + public Boolean getIsNull() { + return isNull; + } + + public void setIsNull(Boolean isNull) { + this.isNull = isNull; + } + + public Integer getExpVip() { + return expVip; + } + + public void setExpVip(Integer expVip) { + this.expVip = expVip; + } - public String getServiceStatus() { + public Integer getServiceStatus() { return serviceStatus; } - public void setServiceStatus(String serviceStatus) { + public void setServiceStatus(Integer serviceStatus) { this.serviceStatus = serviceStatus; } 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 472643e..76bfe6e 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 @@ -205,6 +205,7 @@ public class PatientFacade { patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); patientsQuery.setIsHighRisk(isHighRisk); + patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus()); //查询符合条件的孕妇 List patientses = patientsService.queryPatient(patientsQuery); List data = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 581f166..1f7e383 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -39,6 +39,36 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //检查时间 @FormParam private String cTime; + //服务状态 + @FormParam + private Integer serviceStatus; + //体验会员 0非会员 1会员 + @FormParam + private Integer expVip; + + public Integer getExpVip() { + return expVip; + } + + public void setExpVip(Integer expVip) { + this.expVip = expVip; + } + + public void setAge(Integer age) { + this.age = age; + } + + public void sethScore(Integer hScore) { + this.hScore = hScore; + } + + public Integer getServiceStatus() { + return serviceStatus; + } + + public void setServiceStatus(Integer serviceStatus) { + this.serviceStatus = serviceStatus; + } public int getAge() { return age; -- 1.8.3.1