From 9c110a89c1824ba9cd1b97b027847893db043572 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 18 Jul 2024 10:30:56 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=8E=B7=E5=8F=96=E4=BA=A7=E6=A3=80=E4=BD=93=E9=87=8D?= =?UTF-8?q?=E5=8F=8A=E8=BA=AB=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/PatientWeightServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 69c2721..6c9ee9d 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 @@ -1417,14 +1417,9 @@ 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()); @@ -1449,7 +1444,14 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientServiceQuery.setPid(pid); patientServiceQuery.setSerEndTime(new Date()); List list= patientServiceService.queryPatientService(patientServiceQuery); - return RespBuilder.buildSuccess(list); + AntExChuModel chuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0")).with(new Sort(Sort.Direction.DESC, "created")), AntExChuModel.class); + Map params=new HashMap<>(); + if (chuModel != null) { + params.put("beforWeight",com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getYqWeight()) ? chuModel.getYqWeight() : ""); + params.put("height",com.lyms.platform.common.utils.StringUtils.isNotEmpty(chuModel.getHeight()) ? chuModel.getHeight() : ""); + } + params.put("list",list); + return RespBuilder.buildSuccess(params); } @Override -- 1.8.3.1