From 25292cdc07d168112534ccd0d1deaee6f44f70e5 Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Tue, 4 Jan 2022 14:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8C=BB=E9=99=A2=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E4=BF=A1=E6=81=AF1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/carbasics/bean/vo/AccountVo.java  |  2 ++
 .../ccsens/carbasics/persist/dao/OrganizationDao.java |  7 +++++++
 .../ccsens/carbasics/service/ManagementService.java   |  4 +---
 src/main/resources/mapper_dao/AccountManageDao.xml    |  3 ++-
 src/main/resources/mapper_dao/OrganizationDao.xml     | 11 +++++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java
index 65e414a..d60ac7d 100644
--- a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java
+++ b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java
@@ -60,6 +60,8 @@ public class AccountVo {
         private String positionCode;
         @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)")
         private Byte auditStatus;
+        @ApiModelProperty("数据来源(0-账户,1-问卷)")
+        private Byte dataFrom;
 
         public String getPhone() {
             return DesensitizedUtils.mobilePhone(phone);
diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDao.java
index 86c91bf..06ac2c7 100644
--- a/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDao.java
+++ b/src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDao.java
@@ -144,4 +144,11 @@ public interface OrganizationDao extends OrganizationMapper {
      * @return 医院列表
      */
     List<ManagementVo.HospitalInfo> queryHospitalList(@Param("param") ManagementDto.QueryHospitalList param);
+
+    /**
+     * 查询医院下的部门具体信息
+     * @param param 医院id
+     * @return 医院的部门信息
+     */
+    List<ManagementVo.HospitalData> queryDepartmentData(@Param("param") ManagementDto.QueryHospitalInfo param);
 }
diff --git a/src/main/java/com/ccsens/carbasics/service/ManagementService.java b/src/main/java/com/ccsens/carbasics/service/ManagementService.java
index 7114969..b63915c 100644
--- a/src/main/java/com/ccsens/carbasics/service/ManagementService.java
+++ b/src/main/java/com/ccsens/carbasics/service/ManagementService.java
@@ -28,8 +28,6 @@ public class ManagementService implements IManagementService {
     private OrganizationLevelDao organizationLevelDao;
     @Resource
     private OrganizationDao organizationDao;
-    @Resource
-    private OrganizationDepartmentDao departmentDao;
 
     @Override
     public List<ManagementVo.LevelInfo> queryLevel(Long userId) {
@@ -43,7 +41,7 @@ public class ManagementService implements IManagementService {
 
     @Override
     public List<ManagementVo.HospitalData> queryHospitalInfo(ManagementDto.QueryHospitalInfo param, Long userId) {
-
+        List<ManagementVo.HospitalData> hospitalData = organizationDao.queryDepartmentData(param);
         return null;
     }
 
diff --git a/src/main/resources/mapper_dao/AccountManageDao.xml b/src/main/resources/mapper_dao/AccountManageDao.xml
index c305d99..4b98983 100644
--- a/src/main/resources/mapper_dao/AccountManageDao.xml
+++ b/src/main/resources/mapper_dao/AccountManageDao.xml
@@ -13,7 +13,8 @@
             department_code,
             position_name AS position,
             position_code,
-            audit_status
+            audit_status,
+            data_from
         FROM
             t_qcp_account_manage
         WHERE
diff --git a/src/main/resources/mapper_dao/OrganizationDao.xml b/src/main/resources/mapper_dao/OrganizationDao.xml
index 96fcda3..4a91072 100644
--- a/src/main/resources/mapper_dao/OrganizationDao.xml
+++ b/src/main/resources/mapper_dao/OrganizationDao.xml
@@ -893,4 +893,15 @@
         CONVERT(`name` USING GBK)
     </select>
 
+
+    <resultMap id="departmentData" type="com.ccsens.carbasics.bean.vo.OrganizationVo$Basic">
+        <id property="organizationId" column="organizationId"/>
+        <collection property="roles" ofType="String" javaType="List">
+            <result column="role"/>
+        </collection>
+    </resultMap>
+    <select id="queryDepartmentData" resultMap="departmentData">
+
+    </select>
+
 </mapper>