From 1dfd325b3cdeabfc3920173b70dcf653a1ed5509 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 1 Nov 2016 11:26:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/BabyModelQuery.java | 73 +++++++++++----------- .../operate/web/facade/BabyBookbuildingFacade.java | 9 ++- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 362bf13..782a0c5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -29,7 +29,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String mphone; private String mname; - private String communityId; + private String communityId; private Integer buildType; @@ -374,7 +374,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); - boolean isAddStart = Boolean.FALSE; if (-1 != visitstatus) { condition = condition.and("visitstatus", visitstatus, MongoOper.IS); @@ -391,38 +390,38 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != areaId) { condition = condition.and("areaId", areaId, MongoOper.IS); } - if(null!=communityId){ - condition=condition.and("communityId",communityId,MongoOper.IS); + if (null != communityId) { + condition = condition.and("communityId", communityId, MongoOper.IS); } - if(null!=isNull){ - condition=condition.and("communityId", null, MongoOper.IS); + if (null != isNull) { + condition = condition.and("communityId", null, MongoOper.IS); } - if(!StringUtils.isEmpty(mcertNo)){ - condition=condition.and("mcertNo", mcertNo, MongoOper.IS); + if (!StringUtils.isEmpty(mcertNo)) { + condition = condition.and("mcertNo", mcertNo, MongoOper.IS); } - if(!StringUtils.isEmpty(cardNo)){ - condition=condition.and("cardNo", cardNo, MongoOper.IS); + if (!StringUtils.isEmpty(cardNo)) { + condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if(!StringUtils.isEmpty(vcCardNo)){ - condition=condition.and("vcCardNo", vcCardNo, MongoOper.IS); + if (!StringUtils.isEmpty(vcCardNo)) { + condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if(null!=hospitalId){ - condition=condition.and("hospitalId", hospitalId, MongoOper.IS); + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } - if(!StringUtils.isEmpty(lastDiagnose)){ - condition=condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); + if (!StringUtils.isEmpty(lastDiagnose)) { + condition = condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); } - if(!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)){ + if (!StringUtils.isEmpty(phoneId) || !StringUtils.isEmpty(cardId)) { MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1, con}); } - if(null != buildTypeList) { + if (null != buildTypeList) { MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); @@ -431,32 +430,32 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); } - if(null!=sex){ - condition=condition.and("sex", sex, MongoOper.IS); + if (null != sex) { + condition = condition.and("sex", sex, MongoOper.IS); } - if(null!=lastHighRisk){ - condition=condition.and("lastHighRisk", lastHighRisk, MongoOper.IS); + if (null != lastHighRisk) { + condition = condition.and("lastHighRisk", lastHighRisk, MongoOper.IS); } - if(null!=serviceStatus){ - condition=condition.and("serviceStatus", serviceStatus, MongoOper.IS); + if (null != serviceStatus) { + condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS); } - if(null!=serviceType){ - condition=condition.and("serviceType", serviceType, MongoOper.IS); + if (null != serviceType) { + condition = condition.and("serviceType", serviceType, MongoOper.IS); } if (null != orServiceStatus && orServiceStatus.length > 1) { - Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0],orServiceStatus[1]); - condition.andCondition( new MongoCondition(c)); + Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]); + condition.andCondition(new MongoCondition(c)); } if (null != keyword) { if (null != keyword) { - MongoCondition con1 = MongoCondition.newInstance("mphone", "^"+keyword, MongoOper.LIKE); + MongoCondition con1 = MongoCondition.newInstance("mphone", "^" + keyword, MongoOper.LIKE); MongoCondition con - = MongoCondition.newInstance("mname", "^"+keyword, MongoOper.LIKE); + = MongoCondition.newInstance("mname", "^" + keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1, con}); } } @@ -492,10 +491,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { Criteria c = null; if (null != birthStart) { c = Criteria.where("birth").gte(birthStart); - isAddStart = Boolean.TRUE; } - if (null != nextDateStart && nextDateEnd != null) { + if (null != nextDateStart && nextDateEnd != null) { Criteria cr = Criteria.where("nextDate").gte(nextDateStart).lte(nextDateEnd); condition.andCondition(new MongoCondition(cr)); @@ -503,22 +501,21 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != gteModified && null != gteCreated) { - MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); } if (null != birthEnd) { - if (isAddStart) { + if (null != c) { c = c.lte(birthEnd); } else { c = Criteria.where("birth").lte(birthEnd); } - isAddStart = Boolean.TRUE; } - if(null!=buildDateStart){ + if (null != buildDateStart) { if (null != c) { c = c.and("buildDate").gte(buildDateStart); } else { @@ -526,7 +523,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } - if(null!=buildDateEnd){ + if (null != buildDateEnd) { if (null != c) { c = c.lte(buildDateEnd); } else { @@ -534,7 +531,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } - if (isAddStart) { + if (c != null) { 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/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d6b7f4d..65c4094 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1585,7 +1585,14 @@ public class BabyBookbuildingFacade { if(org.apache.commons.lang.StringUtils.isNotEmpty(request.getDateRange())){ String[] dates = request.getDateRange().split(" - "); babyQuery.setBuildDateStart(DateUtil.parseYMD(dates[0])); - babyQuery.setBuildDateEnd(DateUtil.parseYMD(dates[1])); + if(dates.length>=2){ + Date date= DateUtil.parseYMD(dates[1]); + if(dates[0].equals(dates[1])){ + long d = DateUtil.parseYMD(dates[1]).getTime() + 86398000; + date = new Date(d); + } + babyQuery.setBuildDateEnd(date); + } } List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); -- 1.8.3.1