From 25a0306a0752fd4264b8b7d8104a33a0b4c181ee Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 16 Feb 2017 14:38:34 +0800 Subject: [PATCH] 1 --- .../com/lyms/platform/query/BabyModelQuery.java | 45 ++++++---------------- .../com/lyms/platform/query/PatientsQuery.java | 5 ++- .../operate/web/facade/BabyBookbuildingFacade.java | 15 ++++++-- 3 files changed, 27 insertions(+), 38 deletions(-) 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 bfb6973..80e7dfd 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 @@ -6,6 +6,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -52,17 +53,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String buildDoctor; private String enable; - private String enableNot; - private String source; + private List enableListNot; - public String getEnableNot() { - return enableNot; + public List getEnableListNot() { + return enableListNot; } - public void setEnableNot(String enableNot) { - this.enableNot = enableNot; + public void setEnableListNot(List enableListNot) { + this.enableListNot = enableListNot; } + private String source; + + public String getSource() { return source; } @@ -140,26 +143,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private Boolean isNull; - private Boolean extEnable; - //是否是主档案 - private String enableNETwo; - - public String getEnableNETwo() { - return enableNETwo; - } - - public void setEnableNETwo(String enableNETwo) { - this.enableNETwo = enableNETwo; - } - - public Boolean getExtEnable() { - return extEnable; - } - - public void setExtEnable(Boolean extEnable) { - this.extEnable = extEnable; - } public Integer[] getOrServiceStatus() { return orServiceStatus; @@ -540,13 +524,6 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("source", source, MongoOper.IS); } - 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); } @@ -609,8 +586,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("dueType", dueType, MongoOper.IS); } - if (!StringUtils.isEmpty(enableNot)) { - condition = condition.and("enable", enableNot, MongoOper.NE); + if (CollectionUtils.isNotEmpty(enableListNot)) { + condition = condition.and("enable", enableListNot, MongoOper.NE); } if (null != hospitalIdList) { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index fda9aef..1b3c529 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -884,7 +884,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); } if(null!=extEnable){ - condition.and("enable",extEnable,MongoOper.EXISTS); + List list=new ArrayList(); + list.add("1"); + list.add("2"); + condition = condition.and("enable", list, MongoOper.NE); } if (buildTypeEq != null) { 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 4f36488..c9fdcba 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 @@ -1247,7 +1247,10 @@ public class BabyBookbuildingFacade { babyQuery.setPid(babayPerson.getId()); if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){ - babyQuery.setExtEnable(false); + List list = new ArrayList(); + list.add("1"); + list.add("2"); + babyQuery.setEnableListNot(list); } @@ -1296,7 +1299,10 @@ public class BabyBookbuildingFacade { babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setVcCardNo(param.getVcCardNo()); if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){ - babyQuery.setExtEnable(false); + List list = new ArrayList(); + list.add("1"); + list.add("2"); + babyQuery.setEnableListNot(list); } babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId,false)); @@ -1523,7 +1529,10 @@ public class BabyBookbuildingFacade { String hospitalName = ""; BabyModelQuery babyQuery = new BabyModelQuery(); if(String.valueOf("true").equals(request.getIsArea())){ - babyQuery.setEnableNETwo("2"); + List list = new ArrayList(); + list.add("1"); + list.add("2"); + babyQuery.setEnableListNot(list); OrganizationQuery organizationQuery = new OrganizationQuery(); if(!StringUtils.isEmpty(request.getHospitalId())){ -- 1.8.3.1