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 46efe5e..e6fa8fe 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 @@ -214,10 +214,15 @@ public class PatientFacade { patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd()); patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart()); + if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeEnd())){ + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeEnd())); + } + if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeStart())){ + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeStart())); + } if (null != riskPatientsQueryRequest.getStartAge()) { Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge()); - patientsQuery.setBirthEnd(date); } if (null != riskPatientsQueryRequest.getEndAge()) { 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 74808e6..973a909 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 @@ -61,11 +61,30 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //体验会员 0非会员 1会员 @FormParam private Integer expVip; - + //建档时间开始 + private String buildTimeStart; + // + private String buildTimeEnd; // 0 高危孕妇 1 全部孕妇 2全部产妇 private Integer queryType; + public String getBuildTimeEnd() { + return buildTimeEnd; + } + + public void setBuildTimeEnd(String buildTimeEnd) { + this.buildTimeEnd = buildTimeEnd; + } + + public String getBuildTimeStart() { + return buildTimeStart; + } + + public void setBuildTimeStart(String buildTimeStart) { + this.buildTimeStart = buildTimeStart; + } + public Integer getQueryType() { return queryType; }