diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java index feeb17c..085191b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java @@ -1,10 +1,13 @@ package com.lyms.platform.pojo; +import org.springframework.data.mongodb.core.mapping.Document; + import java.util.Date; /** * 孕产妇体重管理 */ +@Document(collection="lyms_patient_weight") public class PatientWeight { private String id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index f376a4a..e9acc9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -37,11 +37,23 @@ public class PatientWeightController extends BaseController { return patientWeightService.addOrUpdate(getUserId(request), patientWeight); } + /** + * + * @param key 姓名/证件号/联系方式 + * @param vcCardNo 就诊卡号 + * @param currentWeekStart 当前孕周开始 + * @param currentWeekEnd 当前孕周结束 + * @param age 年龄 + * @param page + * @param limit + * @param request + * @return + */ @ResponseBody @TokenRequired @RequestMapping(value = "/query", method = RequestMethod.GET) - public BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return patientWeightService.list(serchType, serchValue, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request)); + public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { + return patientWeightService.list(key, vcCardNo, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request)); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index be4761c..9e3a46b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -11,7 +11,7 @@ public interface PatientWeightService extends IBaseService { BaseResponse addOrUpdate(Integer userId, PatientWeight patientWeight); - BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId); + BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId); BaseResponse info(String id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index aed6cf9..e9d71eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -71,12 +71,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse list(String serchType, String serchValue, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { + public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); - if(StringUtils.isNotBlank(serchType) && StringUtils.isNotBlank(serchValue)) { + /* if(StringUtils.isNotBlank(serchType) && StringUtils.isNotBlank(serchValue)) { criteria.and("cardNo").is(serchValue).and("pcerteTypeId").is(serchType); - } + }*/ if(currentWeekStart != null && currentWeekEnd != null) { Date start = DateUtil.getWeekStart(currentWeekEnd); Date end = DateUtil.getWeekEnd(currentWeekStart); @@ -93,7 +93,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } criteria.and("id").in(pids); } - PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); + PageResult pageResult = findMongoPage(PatientWeight.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); List patientWeights = (List) pageResult.getGrid(); List> restMap = new ArrayList<>(); if(CollectionUtils.isNotEmpty(patientWeights)) { @@ -114,7 +114,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } pageResult.setGrid(restMap); - return null; + return RespBuilder.buildSuccess(pageResult); } // 体质指数(BMI)=体重(kg)÷身高^2(m)