diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 85d6331..28f99bc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -263,7 +263,7 @@ public class BabyModel extends BaseModel { */ private Integer yn; /** - * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0 + * 数据状态 1-孕妇分娩自动建档、更新为正式数据时修改为0,2:小程序建档 */ private Integer dataStatus; //预产期 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 644360c..ea7fbda 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 @@ -2223,7 +2223,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("dataStatus", 1, MongoOper.NE); } else { List mongoCondits = new ArrayList<>(); - mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS)); + mongoCondits.add(new MongoCondition("yn", 1, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS))); mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); } @@ -2231,8 +2231,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if (fmDataStatu != null && fmDataStatu == true) { - condition = condition.and("dataStatus", 1, MongoOper.IS); - condition = condition.and("yn", 0, MongoOper.IS); +// condition = condition.and("dataStatus", 1, MongoOper.IS); +// condition = condition.and("yn", 0, MongoOper.IS); + List mongoCondits = new ArrayList<>(); + mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS)); + mongoCondits.add(new MongoCondition("yn", 0, MongoOper.IS).andCondition(new MongoCondition("dataStatus", 2, MongoOper.IS))); + + condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); + } if (null != babyWeightStart) { 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 51fdd96..1a05318 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 @@ -19,7 +19,7 @@ public class BabyManageRequest extends BaseQuery { private Integer serviceType; //妈咪身份证号 private String mcardNo; - //儿童管理类型 0 非高危 1 高危 2/空 全部 5:早产儿(秦皇岛定制) + //儿童管理类型 0 非高危 1 高危 2/空 全部 5:早产儿(秦皇岛定制) 4:分娩自动建档到儿童预建档 private Integer highRiskType; //儿童身份证 private String bcardNo;