diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 915ffff..72e7344 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -154,6 +154,25 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String deathCause; + private Integer startAge; + + private Integer endAge; + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; + } + + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } public List getHospitalIdList() { return hospitalIdList; @@ -225,6 +244,7 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("fmAge", fmAge, MongoOper.IS); } + if (null != pregnancyOut) { condition = condition.and("baby.pregnancyOut", pregnancyOut, MongoOper.IS); } @@ -359,6 +379,8 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } isAddStart = Boolean.TRUE; } + + if (null != createdTimeStart && null != createdTimeEnd) { if (null != c) { c = c.where("created").gte(createdTimeStart).lte(createdTimeEnd); @@ -367,6 +389,16 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } isAddStart = Boolean.TRUE; } + + if (null != startAge && null != endAge) { + if (null != c) { + c = c.where("fmAge").gte(startAge).lte(endAge); + } else { + c = Criteria.where("fmAge").gte(startAge).lte(endAge); + } + isAddStart = Boolean.TRUE; + } + if (null != modifiedStart && null != modifiedEnd) { if (null != c) { c = c.where("modified").gte(modifiedStart).lte(modifiedEnd); 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 4b80392..78fddba 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 @@ -2214,6 +2214,14 @@ public class MatDeliverFacade { } babyModelQuery.setBuildType(2); babyModelQuery.setOrder("birth"); + //添加儿童性别筛选添加 + if (null != newBabyManagerRequest.getBabySex()) { + //只统计活产 + babyModelQuery.setPregnancyOut("0"); + } + babyModelQuery.setSex(newBabyManagerRequest.getBabySex()); + + babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId())); if (null != newBabyManagerRequest.getHuge() && 1 == newBabyManagerRequest.getHuge()) { babyModelQuery.setBabyWeightStart("4"); @@ -2241,6 +2249,8 @@ public class MatDeliverFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setParentIdList(parentIdList); + matDeliverQuery.setStartAge(newBabyManagerRequest.getStartAge()); + matDeliverQuery.setEndAge(newBabyManagerRequest.getEndAge()); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); List newBabyManagerQueryModelList = new ArrayList<>(); for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { @@ -2276,8 +2286,6 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth())); } BeanUtils.copy(babyModel, newBabyManagerQueryModel); - - String apgarScorePf1 = ""; String apgarScorePf5 = ""; String apgarScorePf10 = ""; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java index 161c25b..84da304 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java @@ -42,6 +42,37 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { private String asphyxiaMEnd; + //产妇年龄 + private Integer startAge; + + private Integer endAge; + + private Integer babySex; + + public Integer getStartAge() { + return startAge; + } + + public void setStartAge(Integer startAge) { + this.startAge = startAge; + } + + public Integer getEndAge() { + return endAge; + } + + public void setEndAge(Integer endAge) { + this.endAge = endAge; + } + + public Integer getBabySex() { + return babySex; + } + + public void setBabySex(Integer babySex) { + this.babySex = babySex; + } + public String getAsphyxiaMStart() { return asphyxiaMStart; }