From 717d55b9a45a49bfde7b5a758b88dc51a5212bdf Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 14 Feb 2017 16:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B5=E5=AD=90=E7=97=85?=
 =?UTF-8?q?=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/ViewFacade.java   |  4 ++--
 .../lyms/platform/operate/web/utils/ResolveUtils.java  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 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 db02492..326c230 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
@@ -270,7 +270,7 @@ public class ViewFacade {
         //产检基本信息
         map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime()));
         //产检孕周
-        map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime()));
+        map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients));
         String checkDoctor = "";
 
         if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){
@@ -622,7 +622,7 @@ public class ViewFacade {
         }
         map.put("hospital", hospital);
         map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
-        map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckDate()));
+        map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients));
 //        map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
 
         /*  复诊信息  */
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 9c6a4d5..438b310 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
@@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.result.HighScoreResult;
 import com.lyms.platform.pojo.BasicConfig;
+import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.BasicConfigQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -347,6 +348,23 @@ public class ResolveUtils {
         return com.lyms.platform.common.utils.StringUtils.dueWeek(day);
     }
 
+    public  static String getPregnancyWeek(Patients patients){
+        String dueWeek="";
+        if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) {
+            dueWeek = "终止妊娠";
+        } else if (3 == patients.getType()) {
+            dueWeek = "已分娩";
+        } else {
+            if (null != patients.getLastMenses()) {
+                int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
+                dueWeek = com.lyms.platform.common.utils.StringUtils.dueWeek(days);
+            }
+        }
+        return dueWeek;
+    }
+
+
+
 
 
     public static void main(String[] str) {
-- 
1.8.3.1