diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 5d49944..d7367fb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -10,9 +10,8 @@ import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; /** - * * 产前筛查 - * + *
* Created by Administrator on 2016/7/5 0005. */ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { @@ -44,9 +43,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { private Integer yn; //孕周开始 - private Date dueWeekStart; + private Integer dueWeekStart; //孕周结束 - private Date dueWeekEnd; + private Integer dueWeekEnd; /** * 末次月经 @@ -89,19 +88,19 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { this.isNotify = isNotify; } - public Date getDueWeekEnd() { + public Integer getDueWeekEnd() { return dueWeekEnd; } - public void setDueWeekEnd(Date dueWeekEnd) { + public void setDueWeekEnd(Integer dueWeekEnd) { this.dueWeekEnd = dueWeekEnd; } - public Date getDueWeekStart() { + public Integer getDueWeekStart() { return dueWeekStart; } - public void setDueWeekStart(Date dueWeekStart) { + public void setDueWeekStart(Integer dueWeekStart) { this.dueWeekStart = dueWeekStart; } @@ -143,8 +142,8 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != id) { condition = condition.and("id", id, MongoOper.IS); } - if(null!=from){ - condition=condition.and("from",from,MongoOper.IS); + if (null != from) { + condition = condition.and("from", from, MongoOper.IS); } if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); @@ -177,8 +176,25 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != renShenResult) { condition = condition.and("renShenResult", renShenResult, MongoOper.IS); } - boolean isAddStart = Boolean.FALSE; + Criteria c = null; + boolean isAddStart = Boolean.FALSE; + if (null != dueWeekStart) { + c = Criteria.where("dueWeek").gte(dueWeekStart); + isAddStart = Boolean.TRUE; + } + if (null != dueWeekEnd) { + if (isAddStart) { + c = c.lte(dueWeekEnd); + } else { + c = Criteria.where("dueWeek").lte(dueWeekEnd); + } + isAddStart = Boolean.TRUE; + } + + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } if (null != lastMensesStart) { c = Criteria.where("lastMenses").gte(lastMensesStart); isAddStart = Boolean.TRUE; @@ -260,7 +276,6 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } - public Integer getTireNumber() { return tireNumber; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index f728797..359a261 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -28,6 +28,7 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -135,8 +136,12 @@ public class SieveFacade { sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult()); sieveQuery.setName(cqSieveQueryRequest.getName()); sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo()); - sieveQuery.setDueWeekStart(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekStart())); - sieveQuery.setDueWeekEnd(DateUtil.parseYMD(cqSieveQueryRequest.getDueWeekEnd())); + if(null!=cqSieveQueryRequest.getDueWeekStart()){ + sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart())); + } + if(null!=cqSieveQueryRequest.getDueWeekEnd()){ + sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())); + } sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx()); sieveQuery.setIsNotify(cqSieveQueryRequest.getIsNotify()); sieveQuery.setPage(cqSieveQueryRequest.getPage());