From 4ce2dedb000bf1e0aa9eb5895128e2f23e4dce88 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 31 Jul 2020 18:32:50 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a2b7efa..bc4a1b7 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 @@ -941,9 +941,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService + findName(p.getHareaRegisterId()) + findName(p.getHstreetRegisterId()) + p.getHaddressRegister(); result.put("丈夫户口所在地", hAddress.replace("null", "")); //孕妇状态显示当前孕周 - if ("1".equals(p.getType())) { + if (p.getType()!=null && "1".equals(p.getType().toString())) { result.put("结案状态", DateUtil.getWeekDesc(p.getLastMenses(),new Date())); - }else if ("3".equals(p.getType())){ + }else if (p.getType()!=null && "3".equals(p.getType().toString())){ result.put("结案状态", "分娩"); }else { result.put("结案状态", ""); -- 1.8.3.1