From cb82cd394ccd9874d6a0d3422518c000dccec76d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 16 Oct 2018 12:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=B7=BB=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/MatDeliverQuery.java   | 86 +++++++++++++++-------
 .../web/request/ChildbirthManagerRequest.java      | 11 +++
 2 files changed, 72 insertions(+), 25 deletions(-)

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 5bf2ca7..6f1a171 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
@@ -123,6 +123,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
     //畸形 0非畸形 1畸形
     private Integer deformity;
 
+    // 1  ＜2500g、2 ≥4000g、3 ≥2500g与＜4000g之间
+    private Integer weight;
+
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
@@ -172,30 +175,6 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
             condition = condition.and("baby.deformity", deformity, MongoOper.IS);
         }
 
-        if (hloseBloodType != null) {
-            /**
-             * 出血量：
-             * 顺产：1-产后2小时出血≥300ml、2-产后24小时出血＜500ml、3-产后24小时出血≥500ml
-             * 破宫产：4-产后24小时出血＜1000ml、5-产后24小时出血≥2000ml
-             */
-            switch (hloseBloodType) {
-                case 1:
-                    condition = condition.and("tHloseBloodL", 300, MongoOper.GTE);
-                    break;
-                case 2:
-                    condition = condition.and("rHloseBloodL", 500, MongoOper.LT);
-                    break;
-                case 3:
-                    condition = condition.and("rHloseBloodL", 500, MongoOper.GTE);
-                    break;
-                case 4:
-                    condition = condition.and("rHloseBloodL", 1000, MongoOper.LT);
-                    break;
-                case 5:
-                    condition = condition.and("rHloseBloodL", 2000, MongoOper.GTE);
-                    break;
-            }
-        }
 
         if (null != cardNo) {
             condition = condition.and("cardNo", cardNo, MongoOper.IS);
@@ -258,9 +237,57 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
             condition = condition.and("deliveryMode", deliveryModeQueryJson, MongoOper.LIKE);
         }
         Criteria c = null;
-
         Boolean isAddStart = Boolean.FALSE;
 
+        if (hloseBloodType != null) {
+            isAddStart = Boolean.TRUE;
+            /**
+             * 出血量：
+             * 顺产：1-产后2小时出血≥300ml、2-产后24小时出血＜500ml、3-产后24小时出血≥500ml
+             * 破宫产：4-产后24小时出血＜1000ml、5-产后24小时出血≥2000ml
+             */
+            switch (hloseBloodType) {
+                case 1:
+                    condition = condition.and("tHloseBloodL", 300, MongoOper.GTE);
+                    break;
+                case 2:
+                    condition = condition.and("rHloseBloodL", 500, MongoOper.LT);
+                    break;
+                case 3:
+                    condition = condition.and("rHloseBloodL", 500, MongoOper.GTE);
+                    break;
+                case 4:
+                    condition = condition.and("rHloseBloodL", 1000, MongoOper.LT);
+                    break;
+                case 5:
+                    condition = condition.and("rHloseBloodL", 2000, MongoOper.GTE);
+                    break;
+                case 6:
+                    c = c.where("rHloseBloodL").gte(1000).lt(2000);
+                    break;
+            }
+        }
+
+        if (weight != null) {
+            isAddStart = Boolean.TRUE;
+            //1  ＜2500g、2 ≥4000g、3 ≥2500g与＜4000g之间
+            switch (weight) {
+                case 1:
+                    condition = condition.and("baby.babyWeight", 2500, MongoOper.LT);
+                    break;
+                case 2:
+                    condition = condition.and("baby.babyWeight", 4000, MongoOper.GTE);
+                    break;
+                case 3:
+
+                    c = c.where("baby.babyWeight").gte(2500).lt(4000);
+                    break;
+            }
+        }
+
+
+
+
         if (null != createdStart) {
             if (neStart) {
                 c = Criteria.where("dueDate1").gt(createdStart);
@@ -307,6 +334,15 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery
         return condition.toMongoQuery();
     }
 
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
     public List<String> getPregnancyOuts() {
         return pregnancyOuts;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
index 7d9b963..358a9c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
@@ -165,6 +165,17 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
     //1-需要隐藏姓名、电话、地址
     private int showDetail;
 
+    // 1  ＜2500g、2 ≥4000g、3 ≥2500g与＜4000g之间
+    private Integer weight;
+
+    public Integer getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Integer weight) {
+        this.weight = weight;
+    }
+
     public int getShowDetail() {
         return showDetail;
     }
-- 
1.8.3.1