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 c5cf09a..20217bf 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 @@ -58,6 +58,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String phoneOrcardNo; + //畸形key + private String deformityKey; + + public String getDeformityKey() { + return deformityKey; + } + + public void setDeformityKey(String deformityKey) { + this.deformityKey = deformityKey; + } + public String getMphoneOrFphone() { return mphoneOrFphone; } @@ -608,7 +619,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("heightWeight", heightWeight, MongoOper.IS); } - + //畸形 + if (StringUtils.isNotEmpty(deformityKey)) { + condition = condition.and(deformityKey, true, MongoOper.IS); + } if (!StringUtils.isEmpty(mcertNo)) { condition = condition.and("mcertNo", mcertNo, 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 054fcba..2902374 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 @@ -2090,6 +2090,7 @@ public class MatDeliverFacade { // 什么都不做,这里是数据传入错误了 } } + babyModelQuery.setDeformityKey(newBabyManagerRequest.getDeformityKey()); babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType()); babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId()); if (!newBabyManagerRequest.isExcel()) { 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 21805c7..9c1cc51 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 @@ -33,6 +33,16 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { private Integer operatorId; private String patientId; + //畸形key + private String deformityKey; + + public String getDeformityKey() { + return deformityKey; + } + + public void setDeformityKey(String deformityKey) { + this.deformityKey = deformityKey; + } public String getPatientId() { return patientId;