From a4e9c536c0fde709cfb18e25bb249d82b7939364 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Mon, 17 Jan 2022 14:49:35 +0800 Subject: [PATCH] update --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 1e03814..9b55025 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 @@ -4570,6 +4570,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .and("yn").is(YnEnums.YES.getId()); List patientsList = mongoTemplate.find(Query.query(criteria), Patients.class); for (Patients patients : patientsList) { + //避免末次月经字段空。但是这样统计结果不准确。前端该字段是必填。但是历史数据不保证。 + if(null==patients.getLastMenses()||null==patients.getBookbuildingDate()){ + continue; + } int dueWeek=DateUtil.getWeek2(patients.getLastMenses(),patients.getBookbuildingDate()); if(dueWeek<=12){ dueWeek12++; @@ -4692,7 +4696,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService StringBuffer bf=new StringBuffer(); for (Map stringObjectMap : risk) { if(stringObjectMap.get("color").equals(riskType)){ - bf.append(stringObjectMap.get("name")); + bf.append(stringObjectMap.get("name")+"; "); } } map.put("highRiskResult", bf); -- 1.8.3.1