From a40e62f76f3ed32244064cf894053cd581b5a61f Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Tue, 5 Jul 2022 11:47:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E9=A2=84=E5=BB=BA=E6=A1=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BB=BA=E6=A1=A3?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/BabyModel.java      |  2 +-
 .../main/java/com/lyms/platform/query/BabyModelQuery.java    | 12 +++++++++---
 .../lyms/platform/operate/web/request/BabyManageRequest.java |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

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<MongoCondition> 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<MongoCondition> 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;
-- 
1.8.3.1