Commit ad2833514b188a38cb1ca4be77a82d64319aa7d1
1 parent
088320f728
Exists in
master
and in
6 other branches
commit
Showing 2 changed files with 65 additions and 0 deletions
platform-common/src/main/java/com/lyms/platform/common/constants/UnitConstants.java
View file @
ad28335
| 1 | +package com.lyms.platform.common.constants; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * | |
| 5 | + * 单位常量,用以返回值拼接 | |
| 6 | + * | |
| 7 | + * Created by Administrator on 2017/1/11 0011. | |
| 8 | + */ | |
| 9 | +public class UnitConstants { | |
| 10 | + | |
| 11 | + public static final String CM = " cm"; | |
| 12 | + public static final String KG = " kg"; | |
| 13 | + public static final String MMHG = " mmHg"; | |
| 14 | + public static final String CIFEN = " 次/分"; | |
| 15 | + public static final String GL = " g/L"; | |
| 16 | + public static final String BF = " %"; | |
| 17 | + public static final String MMOLL = " mmol/L"; | |
| 18 | + public static final String CI = " 次"; | |
| 19 | + public static final String UL = " U/L"; | |
| 20 | + public static final String TEN_LKG = "×10<sup>9</sup>/L"; | |
| 21 | +// public static final String TEN_LKG = " 10^9/L"; | |
| 22 | + public static final String UMOLL = " μmol/L"; | |
| 23 | + public static final String ZHEN = " 针"; | |
| 24 | + public static final String ML = " ml"; | |
| 25 | + public static final String G = " g"; | |
| 26 | + public static final String FEN = " 分"; | |
| 27 | + public static final String FZ = " 分钟"; | |
| 28 | + public static final String GE = " 个"; | |
| 29 | + public static final String SUI = " 岁"; | |
| 30 | + public static final String REN = " 人"; | |
| 31 | + public static final String HD = " 时/日"; | |
| 32 | + public static final String WENDU = " ℃"; | |
| 33 | + public static final String WSSD = " IU/日"; | |
| 34 | + public static final String DAY = " 天"; | |
| 35 | + | |
| 36 | + | |
| 37 | +} |
platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
View file @
ad28335
| ... | ... | @@ -52,6 +52,29 @@ |
| 52 | 52 | private Date checkDateStart; |
| 53 | 53 | private Date checkDateEnd; |
| 54 | 54 | |
| 55 | + | |
| 56 | + //大于修改时间 | |
| 57 | + private Date gteModified; | |
| 58 | + //大于创建时间 | |
| 59 | + //大于创建时间 | |
| 60 | + private Date gteCreated; | |
| 61 | + | |
| 62 | + public Date getGteModified() { | |
| 63 | + return gteModified; | |
| 64 | + } | |
| 65 | + | |
| 66 | + public void setGteModified(Date gteModified) { | |
| 67 | + this.gteModified = gteModified; | |
| 68 | + } | |
| 69 | + | |
| 70 | + public Date getGteCreated() { | |
| 71 | + return gteCreated; | |
| 72 | + } | |
| 73 | + | |
| 74 | + public void setGteCreated(Date gteCreated) { | |
| 75 | + this.gteCreated = gteCreated; | |
| 76 | + } | |
| 77 | + | |
| 55 | 78 | private Integer checkMonthStart; |
| 56 | 79 | private Integer checkMonthEnd; |
| 57 | 80 | |
| ... | ... | @@ -101,6 +124,11 @@ |
| 101 | 124 | condition.andCondition( new MongoCondition(c)); |
| 102 | 125 | } |
| 103 | 126 | |
| 127 | + if (null != gteModified && null != gteCreated) { | |
| 128 | + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); | |
| 129 | + MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); | |
| 130 | + condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); | |
| 131 | + } | |
| 104 | 132 | |
| 105 | 133 | Criteria c = null; |
| 106 | 134 | if (null != birthStart) { |