jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6dffd75f34ca1e299ff23e0a483cde36305c54b3

Authored by zhangchao
1 parent abdd54b8a2
Exists in dev

#fix:新增产前检查身高体重同步体重管理的逻辑

Showing 3 changed files with 10 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java View file @ 6dffd75
... ... @@ -35,6 +35,7 @@
35 35 public BaseResponse getPostpartumReportList(@RequestParam(required = false) String rFactor,
36 36 @RequestParam(required = false) Integer deliveryModel,
37 37 @RequestParam(required = false) String name,
  38 + @RequestParam(required = false) Integer num,
38 39 @RequestParam("page") Integer page,
39 40 @RequestParam("limit") Integer limit,
40 41 HttpServletRequest request) {
... ... @@ -43,6 +44,7 @@
43 44 postpartumReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class));
44 45 postpartumReportQuery.setDeliveryModel(deliveryModel);
45 46 postpartumReportQuery.setName(name);
  47 + postpartumReportQuery.setNum(num);
46 48 postpartumReportQuery.setPage(page);
47 49 postpartumReportQuery.setLimit(limit);
48 50 return postpartumReportFacade.queryPatient(postpartumReportQuery,getUserId(request));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 6dffd75
... ... @@ -3787,10 +3787,10 @@
3787 3787 if (p != null) {
3788 3788 AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
3789 3789 if (chuModel != null) {
  3790 + patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : "");
  3791 + patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
3790 3792 if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight())) {
3791   - patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
3792 3793 patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : "");
3793   - patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : "");
3794 3794 patientBaseResult.setBmi(patientWeightService.getBmi(chuModel.getYqWeight(), chuModel.getHeight()));
3795 3795 } else {
3796 3796 PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(p.getId())), PatientWeight.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 6dffd75
... ... @@ -7,9 +7,7 @@
7 7 import com.lyms.platform.common.enums.*;
8 8 import com.lyms.platform.common.result.*;
9 9 import com.lyms.platform.common.utils.*;
10   -import com.lyms.platform.operate.web.controller.AntenatalExaminationController;
11 10 import com.lyms.platform.operate.web.facade.*;
12   -import com.lyms.platform.operate.web.service.IBloodPressureService;
13 11 import com.lyms.platform.operate.web.service.PatientWeightService;
14 12 import com.lyms.platform.operate.web.utils.CollectionUtils;
15 13 import com.lyms.platform.operate.web.utils.MathUtil;
... ... @@ -41,7 +39,6 @@
41 39  
42 40 import java.math.BigDecimal;
43 41 import java.math.RoundingMode;
44   -import java.text.DecimalFormat;
45 42 import java.util.*;
46 43  
47 44 @Service
48 45  
... ... @@ -1420,9 +1417,14 @@
1420 1417  
1421 1418 @Override
1422 1419 public BaseResponse wxReport(String pid,Integer type) {
  1420 + Map<String, Object> map = new LinkedHashMap<>();
  1421 + AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class);
  1422 + if (chuModel != null) {
  1423 + map.put("beforeWeight", com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : "");
  1424 + map.put("height",com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : "");
  1425 + }
1423 1426 PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0").and("type").is(type)), PatientWeight.class);
1424 1427 if (patientWeight != null) {
1425   - Map<String, Object> map = new LinkedHashMap<>();
1426 1428 map.put("beforeWeight", patientWeight.getBeforeWeight());
1427 1429 Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
1428 1430 Map<String, String> dayWeights = sortMapByKey(patientWeight.getDayWeights());