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 583d025..7ee2812 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 @@ -614,7 +614,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("sieveType", sieveType, MongoOper.IS); } - if (StringUtils.isNotEmpty(costType)) { + /*if (StringUtils.isNotEmpty(costType)) { // costType = null/1 免费 if ("1".equals(costType)) { MongoCondition c = MongoCondition.newInstance(); @@ -630,6 +630,10 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { else { condition = condition.and("costType", costType, MongoOper.IS); } + }*/ + + if (null != costType) { + condition = condition.and("costType", costType, MongoOper.IS); } if (StringUtils.isNotEmpty(reportType)) { 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 a0c5f99..7ec0fb0 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 @@ -2338,11 +2338,9 @@ public class BabyBookbuildingFacade { babyQuery.setDataStatus(true);//排除自动建档数据 babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setMphone(request.getMphone());//母亲联系方式 - if (StringUtils.isNotEmpty(request.getBirth())) {//生日 - String birthStr = request.getBirth(); - String[] dates = birthStr.split(" - "); - babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); - babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); + if (StringUtils.isNotEmpty(request.getBirthStart()) && StringUtils.isNotEmpty(request.getBirthEnd())) {//生日 + babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart())); + babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(request.getBirthEnd()).getTime() + 24 * 60 * 60 * 1000 - 1)); } models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); //如果有高危儿多项就加一下 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 7b8f541..dfe2dc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -30,6 +30,9 @@ public class BabyManageRequest extends BaseQuery { private String birth; //下次预约时间 private String nextDate; + //生日 + private String birthStart; + private String birthEnd; //结案时间 private String endCaseTime; //母亲联系方式 @@ -94,6 +97,22 @@ public class BabyManageRequest extends BaseQuery { //分娩医院 private String fmHospitalId; + public String getBirthStart() { + return birthStart; + } + + public void setBirthStart(String birthStart) { + this.birthStart = birthStart; + } + + public String getBirthEnd() { + return birthEnd; + } + + public void setBirthEnd(String birthEnd) { + this.birthEnd = birthEnd; + } + public String getFmHospitalId() { return fmHospitalId; }