jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d23c62c9bf48bc12fc25e8425671f4ef149d5e1b

Authored by litao@lymsh.com
1 parent ab58eba426
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

辛申尔访视查询查询

Showing 4 changed files with 41 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java View file @ d23c62c
... ... @@ -21,7 +21,7 @@
21 21 // 操作人ID
22 22 private String operationId;
23 23  
24   - private String hositalId;
  24 + private String hospitalId;
25 25  
26 26 private String parentId;
27 27  
... ... @@ -36,7 +36,7 @@
36 36 private String checkTimeDesc;
37 37  
38 38 // 访视机构
39   - private String visitHositalId;
  39 + private String visitHospitalId;
40 40  
41 41 // 喂养方式 纯母乳/混合/人工
42 42 private String feedType;
43 43  
... ... @@ -178,12 +178,12 @@
178 178 this.operationId = operationId;
179 179 }
180 180  
181   - public String getHositalId() {
182   - return hositalId;
  181 + public String getHospitalId() {
  182 + return hospitalId;
183 183 }
184 184  
185   - public void setHositalId(String hositalId) {
186   - this.hositalId = hositalId;
  185 + public void setHospitalId(String hospitalId) {
  186 + this.hospitalId = hospitalId;
187 187 }
188 188  
189 189 public String getParentId() {
190 190  
... ... @@ -226,12 +226,12 @@
226 226 this.checkTimeDesc = checkTimeDesc;
227 227 }
228 228  
229   - public String getVisitHositalId() {
230   - return visitHositalId;
  229 + public String getVisitHospitalId() {
  230 + return visitHospitalId;
231 231 }
232 232  
233   - public void setVisitHositalId(String visitHositalId) {
234   - this.visitHositalId = visitHositalId;
  233 + public void setVisitHospitalId(String visitHospitalId) {
  234 + this.visitHospitalId = visitHospitalId;
235 235 }
236 236  
237 237 public String getFeedType() {
... ... @@ -274,7 +274,7 @@
274 274 this.height = height;
275 275 }
276 276  
277   - public String isVomit() {
  277 + public String getVomit() {
278 278 return vomit;
279 279 }
280 280  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java View file @ d23c62c
... ... @@ -46,6 +46,17 @@
46 46 }
47 47  
48 48 /**
  49 + * 新生儿访视查询
  50 + * @param pid
  51 + * @return
  52 + */
  53 + @RequestMapping(value = "/query", method = RequestMethod.GET)
  54 + @ResponseBody
  55 + public BaseObjectResponse query(HttpServletRequest request, String pid) {
  56 + return visitService.query(getUserId(request), pid);
  57 + }
  58 +
  59 + /**
49 60 * 新生儿访视导出
50 61 * @param startDate 访视开始日期
51 62 * @param endDate 访视结束日期
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java View file @ d23c62c
... ... @@ -15,5 +15,7 @@
15 15 BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit);
16 16  
17 17 void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key);
  18 +
  19 + BaseObjectResponse query(Integer userId, String pid);
18 20 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java View file @ d23c62c
... ... @@ -74,7 +74,7 @@
74 74 newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName());
75 75 newbornVisit.setComplexion(newbornVisit.getComplexion() == null ? null : BregmaticEnums.get(Integer.parseInt(newbornVisit.getComplexion())).getName());
76 76 newbornVisit.setUmbilicalCord(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName());
77   - newbornVisit.setHositalId(autoMatchFacade.getHospitalId(userId));
  77 + newbornVisit.setHospitalId(autoMatchFacade.getHospitalId(userId));
78 78 // newbornVisit.setNextVisitTime(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName());
79 79 if(StringUtils.isEmpty(newbornVisit.getId())) {
80 80 String babyId = null;
... ... @@ -215,6 +215,22 @@
215 215 }
216 216  
217 217 ResponseUtil.responseExcel(cnames, results, response);
  218 + }
  219 +
  220 + @Override
  221 + public BaseObjectResponse query(Integer userId, String pid) {
  222 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  223 + List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId))
  224 + .with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class);
  225 + List<Map<String, Object>> rest = new ArrayList<>();
  226 + for (NewbornVisit newbornVisit : newbornVisits) {
  227 + Map<String, Object> temp = new HashMap<>();
  228 + temp.put("pid", newbornVisit.getPid());
  229 + temp.put("checkTime", newbornVisit.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(newbornVisit.getCheckTime()));
  230 + temp.put("checkTimeDesc", newbornVisit.getCheckTimeDesc());
  231 + rest.add(temp);
  232 + }
  233 + return RespBuilder.buildSuccess(rest);
218 234 }
219 235  
220 236 }