From b55488b037dcdadef47b784e233fe1656c7b073b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 21 May 2021 18:01:42 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/PostkfFaccade.java | 6 +++--- .../com/lyms/platform/operate/web/request/PostKfRequest.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java index a8d2a94..4d4e9cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java @@ -262,9 +262,9 @@ public class PostkfFaccade { if (StringUtils.isNotEmpty(postKfRequest.getItem()) && StringUtils.isNotEmpty(postKfRequest.getType()) && postKfRequest.getResult() != null) { query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()).is(String.valueOf(postKfRequest.getResult()))); - if (StringUtils.isNotEmpty(postKfRequest.getDoctorId())) + if (StringUtils.isNotEmpty(postKfRequest.getDoctorName())) { - query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorId())); + query.addCriteria(Criteria.where(postKfRequest.getItem()+"."+postKfRequest.getType()+"doctor").is(postKfRequest.getDoctorName())); } } @@ -463,7 +463,7 @@ public class PostkfFaccade { query.addCriteria(Criteria.where("upDoctor").is(usersService.getUsers(userId).getName())); query.with(new Sort(Sort.Direction.DESC, "created")); - long count = mongoTemplate.count(query, DefectiveChildModel.class); + long count = mongoTemplate.count(query, PostkfPgModel.class); baseQuery.mysqlBuild((int) count); query.skip(baseQuery.getOffset()).limit(limit); List datas = new LinkedList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostKfRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostKfRequest.java index 7961c4e..be8111d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostKfRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostKfRequest.java @@ -7,7 +7,7 @@ import com.lyms.platform.common.dao.BaseQuery; */ public class PostKfRequest extends BaseQuery { - private String doctorId; + private String doctorName; //产后复查评估 状态 1 出院前评估 2 产后7天评估 3 产后14天评估 4 产后28天评估 5 产后42天评估 private Integer status; @@ -22,12 +22,12 @@ public class PostKfRequest extends BaseQuery { private String queryNo; - public String getDoctorId() { - return doctorId; + public String getDoctorName() { + return doctorName; } - public void setDoctorId(String doctorId) { - this.doctorId = doctorId; + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; } public Integer getStatus() { -- 1.8.3.1