Commit 50d97ee193b14749bd84237032d35fcfbea3170d

Authored by litao@lymsh.com
1 parent 5084fa4f00

体重管理相关代码

Showing 4 changed files with 23 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java View file @ 50d97ee
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import org.springframework.data.mongodb.core.mapping.Document;
  4 +
3 5 import java.util.Date;
4 6  
5 7 /**
6 8 * 孕产妇体重管理
7 9 */
  10 +@Document(collection="lyms_patient_weight")
8 11 public class PatientWeight {
9 12  
10 13 private String id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ 50d97ee
... ... @@ -37,11 +37,23 @@
37 37 return patientWeightService.addOrUpdate(getUserId(request), patientWeight);
38 38 }
39 39  
  40 + /**
  41 + *
  42 + * @param key 姓名/证件号/联系方式
  43 + * @param vcCardNo 就诊卡号
  44 + * @param currentWeekStart 当前孕周开始
  45 + * @param currentWeekEnd 当前孕周结束
  46 + * @param age 年龄
  47 + * @param page
  48 + * @param limit
  49 + * @param request
  50 + * @return
  51 + */
40 52 @ResponseBody
41 53 @TokenRequired
42 54 @RequestMapping(value = "/query", method = RequestMethod.GET)
43   - public BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
44   - return patientWeightService.list(serchType, serchValue, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
  55 + public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
  56 + return patientWeightService.list(key, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request));
45 57 }
46 58  
47 59 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ 50d97ee
... ... @@ -11,7 +11,7 @@
11 11  
12 12 BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight);
13 13  
14   - BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId);
  14 + BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId);
15 15  
16 16 BaseResponse info(String id);
17 17  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 50d97ee
... ... @@ -71,12 +71,12 @@
71 71 }
72 72  
73 73 @Override
74   - public BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) {
  74 + public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) {
75 75 String hospitalId = autoMatchFacade.getHospitalId(userId);
76 76 Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
77   - if(StringUtils.isNotBlank(serchType) && StringUtils.isNotBlank(serchValue)) {
  77 + /* if(StringUtils.isNotBlank(serchType) && StringUtils.isNotBlank(serchValue)) {
78 78 criteria.and("cardNo").is(serchValue).and("pcerteTypeId").is(serchType);
79   - }
  79 + }*/
80 80 if(currentWeekStart != null && currentWeekEnd != null) {
81 81 Date start = DateUtil.getWeekStart(currentWeekEnd);
82 82 Date end = DateUtil.getWeekEnd(currentWeekStart);
... ... @@ -93,7 +93,7 @@
93 93 }
94 94 criteria.and("id").in(pids);
95 95 }
96   - PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit);
  96 + PageResult pageResult = findMongoPage(PatientWeight.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit);
97 97 List<PatientWeight> patientWeights = (List<PatientWeight>) pageResult.getGrid();
98 98 List<Map<String, Object>> restMap = new ArrayList<>();
99 99 if(CollectionUtils.isNotEmpty(patientWeights)) {
... ... @@ -114,7 +114,7 @@
114 114 }
115 115 }
116 116 pageResult.setGrid(restMap);
117   - return null;
  117 + return RespBuilder.buildSuccess(pageResult);
118 118 }
119 119  
120 120 // 体质指数(BMI)=体重(kg)÷身高^2(m)