diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index 32c6642..a271d27 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -41,6 +41,8 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ private String uname; //出生日期 private Date birthday; + private Date birthdayStart; + private Date birthdayEnd; //民族Id private String nationId; //身份证件号 @@ -378,6 +380,14 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ } } + if (null != birthdayStart && birthdayEnd != null) { + if (null != c) { + c = c.and("birthday").gte(birthdayStart).lte(birthdayEnd); + } else { + c = Criteria.where("birthday").gte(birthdayStart).lte(birthdayEnd); + } + } + if(null != isFollow){ condition=condition.and("isLast", 2, MongoOper.IS); @@ -431,7 +441,21 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ return condition.toMongoQuery(); } + public Date getBirthdayStart() { + return birthdayStart; + } + public void setBirthdayStart(Date birthdayStart) { + this.birthdayStart = birthdayStart; + } + + public Date getBirthdayEnd() { + return birthdayEnd; + } + + public void setBirthdayEnd(Date birthdayEnd) { + this.birthdayEnd = birthdayEnd; + } public String getZhzd() { return zhzd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index ed6638a..0b031d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -351,6 +351,11 @@ public class CancerScreeningFacade { query.setCreatedEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(arrs[1]))); } + if (queryRequest.getStartAge() != null && queryRequest.getEndAge() != null) { + query.setBirthdayEnd(DateUtil.addYear(new Date(),-queryRequest.getStartAge())); + query.setBirthdayStart(DateUtil.addYear(new Date(),-queryRequest.getEndAge())); + } + query.setLeftRight(queryRequest.getLeftRight()); query.setRxcsLevel(queryRequest.getRxcsLevel()); query.setRxxLevel(queryRequest.getRxxLevel()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java index 15284a2..7a62a9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java @@ -103,6 +103,25 @@ public class CancerScreeningRequest extends BasePageQueryRequest { private Integer yqDaysStart; private Integer yqDaysEnd; + private Integer startAge; + private Integer endAge; + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; + } + + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } + public Integer getYqDaysStart() { return yqDaysStart; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java index e2724cf..e9f9335 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java @@ -68,6 +68,25 @@ public class CervicalCancerListRequest extends BaseQuery { private Integer yqDaysStart; private Integer yqDaysEnd; + private Integer startAge; + private Integer endAge; + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; + } + + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } + public Integer getYqDaysStart() { return yqDaysStart; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index e229608..4312e10 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -264,6 +264,10 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { query.addCriteria(Criteria.where("checkPackage").is(checkPackage)); } + if (null!=param.getStartAge() && param.getEndAge() != null) { + query.addCriteria(Criteria.where("age").gte(param.getStartAge()).lte(param.getEndAge())); + } + /*20201021 wtt 陵城需求 start */ String fklcjczd = param.getFklcjczd();//妇科检查临床诊断异常项 if(StringUtils.isNotEmpty(hospitalId)&&"2100001605".equals(hospitalId)){//隆化需求(前端存的数据格式是数组true和false)