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 e6fa8fe..17972cd 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,13 +214,18 @@ 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(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTime())){ + + String nextDateStr = riskPatientsQueryRequest.getBuildTime(); + String[] dates = nextDateStr.split(" - "); + + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(dates[0])); + if(dates.length==2){ + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(dates[1])); + } } + if (null != riskPatientsQueryRequest.getStartAge()) { Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge()); patientsQuery.setBirthEnd(date); 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 973a909..715c341 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,28 +61,19 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //体验会员 0非会员 1会员 @FormParam private Integer expVip; - //建档时间开始 - private String buildTimeStart; + //建档时间 + private String buildTime; // - private String buildTimeEnd; // 0 高危孕妇 1 全部孕妇 2全部产妇 private Integer queryType; - public String getBuildTimeEnd() { - return buildTimeEnd; + public String getBuildTime() { + return buildTime; } - public void setBuildTimeEnd(String buildTimeEnd) { - this.buildTimeEnd = buildTimeEnd; - } - - public String getBuildTimeStart() { - return buildTimeStart; - } - - public void setBuildTimeStart(String buildTimeStart) { - this.buildTimeStart = buildTimeStart; + public void setBuildTime(String buildTime) { + this.buildTime = buildTime; } public Integer getQueryType() {