From 7def127c60354fc2c5aba2c4a6d05ec7b6dd4b6f Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Mon, 20 Dec 2021 18:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B4=E4=BD=93=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbasics/service/FirstAidService.java    | 10 ++--
 .../service/OrganizationService.java          |  4 +-
 .../resources/mapper_dao/OrganizationDao.xml  | 19 ++++---
 .../mapper_dao/OrganizationMemberDao.xml      | 54 +++++++++----------
 4 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
index 63f129e..1a67682 100644
--- a/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
+++ b/src/main/java/com/ccsens/carbasics/service/FirstAidService.java
@@ -360,8 +360,9 @@ public class FirstAidService implements IFirstAidService{
     public PageInfo<PatientVo.PatientListByQuality> queryPatientListByQuality(PatientDto.QueryListByQuality param, Long userId) {
         //根据项目id查找医院id
 //        FirstAid firstAid = firstAidDao.getIdByProjectId(param.getProjectId());
-        Long hid = organizationProjectDao.queryByProjectId(param.getProjectId());
-        if(ObjectUtil.isNull(hid)){
+//        Long hid = organizationProjectDao.queryByProjectId(param.getProjectId());
+        Organization organization = organizationDao.selectByPrimaryKey(param.getProjectId());
+        if(ObjectUtil.isNull(organization)){
             throw new BaseException(DefaultCodeError.NOT_HOSPITAL_ID);
         }
         //查找当前用户的职位和科室
@@ -393,14 +394,15 @@ public class FirstAidService implements IFirstAidService{
         //查找病例信息
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
 //        List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListByQuality(template.getTemplates(),template.getOrganizationId(),param);
-        List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListByQualityNew(departmentIdList,departmentIdStr,param,hid);
+        List<PatientVo.PatientListByQuality> patientList = firstAidDao.queryPatientListByQualityNew(departmentIdList,departmentIdStr,param,organization.getId());
         return new PageInfo<>(patientList);
     }
 
     @Override
     public PageInfo<PatientVo.PatientListByQuality> queryPatientListBySecretary(PatientDto.QueryListByQuality param, Long userId) {
         //根据项目id查询机构信息
-        Organization organization = organizationDao.getByProjectId(param.getProjectId());
+//        Organization organization = organizationDao.getByProjectId(param.getProjectId());
+        Organization organization = organizationDao.selectByPrimaryKey(param.getProjectId());
         if(ObjectUtil.isNull(organization)){
             throw new BaseException(DefaultCodeError.NOT_ORGANIZATION);
         }
diff --git a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
index b0869d6..e7f38cd 100644
--- a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
+++ b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java
@@ -44,8 +44,8 @@ public class OrganizationService implements IOrganizationService {
     @Override
     public OrganizationVo.Rank rank(OrganizationDto.Rank param, Long userId) {
         // 判断机构是否存在
-        Organization organization = organizationDao.getByProjectId(param.getProjectId());
-
+//        Organization organization = organizationDao.getByProjectId(param.getProjectId());
+        Organization organization = organizationDao.selectByPrimaryKey(param.getProjectId());
         List<OrganizationVo.RankItem> items = new ArrayList<>();
         switch (param.getType()) {
             case Constant.HospitalRank.DNT_MEDIAN:
diff --git a/src/main/resources/mapper_dao/OrganizationDao.xml b/src/main/resources/mapper_dao/OrganizationDao.xml
index 833b70a..f0b5496 100644
--- a/src/main/resources/mapper_dao/OrganizationDao.xml
+++ b/src/main/resources/mapper_dao/OrganizationDao.xml
@@ -28,30 +28,35 @@
     </insert>
 
     <select id="getOrganization" resultMap="basicMap">
-        SELECT
-            t1.organization_id as organizationId,
+         SELECT
+            t2.organization_id as organizationId,
             t2.code as role
         FROM
-            ( SELECT organization_id FROM t_organization_project WHERE project_id = #{projectId} AND rec_status = 0 limit 1) t1,
             (
             SELECT
                 d.organization_id,
-                p.code
+                pt.code
             FROM
                 (select * from t_organization_member where user_id = #{userId} and rec_status = 0) m,
                 t_organization_member_position mp,
                 t_organization_department d,
-                t_organization_position p
+                t_organization_position p,
+								t_organization_position_type AS pt,
+								t_organization_position_type_relation AS ptr
             WHERE
                 m.id = mp.member_id
                 AND mp.department_id = d.id
                 AND mp.position_id = p.id
+								AND p.id = ptr.position_id
+								AND pt.id = ptr.position_type_id
                 AND d.rec_status = 0
                 AND mp.rec_status = 0
                 AND p.rec_status = 0
+								AND pt.rec_status = 0
+								AND ptr.rec_status = 0
             ) t2
         WHERE
-            t1.organization_id = t2.organization_id
+             t2.organization_id = #{projectId}
     </select>
     <select id="getByProjectId" resultType="com.ccsens.carbasics.bean.po.Organization">
         SELECT
@@ -861,6 +866,6 @@
         AND p.rec_status = 0
         AND d.rec_status = 0
         AND m.user_id = #{userId}
-        AND d.organization_id = (SELECT organization_id FROM t_organization_project WHERE rec_status = 0 AND project_id = #{projectId})
+        AND d.organization_id = #{projectId}
     </select>
 </mapper>
diff --git a/src/main/resources/mapper_dao/OrganizationMemberDao.xml b/src/main/resources/mapper_dao/OrganizationMemberDao.xml
index 3599a82..84382f6 100644
--- a/src/main/resources/mapper_dao/OrganizationMemberDao.xml
+++ b/src/main/resources/mapper_dao/OrganizationMemberDao.xml
@@ -18,36 +18,34 @@
 
     <select id="getMemberPosition" resultMap="MemberPositionMap">
         SELECT
-        m.id,
-        m.`name`,
-        m.`contact`,
-        mp.id as memberPositionId,
-        p.id as positionId,
-        p.`code` as positionCode,
-        d.id as departmentId,
-        d.`code` as departmentCode,
-        o.id as organizationId,
-        o.`code` as organizationCode
+            m.id,
+            m.`name`,
+            m.`contact`,
+            mp.id AS memberPositionId,
+            p.id AS positionId,
+            p.`code` AS positionCode,
+            d.id AS departmentId,
+            d.`code` AS departmentCode,
+            o.id AS organizationId,
+            o.`code` AS organizationCode
         FROM
-        t_organization_member m,
-        t_organization_member_position mp,
-        t_organization_position p,
-        t_organization_department d,
-        t_organization o,
-        t_organization_project op
+            t_organization_member m,
+            t_organization_member_position mp,
+            t_organization_position p,
+            t_organization_department d,
+            t_organization o
         WHERE
-        m.user_id = #{userId}
-        and m.id = mp.member_id
-        and mp.position_id = p.id
-        and mp.department_id = d.id
-        and d.organization_id = o.id
-        AND op.organization_id = o.id
-		AND op.project_id = #{projectId}
-        and m.rec_status = 0
-        and mp.rec_status = 0
-        and p.rec_status = 0
-        and d.rec_status = 0
-        and o.rec_status = 0
+            m.user_id = #{userId}
+        AND m.id = mp.member_id
+        AND mp.position_id = p.id
+        AND mp.department_id = d.id
+        AND d.organization_id = o.id
+        AND o.id = #{projectId}
+        AND m.rec_status = 0
+        AND mp.rec_status = 0
+        AND p.rec_status = 0
+        AND d.rec_status = 0
+        AND o.rec_status = 0
     </select>
     <select id="getHospital" resultType="com.ccsens.carbasics.bean.vo.OrganizationMemberVo$Organization">
         SELECT