jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 8 deletions

...	...	@@ -262,9 +262,9 @@
262	262	if (StringUtils.isNotEmpty(postKfRequest.getItem()) && StringUtils.isNotEmpty(postKfRequest.getType()) && postKfRequest.getResult() != null)
263	263	{
264	264	query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()).is(String.valueOf(postKfRequest.getResult())));
265		- if (StringUtils.isNotEmpty(postKfRequest.getDoctorId()))
	265	+ if (StringUtils.isNotEmpty(postKfRequest.getDoctorName()))
266	266	{
267		- query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorId()));
	267	+ query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorName()));
268	268	}
269	269	}
270	270
...	...	@@ -463,7 +463,7 @@
463	463	query.addCriteria(Criteria.where("upDoctor").is(usersService.getUsers(userId).getName()));
464	464
465	465	query.with(new Sort(Sort.Direction.DESC, "created"));
466		- long count = mongoTemplate.count(query, DefectiveChildModel.class);
	466	+ long count = mongoTemplate.count(query, PostkfPgModel.class);
467	467	baseQuery.mysqlBuild((int) count);
468	468	query.skip(baseQuery.getOffset()).limit(limit);
469	469	List<Map> datas = new LinkedList<>();

...	...	@@ -7,7 +7,7 @@
7	7	*/
8	8	public class PostKfRequest extends BaseQuery {
9	9
10		- private String doctorId;
	10	+ private String doctorName;
11	11	//产后复查评估状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估
12	12	private Integer status;
13	13
14	14
...	...	@@ -22,12 +22,12 @@
22	22
23	23	private String queryNo;
24	24
25		- public String getDoctorId() {
26		- return doctorId;
	25	+ public String getDoctorName() {
	26	+ return doctorName;
27	27	}
28	28
29		- public void setDoctorId(String doctorId) {
30		- this.doctorId = doctorId;
	29	+ public void setDoctorName(String doctorName) {
	30	+ this.doctorName = doctorName;
31	31	}
32	32
33	33	public Integer getStatus() {