From bf764c7670010540c66955cee461b5356ba8005f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 30 Apr 2020 09:28:46 +0800 Subject: [PATCH] update --- .../com/lyms/platform/query/ResidentsArchiveQuery.java | 14 ++++++++++++++ .../operate/web/service/impl/PreEugebicsServiceImpl.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java index d1a2109..d29e931 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java @@ -142,6 +142,8 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative private Date checkupTimeStart; private Date checkupTimeEnd; + private Boolean checkupExist; + @Override public MongoQuery convertToQuery() { @@ -153,6 +155,10 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative if (checkup != null) { condition = condition.and("checkup", checkup, MongoOper.IS); } + + if (checkupExist != null) { + condition = condition.and("checkup", checkupExist, MongoOper.EXISTS); + } if (isHistory) { condition = condition.and("isHistory", false, MongoOper.EXISTS); } @@ -347,6 +353,14 @@ public class ResidentsArchiveQuery extends BaseQuery implements IConvertToNative //0 或者空不是 1是 private Integer hasHj; + public Boolean getCheckupExist() { + return checkupExist; + } + + public void setCheckupExist(Boolean checkupExist) { + this.checkupExist = checkupExist; + } + public Date getCheckupTimeStart() { return checkupTimeStart; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index ff0f396..c4ace80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -592,7 +592,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen //查询条件 ResidentsArchiveQuery query = new ResidentsArchiveQuery(); query.setYn(YnEnums.YES.getId()); - query.setCheckup(1); + query.setCheckupExist(true); query.setSex(SystemConfig.WOMAN_ID); query.setStreetId(item.getId()); -- 1.8.3.1