diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java index 669329d..d8cee27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java @@ -35,6 +35,7 @@ public class PostpartumReportController extends BaseController { public BaseResponse getPostpartumReportList(@RequestParam(required = false) String rFactor, @RequestParam(required = false) Integer deliveryModel, @RequestParam(required = false) String name, + @RequestParam(required = false) Integer num, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit, HttpServletRequest request) { @@ -43,6 +44,7 @@ public class PostpartumReportController extends BaseController { postpartumReportQuery.setrFactorList(StringUtils.covertToList(rFactor, String.class)); postpartumReportQuery.setDeliveryModel(deliveryModel); postpartumReportQuery.setName(name); + postpartumReportQuery.setNum(num); postpartumReportQuery.setPage(page); postpartumReportQuery.setLimit(limit); return postpartumReportFacade.queryPatient(postpartumReportQuery,getUserId(request)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 6446b6a..5719f9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -3787,10 +3787,10 @@ public class PatientFacade extends BaseServiceImpl { if (p != null) { 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); if (chuModel != null) { + patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); + patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); if (StringUtils.isNotEmpty(chuModel.getHeight()) && StringUtils.isNotEmpty(chuModel.getWeight())) { - patientBaseResult.setHeight(StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); patientBaseResult.setWeight(StringUtils.isNotEmpty(chuModel.getWeight()) ? chuModel.getWeight() : ""); - patientBaseResult.setBeforWeight(StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); patientBaseResult.setBmi(patientWeightService.getBmi(chuModel.getYqWeight(), chuModel.getHeight())); } else { PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(p.getId())), PatientWeight.class); 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 221d415..69c2721 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 @@ -7,9 +7,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.controller.AntenatalExaminationController; import com.lyms.platform.operate.web.facade.*; -import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; @@ -41,7 +39,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.DecimalFormat; import java.util.*; @Service @@ -1420,9 +1417,14 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override public BaseResponse wxReport(String pid,Integer type) { + Map map = new LinkedHashMap<>(); + AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class); + if (chuModel != null) { + map.put("beforeWeight", com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); + map.put("height",com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); + } PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0").and("type").is(type)), PatientWeight.class); if (patientWeight != null) { - Map map = new LinkedHashMap<>(); map.put("beforeWeight", patientWeight.getBeforeWeight()); Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); Map dayWeights = sortMapByKey(patientWeight.getDayWeights());