From 10d125ce356c488795cfda346795b33a8558d10c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 8 Aug 2016 20:01:25 +0800 Subject: [PATCH] 1 --- .../lyms/platform/biz/service/PatientsService.java | 18 +++++-- .../java/com/lyms/platform/query/SieveQuery.java | 56 ++++++++++++++++++++++ .../platform/data/controller/TaskController.java | 3 ++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 8f118c9..00ebc37 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -147,10 +147,22 @@ public class PatientsService { } /** - * 删除过期产筛的数据 + * 删除过期产筛的数据,删掉自动到期的部分 + * */ - private void delSieve(){ - + public void delSieve(){ + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setFrom("0"); + Date endDate = DateUtil.addDay(new Date(), -146); + sieveQuery.setLastMensesStart(endDate); + List list = sieveDao.queryList(sieveQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(list)){ + for(SieveModel sieveModel:list) { + sieveModel.setYn(YnEnums.NO.getId()); + sieveDao.updateChanQianSieve(sieveModel); + } + } } /** 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 08cab94..5d49944 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 @@ -5,6 +5,7 @@ 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; @@ -47,9 +48,31 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { //孕周结束 private Date dueWeekEnd; + /** + * 末次月经 + */ + private Date lastMensesStart; + + /** + * 末次月经 + */ + private Date lastMensesEnd; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + //是否通知 private Integer isNotify; + public Integer getRenShenResult() { + return renShenResult; + } + public String getHospitalId() { return hospitalId; } @@ -98,6 +121,22 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { this.status = status; } + public Date getLastMensesEnd() { + return lastMensesEnd; + } + + public void setLastMensesEnd(Date lastMensesEnd) { + this.lastMensesEnd = lastMensesEnd; + } + + public Date getLastMensesStart() { + return lastMensesStart; + } + + public void setLastMensesStart(Date lastMensesStart) { + this.lastMensesStart = lastMensesStart; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -138,6 +177,23 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != renShenResult) { condition = condition.and("renShenResult", renShenResult, MongoOper.IS); } + boolean isAddStart = Boolean.FALSE; + Criteria c = null; + if (null != lastMensesStart) { + c = Criteria.where("lastMenses").gte(lastMensesStart); + isAddStart = Boolean.TRUE; + } + if (null != lastMensesEnd) { + if (isAddStart) { + c = c.lte(lastMensesEnd); + } else { + c = Criteria.where("lastMenses").lte(lastMensesEnd); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } return condition.toMongoQuery(); } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java index e93bec7..b4cdeb0 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java @@ -113,6 +113,9 @@ public class TaskController extends BaseController { }else if("autoMatDeliver".equals(sid)){ patientsService.autoMatDeliver(); writeString(response, "success"); + }else if("delSieve".equals(sid)){ + patientsService.delSieve(); + writeString(response, "success"); } else { -- 1.8.3.1