diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java index 0254aeb..1287f2e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java @@ -64,11 +64,29 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery private String provinceRegisterId; private String cityRegisterId; private String areaRegisterId; + private String streetRegisterId; //居住地 private String provinceId; private String cityId; private String areaId; + private String streetId; + + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } public boolean isNeNullCheckDoctor() { return NeNullCheckDoctor; @@ -402,6 +420,9 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery if (StringUtils.isNotEmpty(provinceId)) { condition = condition.and("provinceId", provinceId, MongoOper.IS); } + if (StringUtils.isNotEmpty(streetId)) { + condition = condition.and("streetId", streetId, MongoOper.IS); + } //户籍地 if (StringUtils.isNotEmpty(provinceRegisterId)) { condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); @@ -413,6 +434,11 @@ public class AntExRecordQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); } + if (StringUtils.isNotEmpty(streetRegisterId)) { + condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); + } + + if (null != hospitalId) { condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } 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 5263e21..dc4648e 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 @@ -101,11 +101,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String provinceRegisterId; private String cityRegisterId; private String areaRegisterId; + private String streetRegisterId; //居住地 private String provinceId; private String cityId; private String areaId; + private String streetId; //医院id private List hospitalList; @@ -891,6 +893,22 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.pid = pid; } + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -964,6 +982,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if(StringUtils.isNotEmpty(provinceId)){ condition = condition.and("provinceId", provinceId, MongoOper.IS); } + if(StringUtils.isNotEmpty(streetId)){ + condition = condition.and("streetId", streetId, MongoOper.IS); + } //户籍地 if(StringUtils.isNotEmpty(provinceRegisterId)){ condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); @@ -974,6 +995,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if(StringUtils.isNotEmpty(areaRegisterId)){ condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); } + if(StringUtils.isNotEmpty(streetRegisterId)){ + condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); + } // 分娩信息 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index cb4c24a..51ca116 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -98,9 +98,12 @@ public class AntExRecordFacade { antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId()); antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId()); antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId()); + antExRecordQuery.setStreetRegisterId(antExManagerQueryRequest.getStreetRegisterId()); + antExRecordQuery.setProvinceId(antExManagerQueryRequest.getProvinceId()); antExRecordQuery.setCityId(antExManagerQueryRequest.getCityId()); antExRecordQuery.setAreaId(antExManagerQueryRequest.getAreaId()); + antExRecordQuery.setStreetId(antExManagerQueryRequest.getStreetId()); //产检日期 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index cc12a2a..a6ab7b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1159,9 +1159,14 @@ public class MatDeliverFacade { patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId()); patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId()); patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId()); + patientsQuery.setStreetId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterStreetId()) ? null : childbirthManagerRequest.getRegisterStreetId()); + patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId()) ? null : childbirthManagerRequest.getLivingProvinceId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId()) ? null : childbirthManagerRequest.getLivingCityId()); patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId()); + + patientsQuery.setStreetRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingStreetId()) ? null : childbirthManagerRequest.getLivingStreetId()); + patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); patientsQuery.setFmHospitalQueryList(hospitalList); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7f005d9..2298e8f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -356,10 +356,13 @@ public class PatientFacade { patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaId()); patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId()); patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId()); + patientsQuery.setStreetRegisterId(riskPatientsQueryRequest.getStreetId()); + //户籍地 patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaRegisterId()); patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId()); patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId()); + patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId()); List hospitalList = null; //区域范围内孕妇 if (isRegion) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index a9eeb68..7634172 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -101,11 +101,13 @@ public class ResidentsFacade { query.setProvinceRegisterId(request.getProvinceRegisterId()); query.setCityRegisterId(request.getCityRegisterId()); query.setAreaRegisterId(request.getAreaRegisterId()); + query.setStreetRegisterId(request.getStreetRegisterId()); //居住地 query.setProvinceId(request.getProvinceId()); query.setCityId(request.getCityId()); query.setAreaId(request.getAreaId()); + query.setStreetId(request.getStreetId()); List> list = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index f4944f1..2883b55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -52,6 +52,8 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private String cityRegisterId; @FormParam("registerAreaId") private String areaRegisterId; + @FormParam("registerStreetId") + private String streetRegisterId; //居住地 @FormParam("livingProvinceId") @@ -60,6 +62,8 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private String cityId; @FormParam("livingAreaId") private String areaId; + @FormParam("livingStreetId") + private String streetId; //产检医院 @FormParam("hospitalProvinceId") @@ -90,6 +94,22 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { return null; } + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public String getStartDueWeek() { return startDueWeek; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index ef82ccf..11133f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -66,6 +66,8 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String registerAreaId; + private String registerStreetId; + /** * @auther HuJiaqi * @createTime 2016年12月21日 10时56分 @@ -87,6 +89,9 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String livingAreaId; + + private String livingStreetId; + /** * @auther HuJiaqi * @createTime 2016年12月21日 10时56分 @@ -150,6 +155,22 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String initQuery; + public String getLivingStreetId() { + return livingStreetId; + } + + public void setLivingStreetId(String livingStreetId) { + this.livingStreetId = livingStreetId; + } + + public String getRegisterStreetId() { + return registerStreetId; + } + + public void setRegisterStreetId(String registerStreetId) { + this.registerStreetId = registerStreetId; + } + private Map initQueryMap; private Map normalQueryMap; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java index 902c2a9..9a70ea1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java @@ -35,16 +35,37 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{ private String cityId; //区县 private String areaId; - /* 户籍地址省市区 */ + + //街道 + private String streetId; + + /* 户籍地址省市区街道 */ private String provinceRegisterId; private String cityRegisterId; private String areaRegisterId; + private String streetRegisterId; //年龄(如: 24 - 26) private String age; //出生日期(范围值 1991-01-01 - 1994-02-02 ) private String birthday; + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + public String getBuildProvinceId() { return buildProvinceId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index b9174e4..2762339 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -79,11 +79,13 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String provinceRegisterId; private String cityRegisterId; private String areaRegisterId; + private String streetRegisterId; //居住地 private String provinceId; private String cityId; private String areaId; + private String streetId; //产检医院 private String cprovinceId; @@ -110,6 +112,22 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //1. 全部孕产妇 2.全部孕妇 3. 全部产妇 private String type; + public String getStreetRegisterId() { + return streetRegisterId; + } + + public void setStreetRegisterId(String streetRegisterId) { + this.streetRegisterId = streetRegisterId; + } + + public String getStreetId() { + return streetId; + } + + public void setStreetId(String streetId) { + this.streetId = streetId; + } + public String getType() { return type; }