From 68cbe5f3ef7edf633278e67e61fdda905790e754 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 14 Feb 2017 21:20:30 +0800
Subject: [PATCH] update code

---
 .../lyms/platform/operate/web/facade/ViewFacade.java |  3 +++
 .../platform/operate/web/utils/ResolveUtils.java     | 20 ++++++++++++++++++--
 2 files changed, 21 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 f42b304..b7b8fae 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
@@ -154,6 +154,9 @@ public class ViewFacade {
         map.put("serviceType",serviceType );
         map.put("serviceStatus", ServiceStatusEnums.getNameById(data.getServiceStatus()));
 
+        //建档孕周
+        map.put("buildDueWeek",ResolveUtils.getPregnancyWeek(data,data.getBookbuildingDate()));
+
         br.setData(map);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
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 438b310..6fd9c50 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
@@ -300,8 +300,8 @@ public class ResolveUtils {
             }
         }
         map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(color));
-        map.put("score",pingfen);
-        map.put("name",yinsu);
+        map.put("score", pingfen);
+        map.put("name", yinsu);
         return map;
     }
 
@@ -364,6 +364,22 @@ public class ResolveUtils {
     }
 
 
+    public  static String getPregnancyWeek(Patients patients,Date date){
+        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(), date);
+                dueWeek = com.lyms.platform.common.utils.StringUtils.dueWeek(days);
+            }
+        }
+        return dueWeek;
+    }
+
+
 
 
 
-- 
1.8.3.1