From 210a70f234636166fbebd10ebb2c5f5148e0a637 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 20 Nov 2017 11:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/request/YunBookbuildingAddRequest.java | 9 +++++++++ .../platform/operate/web/service/impl/ReportServiceImpl.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 77873f1..3d1d013 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -14,6 +14,7 @@ public class YunBookbuildingAddRequest { private String fuckLastMens; // 末次月经纠正依据 private String lastMenstrualPeriodBasis; + private String lastMenstrualPeriodBasisId; // 末次月经纠正依据 private String lastMenstrualPeriodBasisOther; // 末次月经纠正医生ID @@ -21,6 +22,14 @@ public class YunBookbuildingAddRequest { // 末次月经纠正时间 private String lastMenstrualPeriodBasisDate; + public void setLastMenstrualPeriodBasisId(String lastMenstrualPeriodBasisId) { + this.lastMenstrualPeriodBasisId = lastMenstrualPeriodBasisId; + } + + public String getLastMenstrualPeriodBasisId() { + return lastMenstrualPeriodBasisId; + } + public String getFuckLastMens() { return fuckLastMens; } 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 078dfee..863a15b 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 @@ -1071,8 +1071,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(pt.getType() == 3 || pt.getBuildType() == 2) { /** 当前孕周 */ map.put("week", "已分娩"); } else { - map.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); + temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); } + System.out.println(pt.getBookbuildingDate().toLocaleString()); temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */ temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); -- 1.8.3.1