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 1e3ec0d..9950f8a 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 @@ -208,7 +208,16 @@ public class PatientFacade { patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart()); patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd()); - patientsQuery.setAge(riskPatientsQueryRequest.getAge()); + + if(null!= riskPatientsQueryRequest.getStartAge()){ + Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge()); + patientsQuery.setBirthEnd(date); + } + if(null!= riskPatientsQueryRequest.getEndAge()){ + Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getEndAge()); + patientsQuery.setBirthStart(date); + } + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); patientsQuery.setIsHighRisk(isHighRisk); 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 89cbf9c..7cda15f 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 @@ -33,7 +33,10 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String endDueWeek; //年龄 @FormParam - private Integer age; + private Integer startAge; + private Integer endAge; + + //风险等级 @FormParam private String rLevel; @@ -106,8 +109,20 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { this.expVip = expVip; } - public void setAge(Integer age) { - this.age = age; + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; } public void sethScore(Integer hScore) { @@ -122,9 +137,6 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { this.serviceStatus = serviceStatus; } - public Integer getAge() { - return age; - } public Integer gethScore() { return hScore;