From 2c3ed59001e7df7031633e6fecce3b931e0dfd8a Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Fri, 28 Sep 2018 21:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/DiagnosisModel.java | 2 +- .../com/lyms/platform/operate/web/request/DiagnosisAddRequest.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java index 9615069..9c4b09d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java @@ -378,7 +378,7 @@ public class DiagnosisModel extends BaseModel { map.put("modified",DateUtil.getyyyy_MM_dd(modified)); map.put("status",status); map.put("diaStatus",diaStatus); - map.put("nowWeek",nowWeek); + map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date())); map.put("rsResult",rsResult); map.put("diaResult",diaResult); map.put("applyWeek",applyWeek); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java index b31f828..b8fe1da 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.DiagnosisModel; +import org.apache.commons.lang.StringUtils; import java.util.Date; @@ -405,7 +406,9 @@ public class DiagnosisAddRequest implements IBasicRequestConvert diagnosisModel.setCardNo(cardNo); diagnosisModel.setAge(age); diagnosisModel.setDueWeek(dueWeek); - diagnosisModel.setDueDays(100); + diagnosisModel.setApplyWeek(dueWeek); + int days = DateUtil.daysBetween(DateUtil.parseYMD(lastMenses), new Date()); + diagnosisModel.setDueDays(days); diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi)); diagnosisModel.setPhone(phone); diagnosisModel.setDiaProject(diaProject); -- 1.8.3.1