From 4fcd12ee65948361af74a51c8369f73438512d46 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 2 Jun 2021 09:04:30 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/query/BabyModelQuery.java | 13 +++++++++++++ .../operate/web/facade/DischargeAbstractFacade.java | 1 + 2 files changed, 14 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 61d2d34..1090b58 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -371,6 +371,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Integer dueWeekStart; //分娩孕周 private Integer dueWeekEnd; + private Boolean existSource; + + public Boolean getExistSource() { + return existSource; + } + + public void setExistSource(Boolean existSource) { + this.existSource = existSource; + } public String getLastCheckDoctor() { return lastCheckDoctor; @@ -1262,6 +1271,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("riskCode", riskCode, MongoOper.IS); } + if (existSource != null) { + condition = condition.and("source", existSource, MongoOper.EXISTS); + } + if (StringUtils.isNotEmpty(apparatus) && StringUtils.isNotEmpty(doctorJudgement) ) { MongoCondition con1 = MongoCondition.newInstance("apparatus", apparatus, MongoOper.IS);//器械判定阳性 类型 MongoCondition con = MongoCondition.newInstance("doctorJudgement", doctorJudgement, MongoOper.IS);//医生判定阳性类型 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 07ff451..de49cf0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -444,6 +444,7 @@ public class DischargeAbstractFacade extends BaseServiceImpl { //babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setParentId(patients.getId()); babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); + babyModelQuery.setExistSource(false); try { List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); if (CollectionUtils.isEmpty(babyModelList)) { -- 1.8.3.1