jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit cddef924d14d9da4cba140058655743b47c4cc5f

Authored by liquanyu
1 parent a55a59069f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 20 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ cddef92
... ... @@ -147,9 +147,9 @@
147 147 @TokenRequired
148 148 @ResponseBody
149 149 public BaseObjectResponse postpartumReview(Date startDate, Date endDate, String doctorId,
150   - Integer startDay, Integer endDay, String zyList, String jcxList,
  150 + Integer startDay, Integer endDay, String zyList, String jcxList, String gcDoctorId,
151 151 String key, Integer page, Integer limit, HttpServletRequest request) {
152   - return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList);
  152 + return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay, endDay, zyList, jcxList,gcDoctorId);
153 153 }
154 154  
155 155 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java View file @ cddef92
... ... @@ -10,7 +10,7 @@
10 10 */
11 11 public interface IPostReviewService extends IBaseService {
12 12 // BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit,Integer startDay, Integer endDay);
13   - BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page, Integer limit, Integer startDay, Integer endDay, String zyList, String jcxList);
  13 + 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);
14 14  
15 15 void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay);
16 16 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java View file @ cddef92
... ... @@ -47,7 +47,7 @@
47 47  
48 48 @Override
49 49 public BaseObjectResponse postpartumReview(Integer userId, Date startDate, Date endDate, String doctorId, String key, Integer page,
50   - Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList) {
  50 + Integer limit,Integer startDay, Integer endDay,String zyList,String jcxList,String gcDoctorId) {
51 51  
52 52  
53 53 String hospitalId = autoMatchFacade.getHospitalId(userId);
54 54  
... ... @@ -133,9 +133,16 @@
133 133 }
134 134  
135 135  
136   - if(StringUtils.isNotEmpty(key)) {
  136 + if(StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(gcDoctorId)) {
137 137 Criteria criteria = new Criteria();
138   - criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0));
  138 + if (StringUtils.isNotEmpty(gcDoctorId))
  139 + {
  140 + criteria.and("gcdfDoctorId").is(gcDoctorId);
  141 + }
  142 + if (StringUtils.isNotEmpty(key))
  143 + {
  144 + criteria.orOperator(Criteria.where("username").regex(key), Criteria.where("cardNo").is(key), Criteria.where("phone").is(key).and("yn").ne(0));
  145 + }
139 146 List<Patients> patients = mongoUtil.findField(Patients.class, criteria, "id");
140 147 if(CollectionUtils.isEmpty(patients)) {
141 148 return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
... ... @@ -192,7 +199,12 @@
192 199 {
193 200 if (StringUtils.isNotEmpty(pat.getGcdfDoctorId()))
194 201 {
195   - gcDoctor = pat.getGcdfDoctorId();
  202 + if(StringUtils.isNotEmpty(pat.getGcdfDoctorId())) {
  203 + Users users = usersMapper.getUsers(Integer.parseInt(pat.getGcdfDoctorId()));
  204 + gcDoctor = users == null ? "" : users.getName();
  205 + } else {
  206 + gcDoctor = pat.getGcdfDoctorId();
  207 + }
196 208 break;
197 209 }
198 210 }
... ... @@ -207,7 +219,7 @@
207 219  
208 220 @Override
209 221 public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay) {
210   - BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null);
  222 + BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null,null);
211 223 PageResult pageResult = (PageResult) rest.getData();
212 224 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
213 225 Map<String, String> cnames = new LinkedHashMap<>();