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 0270e3b..5d4be6e 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 @@ -108,17 +108,29 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //医院id private List hospitalList; - //档案编号 - private String fileCode; + //0 隐藏 1 显示 + private String enable="1"; + //区域来源 + private String source; - public String getFileCode() { - return fileCode; + public String getSource() { + return source; } - public void setFileCode(String fileCode) { - this.fileCode = fileCode; + public void setSource(String source) { + this.source = source; } + public String getEnable() { + return enable; + } + + public void setEnable(String enable) { + this.enable = enable; + } + + + public String getProvinceRegisterId() { return provinceRegisterId; } @@ -749,14 +761,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (buildType != -1) { MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); - MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS); MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE); condition = condition.orCondition(new MongoCondition[]{condition12, condition1}); } else if (null != buildTypeList) { MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); - MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS); MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); } @@ -856,8 +868,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS); MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); - MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS); - c1= c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); + c1= c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); } if (lastCheckEmployeeId != null) { @@ -876,6 +887,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != serviceType) { condition = condition.and("serviceType", serviceType, MongoOper.IS); } + if(null!=source){ + condition = condition.and("source", source, MongoOper.IS); + } if (null != serviceStatus) { condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);