diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 59428a9..fbb4517 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -32,6 +32,26 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery * 末次月经 */ private Date lastMensesEnd; + //产检孕周 + private Integer cDueWeekStart; + private Integer cDueWeekEnd; + + + public Integer getcDueWeekStart() { + return cDueWeekStart; + } + + public void setcDueWeekStart(Integer cDueWeekStart) { + this.cDueWeekStart = cDueWeekStart; + } + + public Integer getcDueWeekEnd() { + return cDueWeekEnd; + } + + public void setcDueWeekEnd(Integer cDueWeekEnd) { + this.cDueWeekEnd = cDueWeekEnd; + } //生日查询 private Date birthEnd; @@ -460,6 +480,21 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery c = Criteria.where("brith").lte(birthEnd); } } + if (null != cDueWeekStart) { + if (null != c) { + c = c.and("cDay").gte(cDueWeekStart); + } else { + c = Criteria.where("cDay").gte(cDueWeekStart); + } + } + + if (null != cDueWeekEnd) { + if (null != c) { + c = c.lte(cDueWeekEnd); + } else { + c = Criteria.where("cDay").lte(cDueWeekEnd); + } + } if (null != c) { condition = condition.andCondition(new MongoCondition(c)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 02f313f..f7b55b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -113,11 +113,11 @@ public class AntExRecordFacade { } //产检孕周 if (null != antExManagerQueryRequest.getStartDueWeek()) { - antExRecordQuery.setLastMensesEnd(antExManagerQueryRequest.capStart()); + antExRecordQuery.setcDueWeekStart(antExManagerQueryRequest.capStart()); } if (null != antExManagerQueryRequest.getEndDueWeek()) { - antExRecordQuery.setLastMensesStart(antExManagerQueryRequest.capEnd()); + antExRecordQuery.setcDueWeekEnd(antExManagerQueryRequest.capEnd()); } //预产期 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index cbd821b..f4944f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -74,20 +74,18 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { - public Date capStart() { + public Integer capStart() { if (StringUtils.isNotEmpty(startDueWeek) ) { int start = NumberUtils.toInt(startDueWeek, 0); - Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start * 7)); - return endDate; + return (start * 7); } return null; } - public Date capEnd() { + public Integer capEnd() { if (StringUtils.isNotEmpty(endDueWeek)) { int end = NumberUtils.toInt(endDueWeek, 0); - Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6); - return endDate; + return (end*7)+6; } return null; }