From 093186154402dd80993d90fc900f17398a822c74 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 17 Nov 2017 15:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 0dfe006..6a2521a 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 @@ -899,7 +899,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService map.put("username", p.getUsername()); map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone())); map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo())); - map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); + if(p.getType() == 3 && p.getBuildType() == 2) { + map.put("week", "已分娩"); + } else { + map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date())); + } map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor())); String hName = hospitalNameCache.get(p.getHospitalId()); if(StringUtils.isEmpty(hName)) { -- 1.8.3.1