Merge branch 'master' into hnsdlyy

ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/aspectj/DataScopeAspect.java

@@ -109,7 +109,7 @@ public class DataScopeAspect {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
             } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        " OR {}.dept_id IN ( SELECT dept_id FROM ums_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
             } else if (DATA_SCOPE_SELF.equals(dataScope)) {
                 if (StringUtils.isNotBlank(userAlias)) {

ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml

@@ -114,6 +114,8 @@
         LEFT JOIN ems_evaluation ee ON pp.id = ee.patient_id and ee.del_flag = 0
         LEFT JOIN ums_user uu ON ee.tester_id = uu.user_id
         LEFT JOIN ums_dept ud ON pp.hospital_id = ud.dept_id
+        left join pms_patient_body pb on pp.id = pb.patient_id
+        LEFT JOIN ums_user uu1 ON pp.create_by = uu1.user_name
         WHERE
         pp.del_flag = 0
         <if test="param.searchValue != null and param.searchValue != ''">
@@ -171,10 +173,18 @@
         </if>
         <if test="userId != null">
             <!-- 权限 总测评师和测评师都是本部门及以下 -->
-            and uu.dept_id IN (
+            and (
-            SELECT d.dept_id FROM ums_user u LEFT JOIN ums_dept d on (d.dept_id = u.dept_id or
+                uu.dept_id IN (
-            FIND_IN_SET(u.dept_id,ancestors))
+                    SELECT d.dept_id FROM ums_user u LEFT JOIN ums_dept d on (d.dept_id = u.dept_id or
-            WHERE user_id = #{userId}
+                    FIND_IN_SET(u.dept_id,ancestors))
+                    WHERE user_id = #{userId}
+                 )
+                or
+                 uu1.dept_id IN (
+                    SELECT d.dept_id FROM ums_user u LEFT JOIN ums_dept d on (d.dept_id = u.dept_id or
+                    FIND_IN_SET(u.dept_id,ancestors))
+                    WHERE user_id = #{userId}
+                 )
             )
         </if>
 <!--        <choose>-->
@@ -307,7 +317,7 @@
         from
         pms_patient_body b
         left join pms_patient p on b.patient_id = p.id
-        left join ums_user uu on p.create_by = uu.user_name
+        left join ums_user uu on b.create_by = uu.user_name
         <where>
             b.del_flag = 0 and p.del_flag = 0
             <if test="param.visitType != null">
@@ -335,5 +345,8 @@
             </if>
         </where>
         order by b.id desc
+
+
+
     </select>
 </mapper>