From f713ae1f3443759801b8e614b4fd21781baa0339 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 11 Oct 2018 15:44:27 +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

---
 .../operate/web/facade/PremaritalCheckupFacade.java   | 19 ++++++++++++-------
 .../web/result/PremaritalCheckupPageResult.java       | 10 ++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

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 3759dce..324720c 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
@@ -1218,13 +1218,18 @@ public class PremaritalCheckupFacade {
                 }
                 out = response.getOutputStream();
                 Map<String, String> cnames = new LinkedHashMap<>();
+                cnames.put("premaritalUpTime", "婚检时间");
                 cnames.put("username", "姓名");
+                cnames.put("certificateNum", "证件号");
                 cnames.put("phone", "联系方式");
-                cnames.put("age", "年龄");
+                cnames.put("jianChaJieGuo", "结果");
+                cnames.put("yiXueYiJian", "医学意见");
+                cnames.put("address","居住地址");
+                cnames.put("hunJianDoctor", "婚检医生");
+
+                /*cnames.put("age", "年龄");
                 cnames.put("hospital", "婚检机构");
-                cnames.put("premaritalUpTime", "婚检时间");
                 cnames.put("certificateTypeId", "证件类型");
-                cnames.put("certificateNum", "证件号");
                 cnames.put("vcCardNo", "就诊卡号");
                 cnames.put("sexType", "性别");
 
@@ -1358,14 +1363,13 @@ public class PremaritalCheckupFacade {
                 cnames.put("linBing", "淋病");
                 cnames.put("xiongTou", "胸透");
 
-                cnames.put("jianChaJieGuo", "检查结果");
+
                 cnames.put("jianChaDetails", "检查异常详情");
                 cnames.put("jiBingZhenDuan", "疾病诊断");
 
-                cnames.put("yiXueYiJian", "医学意见");
+
                 cnames.put("yiJianQiTaDetails", "医学意见其他详情");
-                cnames.put("zhiDaoYiJian", "指导意见");
-                cnames.put("hunJianDoctor", "婚检医生");
+                cnames.put("zhiDaoYiJian", "指导意见");*/
 
                 response.setContentType("application/octet-stream");
                 response.setHeader("Content-Disposition", "attachment;fileName=" + "huanjian.xls");
@@ -2480,6 +2484,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setVolumeRight(result.getVolumeRight());//体积右
         checkupResult.setGaoWanZuo(result.getGaoWanZuo());//睾丸左
         checkupResult.setGaoWanYou(result.getGaoWanYou());//睾丸右
+        checkupResult.setSpouseCertificateTypeId(result.getSpouseCertificateTypeId());//证件类型
 
         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 bf44c4f..ff8146c 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
@@ -370,6 +370,16 @@ public class PremaritalCheckupPageResult {
     private String gaoWanZuo;
     //睾丸(右)
     private String gaoWanYou;
+    //证件类型
+    private String spouseCertificateTypeId;
+
+    public String getSpouseCertificateTypeId() {
+        return spouseCertificateTypeId;
+    }
+
+    public void setSpouseCertificateTypeId(String spouseCertificateTypeId) {
+        this.spouseCertificateTypeId = spouseCertificateTypeId;
+    }
 
     public String getGaoWanZuo() {
         return gaoWanZuo;
-- 
1.8.3.1