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 317c291..8e2eeed 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 @@ -224,6 +224,28 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private Boolean isNull; + + private Date startAge; + + private Date endAge; + + + public Date getStartAge() { + return startAge; + } + + public void setStartAge(Date startAge) { + this.startAge = startAge; + } + + public Date getEndAge() { + return endAge; + } + + public void setEndAge(Date endAge) { + this.endAge = endAge; + } + public Integer getEndCase() { return endCase; } @@ -523,8 +545,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } - - public Integer[] getOrServiceStatus() { return orServiceStatus; } @@ -825,7 +845,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if (null != endCase) { - condition=condition.and("endCase",endCase,MongoOper.IS); + condition = condition.and("endCase", endCase, MongoOper.IS); } @@ -850,7 +870,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("liveType", liveType, MongoOper.IS); } - if (null != deliverOrg) { + if (null != deliverOrg) { condition = condition.and("deliverOrg", deliverOrg, MongoOper.IS); } @@ -1056,6 +1076,26 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + //母亲年龄查询 + /* if (null != startAge && null != endAge) { + if (null != c) { + c = c.where("mbirth").gte(startAge).lte(endAge); + } else { + c = Criteria.where("mbirth").gte(startAge).lte(endAge); + } + }*/ + + if (null != startAge) { + c = Criteria.where("mbirth").lte(startAge); + } + + if (null != endAge) { + if (null != c) { + c = c.gte(endAge); + } else { + c = Criteria.where("mbirth").gte(endAge); + } + } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); 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 355610a..9d70de5 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 @@ -2232,6 +2232,13 @@ public class MatDeliverFacade { } babyModelQuery.setDataStatus(false); babyModelQuery.setDeformityKey(newBabyManagerRequest.getDeformityKey()); + //新加根据母亲年龄查询 + if (null != newBabyManagerRequest.getStartAge() && null != newBabyManagerRequest.getEndAge()) { + Date start = DateUtil.getBeforeAge(newBabyManagerRequest.getStartAge()); + Date end = DateUtil.getBeforeAge(newBabyManagerRequest.getEndAge()+1); + babyModelQuery.setStartAge(start); + babyModelQuery.setEndAge(end); + } babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType()); babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId()); if (!newBabyManagerRequest.isExcel()) { @@ -2276,8 +2283,11 @@ public class MatDeliverFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentIdList(parentIdList); - matDeliverQuery.setStartAge(newBabyManagerRequest.getStartAge()); - matDeliverQuery.setEndAge(newBabyManagerRequest.getEndAge()); + + + /*matDeliverQuery.setStartAge(newBabyManagerRequest.getStartAge()); + matDeliverQuery.setEndAge(newBabyManagerRequest.getEndAge());*/ + List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); List newBabyManagerQueryModelList = new ArrayList<>(); for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { @@ -2754,7 +2764,7 @@ public class MatDeliverFacade { List> list = new CopyOnWriteArrayList<>(); String cacheKey = query.toString(); Object o = cacheExcelData.get(cacheKey); - if (o != null){ + if (o != null) { list = (List>) o; } else { list = getMapList(childbirthManagerRequest, query); @@ -2768,6 +2778,7 @@ public class MatDeliverFacade { /** * 获取maplist 数据 + * * @param childbirthManagerRequest * @param query * @return