From ad2833514b188a38cb1ca4be77a82d64319aa7d1 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 15 Aug 2017 15:58:46 +0800 Subject: [PATCH] commit --- .../platform/common/constants/UnitConstants.java | 37 ++++++++++++++++++++++ .../lyms/platform/query/BabyCheckModelQuery.java | 28 ++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java b/platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java new file mode 100644 index 0000000..3bafe63 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java @@ -0,0 +1,37 @@ +package com.lyms.platform.common.constants; + +/** + * + * 单位常量,用以返回值拼接 + * + * Created by Administrator on 2017/1/11 0011. + */ +public class UnitConstants { + + public static final String CM = " cm"; + public static final String KG = " kg"; + public static final String MMHG = " mmHg"; + public static final String CIFEN = " 次/分"; + public static final String GL = " g/L"; + public static final String BF = " %"; + public static final String MMOLL = " mmol/L"; + public static final String CI = " 次"; + public static final String UL = " U/L"; + public static final String TEN_LKG = "×109/L"; +// public static final String TEN_LKG = " 10^9/L"; + public static final String UMOLL = " μmol/L"; + public static final String ZHEN = " 针"; + public static final String ML = " ml"; + public static final String G = " g"; + public static final String FEN = " 分"; + public static final String FZ = " 分钟"; + public static final String GE = " 个"; + public static final String SUI = " 岁"; + public static final String REN = " 人"; + public static final String HD = " 时/日"; + public static final String WENDU = " ℃"; + public static final String WSSD = " IU/日"; + public static final String DAY = " 天"; + + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index ceef988..7bfcc6f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -52,6 +52,29 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu private Date checkDateStart; private Date checkDateEnd; + + //大于修改时间 + private Date gteModified; + //大于创建时间 + //大于创建时间 + private Date gteCreated; + + public Date getGteModified() { + return gteModified; + } + + public void setGteModified(Date gteModified) { + this.gteModified = gteModified; + } + + public Date getGteCreated() { + return gteCreated; + } + + public void setGteCreated(Date gteCreated) { + this.gteCreated = gteCreated; + } + private Integer checkMonthStart; private Integer checkMonthEnd; @@ -101,6 +124,11 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu condition.andCondition( new MongoCondition(c)); } + if (null != gteModified && null != gteCreated) { + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); + MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); + condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); + } Criteria c = null; if (null != birthStart) { -- 1.8.3.1