From caefbac9f1dbefd38fcfc11df828dd4d67c0adb4 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Wed, 10 Oct 2018 16:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PremaritalCheckupFacade.java        |  8 +++++-
 .../web/result/PremaritalCheckupPageResult.java    | 30 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index d4bf2be..1acde3c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -2432,7 +2432,13 @@ public class PremaritalCheckupFacade {
         checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
 
         //新增
-        checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());
+        checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());//既往病史
+        checkupResult.setSurgeryHistory(result.getSurgeryHistory());//手术史
+        checkupResult.setNowBingHistory(result.getNowBingHistory());//现病史
+        checkupResult.setFamilyHistory(result.getFamilyHistory());//家庭史
+        checkupResult.setZuyue(result.getZuyue());//足月
+        checkupResult.setLiuchan(result.getLiuchan());//流产
+        checkupResult.setZaochan(result.getZaochan());//早产
 
         return checkupResult;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
index 5195f2b..26157ad 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
@@ -333,6 +333,12 @@ public class PremaritalCheckupPageResult {
     private Map<String,Object> nowBingHistory;
     //家庭史
     private Map<String,Object> familyHistory;
+    //足月
+    private Integer zuyue;
+    //早产
+    private Integer zaochan;
+    //流产
+    private Integer liuchan;
 
     public Map<String, Object> getMaritalBingHistory() {
         return maritalBingHistory;
@@ -366,6 +372,30 @@ public class PremaritalCheckupPageResult {
         this.familyHistory = familyHistory;
     }
 
+    public Integer getZuyue() {
+        return zuyue;
+    }
+
+    public void setZuyue(Integer zuyue) {
+        this.zuyue = zuyue;
+    }
+
+    public Integer getZaochan() {
+        return zaochan;
+    }
+
+    public void setZaochan(Integer zaochan) {
+        this.zaochan = zaochan;
+    }
+
+    public Integer getLiuchan() {
+        return liuchan;
+    }
+
+    public void setLiuchan(Integer liuchan) {
+        this.liuchan = liuchan;
+    }
+
     public String getUsername() {
         return username;
     }
-- 
1.8.3.1