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 6a9ddc6..a7d7fa5 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 @@ -298,12 +298,22 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeight.setHospitalName(couponMapper.getHospitalName(patientWeight.getHospitalId())); List> weightInfo = new ArrayList<>(); List betweenDay = DateUtil.getBetweenDay(7); - for (String day : betweenDay) { - - } - for (Map map : patientWeight.getDayWeights2()) { - + for (String date : betweenDay) { + Map temp = new HashMap<>(); + weightInfo.add(temp); + temp.put("id", date); + for (Map map : patientWeight.getDayWeights2()) { + if(date.equals(map.get("date").toString())) { + temp.put("name", map.get("nowWeight")); + break; + } + } + if(!temp.containsKey("name")) { + temp.put("name", "--"); + } } + patientWeight.setWeightInfo(weightInfo); + return RespBuilder.buildSuccess(patientWeight); }