jiangjiazhi / regional-platform

Commit f67539b2e5ac0dda7ebb2d91ad52719ce543aaa2

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

区域统计添加街道条件

Showing 10 changed files with 144 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java

...	...	@@ -64,12 +64,30 @@
64	64	private String provinceRegisterId;
65	65	private String cityRegisterId;
66	66	private String areaRegisterId;
	67	+ private String streetRegisterId;
67	68
68	69	//居住地
69	70	private String provinceId;
70	71	private String cityId;
71	72	private String areaId;
	73	+ private String streetId;
72	74
	75	+ public String getStreetRegisterId() {
	76	+ return streetRegisterId;
	77	+ }
	78	+
	79	+ public void setStreetRegisterId(String streetRegisterId) {
	80	+ this.streetRegisterId = streetRegisterId;
	81	+ }
	82	+
	83	+ public String getStreetId() {
	84	+ return streetId;
	85	+ }
	86	+
	87	+ public void setStreetId(String streetId) {
	88	+ this.streetId = streetId;
	89	+ }
	90	+
73	91	public boolean isNeNullCheckDoctor() {
74	92	return NeNullCheckDoctor;
75	93	}
...	...	@@ -402,6 +420,9 @@
402	420	if (StringUtils.isNotEmpty(provinceId)) {
403	421	condition = condition.and("provinceId", provinceId, MongoOper.IS);
404	422	}
	423	+ if (StringUtils.isNotEmpty(streetId)) {
	424	+ condition = condition.and("streetId", streetId, MongoOper.IS);
	425	+ }
405	426	//户籍地
406	427	if (StringUtils.isNotEmpty(provinceRegisterId)) {
407	428	condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
...	...	@@ -412,6 +433,11 @@
412	433	if (StringUtils.isNotEmpty(areaRegisterId)) {
413	434	condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
414	435	}
	436	+
	437	+ if (StringUtils.isNotEmpty(streetRegisterId)) {
	438	+ condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
	439	+ }
	440	+
415	441
416	442	if (null != hospitalId) {
417	443	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);

...	...	@@ -101,11 +101,13 @@
101	101	private String provinceRegisterId;
102	102	private String cityRegisterId;
103	103	private String areaRegisterId;
	104	+ private String streetRegisterId;
104	105
105	106	//居住地
106	107	private String provinceId;
107	108	private String cityId;
108	109	private String areaId;
	110	+ private String streetId;
109	111	//医院id
110	112	private List<String> hospitalList;
111	113
...	...	@@ -891,6 +893,22 @@
891	893	this.pid = pid;
892	894	}
893	895
	896	+ public String getStreetRegisterId() {
	897	+ return streetRegisterId;
	898	+ }
	899	+
	900	+ public void setStreetRegisterId(String streetRegisterId) {
	901	+ this.streetRegisterId = streetRegisterId;
	902	+ }
	903	+
	904	+ public String getStreetId() {
	905	+ return streetId;
	906	+ }
	907	+
	908	+ public void setStreetId(String streetId) {
	909	+ this.streetId = streetId;
	910	+ }
	911	+
894	912	public MongoQuery convertToQuery() {
895	913	MongoCondition condition = MongoCondition.newInstance();
896	914
...	...	@@ -964,6 +982,9 @@
964	982	if(StringUtils.isNotEmpty(provinceId)){
965	983	condition = condition.and("provinceId", provinceId, MongoOper.IS);
966	984	}
	985	+ if(StringUtils.isNotEmpty(streetId)){
	986	+ condition = condition.and("streetId", streetId, MongoOper.IS);
	987	+ }
967	988	//户籍地
968	989	if(StringUtils.isNotEmpty(provinceRegisterId)){
969	990	condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS);
...	...	@@ -973,6 +994,9 @@
973	994	}
974	995	if(StringUtils.isNotEmpty(areaRegisterId)){
975	996	condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
	997	+ }
	998	+ if(StringUtils.isNotEmpty(streetRegisterId)){
	999	+ condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
976	1000	}
977	1001
978	1002	// 分娩信息

...	...	@@ -98,9 +98,12 @@
98	98	antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId());
99	99	antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId());
100	100	antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId());
	101	+ antExRecordQuery.setStreetRegisterId(antExManagerQueryRequest.getStreetRegisterId());
	102	+
101	103	antExRecordQuery.setProvinceId(antExManagerQueryRequest.getProvinceId());
102	104	antExRecordQuery.setCityId(antExManagerQueryRequest.getCityId());
103	105	antExRecordQuery.setAreaId(antExManagerQueryRequest.getAreaId());
	106	+ antExRecordQuery.setStreetId(antExManagerQueryRequest.getStreetId());
104	107
105	108
106	109	//产检日期

...	...	@@ -1159,9 +1159,14 @@
1159	1159	patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
1160	1160	patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
1161	1161	patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId());
	1162	+ patientsQuery.setStreetId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterStreetId()) ? null : childbirthManagerRequest.getRegisterStreetId());
	1163	+
1162	1164	patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId()) ? null : childbirthManagerRequest.getLivingProvinceId());
1163	1165	patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId()) ? null : childbirthManagerRequest.getLivingCityId());
1164	1166	patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId());
	1167	+
	1168	+ patientsQuery.setStreetRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingStreetId()) ? null : childbirthManagerRequest.getLivingStreetId());
	1169	+
1165	1170	patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
1166	1171	patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo());
1167	1172	patientsQuery.setFmHospitalQueryList(hospitalList);

...	...	@@ -356,10 +356,13 @@
356	356	patientsQuery.setAreaRegisterId(riskPatientsQueryRequest.getAreaId());
357	357	patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId());
358	358	patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId());
	359	+ patientsQuery.setStreetRegisterId(riskPatientsQueryRequest.getStreetId());
	360	+
359	361	//户籍地
360	362	patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaRegisterId());
361	363	patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId());
362	364	patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId());
	365	+ patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId());
363	366	List<String> hospitalList = null;
364	367	//区域范围内孕妇
365	368	if (isRegion) {

...	...	@@ -101,11 +101,13 @@
101	101	query.setProvinceRegisterId(request.getProvinceRegisterId());
102	102	query.setCityRegisterId(request.getCityRegisterId());
103	103	query.setAreaRegisterId(request.getAreaRegisterId());
	104	+ query.setStreetRegisterId(request.getStreetRegisterId());
104	105
105	106	//居住地
106	107	query.setProvinceId(request.getProvinceId());
107	108	query.setCityId(request.getCityId());
108	109	query.setAreaId(request.getAreaId());
	110	+ query.setStreetId(request.getStreetId());
109	111
110	112	List<Map<String,Object>> list = new ArrayList<>();
111	113

...	...	@@ -52,6 +52,8 @@
52	52	private String cityRegisterId;
53	53	@FormParam("registerAreaId")
54	54	private String areaRegisterId;
	55	+ @FormParam("registerStreetId")
	56	+ private String streetRegisterId;
55	57
56	58	//居住地
57	59	@FormParam("livingProvinceId")
...	...	@@ -60,6 +62,8 @@
60	62	private String cityId;
61	63	@FormParam("livingAreaId")
62	64	private String areaId;
	65	+ @FormParam("livingStreetId")
	66	+ private String streetId;
63	67
64	68	//产检医院
65	69	@FormParam("hospitalProvinceId")
...	...	@@ -88,6 +92,22 @@
88	92	return (end*7)+6;
89	93	}
90	94	return null;
	95	+ }
	96	+
	97	+ public String getStreetRegisterId() {
	98	+ return streetRegisterId;
	99	+ }
	100	+
	101	+ public void setStreetRegisterId(String streetRegisterId) {
	102	+ this.streetRegisterId = streetRegisterId;
	103	+ }
	104	+
	105	+ public String getStreetId() {
	106	+ return streetId;
	107	+ }
	108	+
	109	+ public void setStreetId(String streetId) {
	110	+ this.streetId = streetId;
91	111	}
92	112
93	113	public String getStartDueWeek() {

...	...	@@ -66,6 +66,8 @@
66	66	*/
67	67	private String registerAreaId;
68	68
	69	+ private String registerStreetId;
	70	+
69	71	/**
70	72	* @auther HuJiaqi
71	73	* @createTime 2016年12月21日 10时56分
...	...	@@ -87,6 +89,9 @@
87	89	*/
88	90	private String livingAreaId;
89	91
	92	+
	93	+ private String livingStreetId;
	94	+
90	95	/**
91	96	* @auther HuJiaqi
92	97	* @createTime 2016年12月21日 10时56分
...	...	@@ -149,6 +154,22 @@
149	154	* @discription 自定义查询
150	155	*/
151	156	private String initQuery;
	157	+
	158	+ public String getLivingStreetId() {
	159	+ return livingStreetId;
	160	+ }
	161	+
	162	+ public void setLivingStreetId(String livingStreetId) {
	163	+ this.livingStreetId = livingStreetId;
	164	+ }
	165	+
	166	+ public String getRegisterStreetId() {
	167	+ return registerStreetId;
	168	+ }
	169	+
	170	+ public void setRegisterStreetId(String registerStreetId) {
	171	+ this.registerStreetId = registerStreetId;
	172	+ }
152	173
153	174	private Map<String, String> initQueryMap;
154	175

...	...	@@ -35,15 +35,36 @@
35	35	private String cityId;
36	36	//区县
37	37	private String areaId;
38		- /* 户籍地址省市区 */
	38	+
	39	+ //街道
	40	+ private String streetId;
	41	+
	42	+ /* 户籍地址省市区街道 */
39	43	private String provinceRegisterId;
40	44	private String cityRegisterId;
41	45	private String areaRegisterId;
	46	+ private String streetRegisterId;
42	47
43	48	//年龄(如: 24 - 26)
44	49	private String age;
45	50	//出生日期(范围值 1991-01-01 - 1994-02-02 )
46	51	private String birthday;
	52	+
	53	+ public String getStreetId() {
	54	+ return streetId;
	55	+ }
	56	+
	57	+ public void setStreetId(String streetId) {
	58	+ this.streetId = streetId;
	59	+ }
	60	+
	61	+ public String getStreetRegisterId() {
	62	+ return streetRegisterId;
	63	+ }
	64	+
	65	+ public void setStreetRegisterId(String streetRegisterId) {
	66	+ this.streetRegisterId = streetRegisterId;
	67	+ }
47	68
48	69	public String getBuildProvinceId() {
49	70	return buildProvinceId;

...	...	@@ -79,11 +79,13 @@
79	79	private String provinceRegisterId;
80	80	private String cityRegisterId;
81	81	private String areaRegisterId;
	82	+ private String streetRegisterId;
82	83
83	84	//居住地
84	85	private String provinceId;
85	86	private String cityId;
86	87	private String areaId;
	88	+ private String streetId;
87	89
88	90	//产检医院
89	91	private String cprovinceId;
...	...	@@ -109,6 +111,22 @@
109	111
110	112	//1. 全部孕产妇 2.全部孕妇 3. 全部产妇
111	113	private String type;
	114	+
	115	+ public String getStreetRegisterId() {
	116	+ return streetRegisterId;
	117	+ }
	118	+
	119	+ public void setStreetRegisterId(String streetRegisterId) {
	120	+ this.streetRegisterId = streetRegisterId;
	121	+ }
	122	+
	123	+ public String getStreetId() {
	124	+ return streetId;
	125	+ }
	126	+
	127	+ public void setStreetId(String streetId) {
	128	+ this.streetId = streetId;
	129	+ }
112	130
113	131	public String getType() {
114	132	return type;