From 65fb3bd0f5ba8052a05a969a6c249ace59b8a43e Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 13 Sep 2021 16:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java  | 2 +-
 .../src/main/resources/mapper/vim/VaccinationInfoDao.xml     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java
index e1653d6..cefd991 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java
@@ -108,5 +108,5 @@ public class VaccinationInfoDTO implements Serializable {
 	// @ApiModelProperty(value = "创建人姓名")
 	private String creatorName;
 
-
+	private String allDeptNames;
 }
\ No newline at end of file
diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
index ecc4d0d..504c0b4 100644
--- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
+++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml
@@ -9,7 +9,7 @@
         v.REAL_NAME,
         v.IDENTITY_NO,
         v.MOBILE,
-        v.SEX,
+        CASE WHEN v.SEX = 1 THEN '男' WHEN  v.SEX = 0 THEN '女' ELSE v.SEX END AS SEX,
         v.COUNTY,
         v.STREET,
         v.COMMUNITY,
@@ -24,7 +24,8 @@
         v.DOSE,
         v.COMPANY_ID,
         v.SITE_ID,
-        v.BATCH_NO
+        v.BATCH_NO,
+        v.ALL_DEPT_NAMES
         FROM
         vaccination_info v
         <if test="vaccTime != null and vaccTime != '' and vaccTime != 0">