From 509b2432e5be812f92d6fb43d278be3314057c9e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 14 Feb 2017 23:34:47 +0800 Subject: [PATCH] update code --- .../main/java/com/lyms/platform/query/BabyModelQuery.java | 15 +++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) 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 9f06ea2..bfb6973 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 @@ -142,6 +142,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private Boolean extEnable; + //是否是主档案 + private String enableNETwo; + + public String getEnableNETwo() { + return enableNETwo; + } + + public void setEnableNETwo(String enableNETwo) { + this.enableNETwo = enableNETwo; + } + public Boolean getExtEnable() { return extEnable; } @@ -532,6 +543,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=extEnable){ condition.and("enable",extEnable,MongoOper.EXISTS); } + + if(null!=enableNETwo){ + condition.and("enable",enableNETwo,MongoOper.NE); + } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d148415..4f36488 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1523,7 +1523,7 @@ public class BabyBookbuildingFacade { String hospitalName = ""; BabyModelQuery babyQuery = new BabyModelQuery(); if(String.valueOf("true").equals(request.getIsArea())){ - babyQuery.setExtEnable(false); + babyQuery.setEnableNETwo("2"); OrganizationQuery organizationQuery = new OrganizationQuery(); if(!StringUtils.isEmpty(request.getHospitalId())){ -- 1.8.3.1