Commit 24d26a9362a729ff5345ffe873be9595ebe70678
1 parent
d4ceb07cc6
Exists in
master
and in
6 other branches
分娩查询
Showing 1 changed file with 6 additions and 8 deletions
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
View file @
24d26a9
... | ... | @@ -240,7 +240,7 @@ |
240 | 240 | Boolean isAddStart = Boolean.FALSE; |
241 | 241 | |
242 | 242 | if (hloseBloodType != null) { |
243 | - isAddStart = Boolean.TRUE; | |
243 | + | |
244 | 244 | /** |
245 | 245 | * 出血量: |
246 | 246 | * 顺产:1-产后2小时出血≥300ml、2-产后24小时出血<500ml、3-产后24小时出血≥500ml |
247 | 247 | |
... | ... | @@ -263,13 +263,14 @@ |
263 | 263 | condition = condition.and("rHloseBloodL", 2000, MongoOper.GTE); |
264 | 264 | break; |
265 | 265 | case 6: |
266 | - c = c.where("rHloseBloodL").gte(1000).lt(2000); | |
266 | + isAddStart = Boolean.TRUE; | |
267 | + c = Criteria.where("rHloseBloodL").gte(1000).lt(2000); | |
267 | 268 | break; |
268 | 269 | } |
269 | 270 | } |
270 | 271 | |
271 | 272 | if (weight != null) { |
272 | - isAddStart = Boolean.TRUE; | |
273 | + | |
273 | 274 | //1 <2500g、2 ≥4000g、3 ≥2500g与<4000g之间 |
274 | 275 | switch (weight) { |
275 | 276 | case 1: |
276 | 277 | |
... | ... | @@ -279,14 +280,11 @@ |
279 | 280 | condition = condition.and("baby.babyWeight", 4000, MongoOper.GTE); |
280 | 281 | break; |
281 | 282 | case 3: |
282 | - | |
283 | - c = c.where("baby.babyWeight").gte(2500).lt(4000); | |
283 | + isAddStart = Boolean.TRUE; | |
284 | + c = Criteria.where("baby.babyWeight").gte(2500).lt(4000); | |
284 | 285 | break; |
285 | 286 | } |
286 | 287 | } |
287 | - | |
288 | - | |
289 | - | |
290 | 288 | |
291 | 289 | if (null != createdStart) { |
292 | 290 | if (neStart) { |