From 82da93b8237a046efea085eedc0f2e5694c98c49 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Sat, 22 Jul 2017 18:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=9F=8E=E5=A6=87=E5=B9=BC=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/ViewFacade.java | 20 ++++++++++++++++++--
 1 file changed, 18 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 be7c55f..dccf534 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
@@ -1136,8 +1136,23 @@ public class ViewFacade {
 
         //产检基本信息
         map.put("checkDate", DateUtil.getyyyy_MM_dd(data.getCheckTime()));
+        String cDueWeek = ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime());
         //产检孕周
-        map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckTime()));
+        map.put("cDueWeek", cDueWeek);
+        int week = Integer.parseInt(cDueWeek.substring(1,cDueWeek.indexOf("周")));
+        if(week>=20){
+            map.put("gongGaoText",UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
+        }else if(week<20){
+            if (StringUtils.isNotEmpty(data.getGonggaoSelect())) {
+                if (StringUtils.isNotEmpty(data.getGonggaoType())) {
+                    map.put("gongGaoText", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect())+"，"+GongJingEnums.getHengZhiNameById(data.getGonggaoType()));
+                }else{
+                    map.put("gongGaoText", GongJingEnums.getGongGaoNameById(data.getGonggaoSelect()));
+                }
+            }
+        }
+
+
         String checkDoctor = "";
 
         if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())) {
@@ -1169,6 +1184,7 @@ public class ViewFacade {
         map.put("textpjbc", Boolean.valueOf(data.getTextpjbc()) ? "已检查" : "未检查");
         map.put("s75gdgtt", Boolean.valueOf(data.getS75gdgtt()) ? "已检查" : "未检查");
         map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
+        map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n");
 
         //实验结果选择
         //hiv 抗体
@@ -1758,7 +1774,7 @@ public class ViewFacade {
         map.put("jzxgn", Boolean.valueOf(data.getJzxgn()) ? "已检查" : "未检查");
 
 
-        map.put("zdjcxm","早孕期病毒检测："+map.get("zyqbdjc")+"， NT检查："+map.get("ntjc")+"， 产前筛查："+map.get("cjsc")+"， 胎儿系统排畸B超："+map.get("textpjbc")+"， 75gOGTT："+map.get("s75gdgtt")+"， 甲状腺功能："+map.get("jzxgn")+"\n");
+
 
         //早孕期病毒检测
 //        private String zyqbdjc;
-- 
1.8.3.1