diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java index cf37e79..761e339 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java @@ -34,11 +34,11 @@ public class BaseQuery { private int startNum; private int endNum; - +/* private Date startTimeStart; private Date startTimeEnd; private Date endTimeStart; - private Date endTimeEnd; + private Date endTimeEnd;*/ public String getKeyword() { return keyword; @@ -48,37 +48,7 @@ public class BaseQuery { this.keyword = keyword; } - public Date getStartTimeStart() { - return startTimeStart; - } - - public void setStartTimeStart(Date startTimeStart) { - this.startTimeStart = startTimeStart; - } - - public Date getStartTimeEnd() { - return startTimeEnd; - } - - public void setStartTimeEnd(Date startTimeEnd) { - this.startTimeEnd = startTimeEnd; - } - public Date getEndTimeStart() { - return endTimeStart; - } - - public void setEndTimeStart(Date endTimeStart) { - this.endTimeStart = endTimeStart; - } - - public Date getEndTimeEnd() { - return endTimeEnd; - } - - public void setEndTimeEnd(Date endTimeEnd) { - this.endTimeEnd = endTimeEnd; - } public int getCount() { return count; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 62496e2..5591ea7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -21,6 +21,8 @@ public class MaternalDeliverModel { private String pid; //分娩时间 private String dueDate; + + private Date dueDate1; //分娩孕周 private String dueWeek; //台数 @@ -111,6 +113,14 @@ public class MaternalDeliverModel { this.hospitalId = hospitalId; } + public Date getDueDate1() { + return dueDate1; + } + + public void setDueDate1(Date dueDate1) { + this.dueDate1 = dueDate1; + } + public Date getCreated() { return created; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 3d7d282..2601a09 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -5,13 +5,13 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; /** - * * 产妇分娩记录查询 - * + *

* Created by Administrator on 2016/6/17 0017. */ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery { @@ -63,28 +63,49 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery @Override public MongoQuery convertToQuery() { - MongoCondition condition=MongoCondition.newInstance(); - if(null!=id){ - condition=condition.and("id",id, MongoOper.IS); + MongoCondition condition = MongoCondition.newInstance(); + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); } - if(null!=pid){ - condition=condition.and("pid",pid, MongoOper.IS); + if (null != pid) { + condition = condition.and("pid", pid, MongoOper.IS); } - if(null!=vcCardNo){ - condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS); + if (null != vcCardNo) { + condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if(null!=dueDate){ - condition=condition.and("dueDate",dueDate,MongoOper.IS); + if (null != dueDate) { + condition = condition.and("dueDate", dueDate, MongoOper.IS); } - if(null!=cardNo) { + + + if (null != cardNo) { condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if(null!=yn){ + if (null != yn) { condition = condition.and("yn", yn, MongoOper.IS); } - if(null!=parentId){ + if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + Criteria c = null; + + Boolean isAddStart = Boolean.FALSE; + + if (null != createdStart) { + c = Criteria.where("dueDate1").gte(createdStart); + isAddStart = Boolean.TRUE; + } + if (null != endStart) { + if (isAddStart) { + c = c.lte(endStart); + } else { + c = Criteria.where("dueDate1").lte(endStart); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java index b22eb31..a450f86 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java @@ -8,7 +8,9 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.result.BaseModel; import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.query.Criteria; +import java.util.Date; import java.util.List; /** @@ -29,12 +31,30 @@ public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { //终止妊娠日期 private String stopDate; + private Date stopDateStart; + private Date stopDateEnd; //录入人 private String inPerson; private Integer yn=-1; private String pid; + public Date getStopDateEnd() { + return stopDateEnd; + } + + public void setStopDateEnd(Date stopDateEnd) { + this.stopDateEnd = stopDateEnd; + } + + public Date getStopDateStart() { + return stopDateStart; + } + + public void setStopDateStart(Date stopDateStart) { + this.stopDateStart = stopDateStart; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -51,6 +71,23 @@ public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { if (null!= pid) { condition = condition.and("pid", pid, MongoOper.IS); } + Criteria c=null; + Boolean isAddStart = Boolean.FALSE; + if (null != stopDateStart) { + c = Criteria.where("stopDate").gte(stopDateStart); + isAddStart = Boolean.TRUE; + } + if (null != stopDateEnd) { + if (isAddStart) { + c = c.lte(stopDateEnd); + } else { + c = Criteria.where("stopDate").lte(stopDateEnd); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d7b70de..c30b6e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -538,7 +538,9 @@ public class MatDeliverFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); - matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setCreatedStart(patients.getLastMenses()); +// matDeliverQuery.setYn(YnEnums.YES.getId()); +// matDeliverQuery.setspatients.getFmDate(); List list = matDeliverService.query(matDeliverQuery); MatDeliverListResult matDeliverListResult = new MatDeliverListResult(); matDeliverListResult.convertToResult(patients); @@ -572,8 +574,9 @@ public class MatDeliverFacade { matDeliverListResult.setData(list12); } else { StopPregQuery stopPregQuery = new StopPregQuery(); - stopPregQuery.setYn(YnEnums.YES.getId()); +// stopPregQuery.setYn(YnEnums.YES.getId()); stopPregQuery.setPatientId(patients.getId()); + stopPregQuery.setStopDateStart(patients.getLastMenses()); List list2 = stopPregnancyService.queryStopPreg(stopPregQuery); if (CollectionUtils.isEmpty(list2)) { matDeliverListResult.setDueType("1");