jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 27 additions and 0 deletions

...	...	@@ -140,6 +140,7 @@
140	140
141	141	//高危ID
142	142	private String highRiskInfo;
	143	+ private String diagnosehighRiskInfo;
143	144
144	145	//体弱ID
145	146	private String weakSonInfo;
146	147
...	...	@@ -1028,7 +1029,11 @@
1028	1029	if (!StringUtils.isEmpty(lastDiagnose)) {
1029	1030	condition = condition.and("lastDiagnose", lastDiagnose, MongoOper.IN);
1030	1031	}
	1032	+ if (!StringUtils.isEmpty(diagnosehighRiskInfo)) {
	1033	+ condition = condition.and("diagnose", diagnosehighRiskInfo, MongoOper.IS);
	1034	+ }
1031	1035
	1036	+
1032	1037	if (!StringUtils.isEmpty(highRiskInfo)) {
1033	1038	condition = condition.and("highRiskInfo", highRiskInfo, MongoOper.IN);
1034	1039	}
...	...	@@ -1346,6 +1351,14 @@
1346	1351
1347	1352	public void setNextDateStart(Date nextDateStart) {
1348	1353	this.nextDateStart = nextDateStart;
	1354	+ }
	1355	+
	1356	+ public String getDiagnosehighRiskInfo() {
	1357	+ return diagnosehighRiskInfo;
	1358	+ }
	1359	+
	1360	+ public void setDiagnosehighRiskInfo(String diagnosehighRiskInfo) {
	1361	+ this.diagnosehighRiskInfo = diagnosehighRiskInfo;
1349	1362	}
1350	1363
1351	1364	public Date getNextDateEnd() {

...	...	@@ -220,6 +220,7 @@
220	220	@RequestParam(value = "name", required = false) String name,
221	221	@RequestParam(value = "highRiskType", required = false) Integer highRiskType,
222	222	@RequestParam(value = "diagnose", required = false) String diagnose,
	223	+ @RequestParam(value = "diagnosehighRiskInfo", required = false) String diagnosehighRiskInfo,
223	224	@RequestParam(value = "dateRange", required = false) String dateRange,
224	225	@RequestParam(value = "highRiskInfos", required = false) List highRiskInfos,
225	226	@RequestParam(value = "weakSonInfos", required = false) List weakSonInfos,
...	...	@@ -257,6 +258,7 @@
257	258	request.setVcCardNo(vcCardNo);
258	259	request.setWeakSonInfos(weakSonInfos);
259	260	request.setHighRiskInfos(highRiskInfos);
	261	+ request.setDiagnosehighRiskInfo(diagnosehighRiskInfo);
260	262	request.setShowDetail(showDetail);
261	263	request.setBuildDoctor(buildDoctor);
262	264	request.setQueryNo(queryNo);

...	...	@@ -2194,6 +2194,7 @@
2194	2194	babyQuery.setWeakSonInfo(request.getWeakSonInfo());
2195	2195	//高危儿详情
2196	2196	babyQuery.setHighRiskInfo(request.getHighRiskInfo());
	2197	+ babyQuery.setDiagnosehighRiskInfo(request.getDiagnosehighRiskInfo());
2197	2198	//多项体弱儿因素查询条件
2198	2199	babyQuery.setWeakSonInfos(request.getWeakSonInfos());
2199	2200	//多项体弱儿因素查询

...	...	@@ -46,6 +46,8 @@
46	46	private String highRiskInfo;
47	47	//高危儿多项
48	48	private List highRiskInfos;
	49	+ //高危儿统计秦皇岛数据处理
	50	+ private String diagnosehighRiskInfo;
49	51	//体弱儿多项
50	52	private List weakSonInfos;
51	53	//建档医生id
...	...	@@ -421,6 +423,15 @@
421	423
422	424	public void setHospitalId(String hospitalId) {
423	425	this.hospitalId = hospitalId;
	426	+ }
	427	+
	428	+
	429	+ public String getDiagnosehighRiskInfo() {
	430	+ return diagnosehighRiskInfo;
	431	+ }
	432	+
	433	+ public void setDiagnosehighRiskInfo(String diagnosehighRiskInfo) {
	434	+ this.diagnosehighRiskInfo = diagnosehighRiskInfo;
424	435	}
425	436	}