From 24d26a9362a729ff5345ffe873be9595ebe70678 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 16 Oct 2018 16:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/MatDeliverQuery.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 6f1a171..b1bbb1b 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 @@ -240,7 +240,7 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery Boolean isAddStart = Boolean.FALSE; if (hloseBloodType != null) { - isAddStart = Boolean.TRUE; + /** * 出血量： * 顺产：1-产后2小时出血≥300ml、2-产后24小时出血＜500ml、3-产后24小时出血≥500ml @@ -263,13 +263,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("rHloseBloodL", 2000, MongoOper.GTE); break; case 6: - c = c.where("rHloseBloodL").gte(1000).lt(2000); + isAddStart = Boolean.TRUE; + c = Criteria.where("rHloseBloodL").gte(1000).lt(2000); break; } } if (weight != null) { - isAddStart = Boolean.TRUE; + //1 ＜2500g、2 ≥4000g、3 ≥2500g与＜4000g之间 switch (weight) { case 1: @@ -279,15 +280,12 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("baby.babyWeight", 4000, MongoOper.GTE); break; case 3: - - c = c.where("baby.babyWeight").gte(2500).lt(4000); + isAddStart = Boolean.TRUE; + c = Criteria.where("baby.babyWeight").gte(2500).lt(4000); break; } } - - - if (null != createdStart) { if (neStart) { c = Criteria.where("dueDate1").gt(createdStart); -- 1.8.3.1