jiangjiazhi / regional-platform

Authored by jishenfei over 2 years ago

Exists in master and in 4 other branches

Showing 4 changed files with 41 additions and 2 deletions

...	...	@@ -132,7 +132,7 @@
132	132	private String hprovinceRegisterId;
133	133	private String hcityRegisterId;
134	134	private String hareaRegisterId;
135		- private String hstreetRegisterId;
	135	+ private String hstreetRegisterId;
136	136	/**
137	137	* 丈夫居住地
138	138	*/
...	...	@@ -141,7 +141,7 @@
141	141	private String hareaId;
142	142	private String hstreetId;
143	143	//村
144		- private String hvillage;
	144	+ private String hvillage;
145	145	private String haddress;
146	146
147	147	/****add by lqy end *******/

...	...	@@ -113,6 +113,7 @@
113	113	private String cityRegisterId;
114	114	private String areaRegisterId;
115	115	private String streetRegisterId;
	116	+ private String villageRegister;
116	117	private List<String> streetRegisterIds;
117	118
118	119	private String noProvinceRegisterId;
...	...	@@ -123,6 +124,7 @@
123	124	private String cityId;
124	125	private String areaId;
125	126	private String streetId;
	127	+ private String villageId;
126	128
127	129
128	130	//医院id
...	...	@@ -356,6 +358,7 @@
356	358	private String areaPostRestId;
357	359	private String streetPostRestId;
358	360
	361	+
359	362	private String pcensusTypeId;
360	363	//乡镇卫生院id
361	364	private String townOrgId;
...	...	@@ -417,6 +420,22 @@
417	420
418	421	private String currentAreaId;
419	422	private Integer isComplete;
	423	+
	424	+ public String getVillageRegister() {
	425	+ return villageRegister;
	426	+ }
	427	+
	428	+ public void setVillageRegister(String villageRegister) {
	429	+ this.villageRegister = villageRegister;
	430	+ }
	431	+
	432	+ public String getVillageId() {
	433	+ return villageId;
	434	+ }
	435	+
	436	+ public void setVillageId(String villageId) {
	437	+ this.villageId = villageId;
	438	+ }
420	439
421	440	public Integer getIsComplete() {
422	441	return isComplete;

...	...	@@ -430,12 +430,14 @@
430	430	patientsQuery.setCityRegisterId(riskPatientsQueryRequest.getCityId());
431	431	patientsQuery.setProvinceRegisterId(riskPatientsQueryRequest.getProvinceId());
432	432	patientsQuery.setStreetRegisterId(riskPatientsQueryRequest.getStreetId());
	433	+ patientsQuery.setVillageId(riskPatientsQueryRequest.getHvillage());
433	434
434	435	//户籍地
435	436	patientsQuery.setAreaId(riskPatientsQueryRequest.getAreaRegisterId());
436	437	patientsQuery.setProvinceId(riskPatientsQueryRequest.getProvinceRegisterId());
437	438	patientsQuery.setCityId(riskPatientsQueryRequest.getCityRegisterId());
438	439	patientsQuery.setStreetId(riskPatientsQueryRequest.getStreetRegisterId());
	440	+ patientsQuery.setVillageRegister(riskPatientsQueryRequest.getVillageRegisterId());
439	441
440	442
441	443	List <String> hospitalList = null;

...	...	@@ -99,12 +99,14 @@
99	99	private String cityRegisterId;
100	100	private String areaRegisterId;
101	101	private String streetRegisterId;
	102	+ private String villageRegisterId;
102	103
103	104	//居住地
104	105	private String provinceId;
105	106	private String cityId;
106	107	private String areaId;
107	108	private String streetId;
	109	+ private String hvillage;
108	110
109	111	//产检医院
110	112	private String cprovinceId;
...	...	@@ -191,6 +193,22 @@
191	193
192	194	//体重异常管理-接收建档时间筛选用
193	195	private String buildDate;
	196	+
	197	+ public String getVillageRegisterId() {
	198	+ return villageRegisterId;
	199	+ }
	200	+
	201	+ public void setVillageRegisterId(String villageRegisterId) {
	202	+ this.villageRegisterId = villageRegisterId;
	203	+ }
	204	+
	205	+ public String getHvillage() {
	206	+ return hvillage;
	207	+ }
	208	+
	209	+ public void setHvillage(String hvillage) {
	210	+ this.hvillage = hvillage;
	211	+ }
194	212
195	213	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
196	214	public Integer productionSieveType;