jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 81c7887e81d16f6c8b45720604e25d7ce9bcc339

Authored by mengfanqiang
1 parent e83ac43ddb
Exists in fengning2023-06-06

update 新生儿访视-访视管理-新增“娩医院字段筛选项

Showing 3 changed files with 7 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java View file @ 81c7887
... ... @@ -43,8 +43,8 @@
43 43 @RequestMapping(method = RequestMethod.GET)
44 44 @ResponseBody
45 45 @TokenRequired
46   - public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) {
47   - return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit);
  46 + public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit,String dueOrg) {
  47 + return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit,dueOrg);
48 48 }
49 49  
50 50 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java View file @ 81c7887
... ... @@ -13,7 +13,7 @@
13 13  
14 14 BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit);
15 15  
16   - BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit);
  16 + BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg);
17 17  
18 18 void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key);
19 19  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ 81c7887
... ... @@ -181,11 +181,14 @@
181 181 }
182 182  
183 183 @Override
184   - public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
  184 + public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg) {
185 185 String hospitalId = autoMatchFacade.getHospitalId(userId);
186 186 Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0");
187 187 if(startDate != null && endDate != null) {
188 188 criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
  189 + }
  190 + if(StringUtils.isNotBlank(dueOrg)) {
  191 + criteria.and("dueOrg").is(dueOrg);
189 192 }
190 193 if(StringUtils.isNotBlank(doctor)) {
191 194 criteria.and("doctor").is(doctor);