From c9a6bfb018d4aa144481d64931dfab897d32c4bd Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 28 Nov 2017 11:51:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 2 +- .../main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 715e2ef..b647db4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -235,7 +235,7 @@ public class ViewFacade { map.put("serviceStatus", ServiceStatusEnums.getNameById(data.getServiceStatus())); //建档孕周 - map.put("buildDueWeek", ResolveUtils.getPregnancyWeek3(data, data.getBookbuildingDate())); + map.put("buildDueWeek", ResolveUtils.getPregnancyWeek(data, data.getBookbuildingDate())); map.put("fuckLastMensWeek", ResolveUtils.getPregnancyWeek2(data, data.getBookbuildingDate())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java index 08bc580..a032ab1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java @@ -405,9 +405,9 @@ public class ResolveUtils { String dueWeek=""; if (null != patients.getDueStatus() && patients.getDueStatus() != null && 1 == patients.getDueStatus()) { dueWeek = "终止妊娠"; - }/* else if (patients.getType() != null && 3 == patients.getType()) { + } else if (patients.getType() != null && 3 == patients.getType()) { dueWeek = "已分娩"; - }*/ else { + } else { if (null != patients.getLastMenses()) { if(patients.getFuckLastMens() == null) { return ""; -- 1.8.3.1