From dd4471736bdb558e32468a461635dafbd6a19ed1 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 6 Sep 2016 17:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntenatalExaminationFacade.java        |  2 ++
 .../com/lyms/platform/operate/web/result/AntexListResult.java | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 6dd9256..4c4fba1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -1332,6 +1332,7 @@ public class AntenatalExaminationFacade {
 
         if (CollectionUtils.isNotEmpty(examinationModelList)) {
             lastTime = DateUtil.getyyyy_MM_dd(examinationModelList.get(0).getCheckDate());
+            antexListResult.setTireNumber1(examinationModelList.get(0).getTireNumber());
         } else {
             AntExChuQuery antExChuQuery1 = new AntExChuQuery();
             antExChuQuery1.setPid(patients.getPid());
@@ -1342,6 +1343,7 @@ public class AntenatalExaminationFacade {
 
             if (CollectionUtils.isNotEmpty(antExChuModels)) {
                 lastTime = DateUtil.getyyyy_MM_dd(antExChuModels.get(0).getCheckTime());
+                antexListResult.setTireNumber1(antExChuModels.get(0).getTireNumber());
             } else {
                 PatientsQuery patientsQuery1 = new PatientsQuery();
                 patientsQuery1.setYn(YnEnums.YES.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 9a86b5f..4ce0c48 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -42,7 +42,8 @@ public class AntexListResult {
     private String lastBuildTime;
 
     private String birth;
-
+    // 胎数
+    private String tireNumber1;
     private String cardNo;
     private String vcCardNo;
     private String isSieve;
@@ -50,6 +51,14 @@ public class AntexListResult {
     //<!---------基本信息----------->
 
 
+    public String getTireNumber1() {
+        return tireNumber1;
+    }
+
+    public void setTireNumber1(String tireNumber1) {
+        this.tireNumber1 = tireNumber1;
+    }
+
     public String getLastBuildTime() {
         return lastBuildTime;
     }
-- 
1.8.3.1