diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 73ecb8c..a9d7e4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -672,14 +672,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } - /*if (MapUtils.isNotEmpty(dayWeights)) { - Set> entries = dayWeights.entrySet(); - for (Map.Entry entry : entries) { - weights.put(DateUtil.getWeek2(patients.getLastMenses(), DateUtil.parseYMD(entry.getKey())), entry.getValue()); - } - }*/ if(tzFlag) { - setReport(tzMap, weights, antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), antExChuModels.get(antExChuModels.size() - 1).getHeight())); + setReport(tzMap, weights, antExChuModels.get(0).getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModels.get(0).getYqWeight(), antExChuModels.get(0).getHeight())); +// setReport(tzMap, weights, antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), PatientWeightServiceImpl.getBmi(antExChuModels.get(antExChuModels.size() - 1).getYqWeight(), antExChuModels.get(antExChuModels.size() - 1).getHeight())); } CollectionUtils.sortListByMapKeyWithDateYmd(restList, "checkTime");