From cddef924d14d9da4cba140058655743b47c4cc5f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 27 Jul 2021 14:33:09 +0800 Subject: [PATCH] update --- .../web/controller/PostReviewController.java | 4 ++-- .../operate/web/service/IPostReviewService.java | 2 +- .../web/service/impl/PostReviewServiceImpl.java | 22 +++++++++++++++++----- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java index 533f2a0..8e26957 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java @@ -147,9 +147,9 @@ public class PostReviewController extends BaseController { @TokenRequired @ResponseBody public BaseObjectResponse postpartumReview(Date startDate, Date endDate, String doctorId, - Integer startDay, Integer endDay, String zyList, String jcxList, + Integer startDay, Integer endDay, String zyList, String jcxList, String gcDoctorId, String key, Integer page, Integer limit, HttpServletRequest request) { - return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList); + return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList,gcDoctorId); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java index 9398d98..4d077df 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java @@ -10,7 +10,7 @@ import java.util.Date; */ public interface IPostReviewService extends IBaseService { // BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit,Integer startDay, Integer endDay); - BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit, Integer startDay, Integer endDay, String zyList, String jcxList); + BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit, Integer startDay, Integer endDay, String zyList, String jcxList,String gcDoctorId); void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java index f9487de..c84ba41 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java @@ -47,7 +47,7 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie @Override public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, - Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList) { + Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList,String gcDoctorId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -133,9 +133,16 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie } - if(StringUtils.isNotEmpty(key)) { + if(StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(gcDoctorId)) { Criteria criteria = new Criteria(); - criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0)); + if (StringUtils.isNotEmpty(gcDoctorId)) + { + criteria.and("gcdfDoctorId").is(gcDoctorId); + } + if (StringUtils.isNotEmpty(key)) + { + criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0)); + } List patients = mongoUtil.findField(Patients.class, criteria, "id"); if(CollectionUtils.isEmpty(patients)) { return RespBuilder.buildSuccess(new PageResult(0, page, limit, null)); @@ -192,7 +199,12 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie { if (StringUtils.isNotEmpty(pat.getGcdfDoctorId())) { - gcDoctor = pat.getGcdfDoctorId(); + if(StringUtils.isNotEmpty(pat.getGcdfDoctorId())) { + Users users = usersMapper.getUsers(Integer.parseInt(pat.getGcdfDoctorId())); + gcDoctor = users == null ? "" : users.getName(); + } else { + gcDoctor = pat.getGcdfDoctorId(); + } break; } } @@ -207,7 +219,7 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie @Override public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) { - BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null); + BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null,null); PageResult pageResult = (PageResult) rest.getData(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>(); -- 1.8.3.1