From d09c86a0de051d20491663249539613e7aecc3c0 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 27 Jun 2018 14:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SieveFacade.java   | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 1a20bbd..8899432 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1035,7 +1035,48 @@ public class SieveFacade {
                 result.put("age", DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated()));
                 result.put("menstrWeek", sieveApply.getMensesWeek());//月经周
                 result.put("historyBirth", sieveApply.getHistoryBirth());//生育史
+
+                Map<String, String> historMap = sieveApply.getHistoryBirth();
+                if(historMap.containsKey("tshr")){
+                    if("true".equals(historMap.get("tshr"))){
+                        historMap.put("tshr","是");
+                    }else{
+                        historMap.put("tshr","否");
+                    }
+                }
+                if(historMap.containsKey("rsthr")){
+                    if("true".equals(historMap.get("rsthr"))){
+                        historMap.put("rsthr","是");
+                    }else{
+                        historMap.put("rsthr","否");
+                    }
+                }
+                if(historMap.containsKey("sjhr")){
+                    if("true".equals(historMap.get("sjhr"))){
+                        historMap.put("sjhr","是");
+                    }else{
+                        historMap.put("sjhr","否");
+                    }
+                }
+                if(historMap.containsKey("qt")){
+                    if("true".equals(historMap.get("qt"))){
+                        historMap.put("qt","是："+historMap.get("qtText"));
+                    }else{
+                        historMap.put("qt","否");
+                    }
+                }
+
+
                 result.put("pastHistory",sieveApply.getPastHistory());
+                if(historMap.containsKey("pastHistory")){
+                    if("yes".equals(result.get("pastHistory"))){
+                        result.put("pastHistory","是");
+                    }else{
+                        result.put("pastHistory","否");
+                    }
+                }
+
+
                 String collectionDoctorName = CommonsHelper.getUserName(sieveApply.getCollectionDoctorId(), usersService);
                 result.put("cxys", collectionDoctorName);
                 result.put("experimentNum","");
-- 
1.8.3.1