Commit 4fcd12ee65948361af74a51c8369f73438512d46
1 parent
7883723b89
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 14 additions and 0 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
4fcd12e
| ... | ... | @@ -371,7 +371,16 @@ |
| 371 | 371 | private Integer dueWeekStart; |
| 372 | 372 | //分娩孕周 |
| 373 | 373 | private Integer dueWeekEnd; |
| 374 | + private Boolean existSource; | |
| 374 | 375 | |
| 376 | + public Boolean getExistSource() { | |
| 377 | + return existSource; | |
| 378 | + } | |
| 379 | + | |
| 380 | + public void setExistSource(Boolean existSource) { | |
| 381 | + this.existSource = existSource; | |
| 382 | + } | |
| 383 | + | |
| 375 | 384 | public String getLastCheckDoctor() { |
| 376 | 385 | return lastCheckDoctor; |
| 377 | 386 | } |
| ... | ... | @@ -1260,6 +1269,10 @@ |
| 1260 | 1269 | } |
| 1261 | 1270 | if (riskCode != null) { |
| 1262 | 1271 | condition = condition.and("riskCode", riskCode, MongoOper.IS); |
| 1272 | + } | |
| 1273 | + | |
| 1274 | + if (existSource != null) { | |
| 1275 | + condition = condition.and("source", existSource, MongoOper.EXISTS); | |
| 1263 | 1276 | } |
| 1264 | 1277 | |
| 1265 | 1278 | if (StringUtils.isNotEmpty(apparatus) && StringUtils.isNotEmpty(doctorJudgement) ) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
4fcd12e
| ... | ... | @@ -444,6 +444,7 @@ |
| 444 | 444 | //babyModelQuery.setYn(YnEnums.YES.getId()); |
| 445 | 445 | babyModelQuery.setParentId(patients.getId()); |
| 446 | 446 | babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); |
| 447 | + babyModelQuery.setExistSource(false); | |
| 447 | 448 | try { |
| 448 | 449 | List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery); |
| 449 | 450 | if (CollectionUtils.isEmpty(babyModelList)) { |