Merge remote-tracking branch 'origin/dev1.0' into dev1.0

admin-ui/src/views/work/check/index.vue

@@ -153,16 +153,22 @@ export default {
         url: '/system/user/deptTree',
       }).then((response) => {
         this.deptOptions = response.data
+        this.queryParams.deptId = response.data[0].id;
+        this.getList();
       })
     },
     handleNodeClick(data) {
-      this.queryParams.departmentName = data.label
+      if(this.queryParams.deptId === data.id){
+        return;
+      }
+      this.queryParams.deptId = data.id
       this.getList()
     },
     selects(rows) {
       this.ids = rows.map((item) => item.id)
     },
     op(tag, row) {
+      console.log(row.patId)
       this.iframe({
         obj: window,
         param: { id: row.patId },

admin-ui/src/views/work/check/window.vue

@@ -51,19 +51,31 @@
         <div id="patient-check-projects-table">
           <el-table width="100%" stripe :data="current.obxList">
             <el-table-column
+              label="医技观察项目"
+              align="center"
+              prop="mecTechObsProject"></el-table-column>
+            <el-table-column
               label="医技项目名称"
               align="center"
               prop="mecTechObsName"></el-table-column>
             <el-table-column
-              label="项目信息结果"
+              label="观察值"
               align="center"
-              prop="result"></el-table-column>
+              prop="obsProjectDetail"></el-table-column>
+            <el-table-column
+              label="项目结果信息"
+              align="center"
+              prop="projectInfo"></el-table-column>
             <el-table-column
-              label="项目单位"
+              label="单位代码"
               align="center"
               prop="unitCode"></el-table-column>
             <el-table-column
-              label="结果参考值"
+              label="单位名称"
+              align="center"
+              prop="result"></el-table-column>
+            <el-table-column
+              label="参值范围"
               align="center"
               prop="result"></el-table-column>
             <el-table-column

admin-ui/src/views/work/visit/index.vue

@@ -109,6 +109,9 @@ export default {
       });
     },
     handleNodeClick(data){
+      if(this.queryParams.deptId === data.id){
+        return;
+      }
       this.queryParams.deptId = data.id;
       this.getList();
     },

ruoyi-admin/src/main/resources/mapper/work/KnowledgeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.web.work.mapper.KnowledgeMapper">
-    
+
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Knowledge">
         SELECT
         k.id,
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null  and type != ''"> and k.type = #{type}</if>
             <if test="title != null  and title != ''"> and k.title like concat('%', #{title}, '%')</if>
             <if test="dateBegin != null  and dateBegin != ''"> AND k.create_time BETWEEN #{dateBegin} AND #{dateEnd} + INTERVAL 1 DAY</if>
-            <if test="deptId != null and deptId != 0">AND (k.dept_id = #{deptId} OR k.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))</if>
+            <if test="deptId != null and deptId != 0">AND (k.dept_id = #{deptId} OR k.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, parent_id) ))</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
     </select>
@@ -45,4 +45,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT id, title,type,create_time FROM tb_knowledge WHERE state=0 ORDER BY id DESC LIMIT 5
     </select>
 
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/work/VisitMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reasonArea != null  and reasonArea != ''"> and reasonArea = #{reasonArea}</if>
             <if test="wardCode != null  and wardCode != ''"> and ward_code = #{wardCode}</if>
             <if test="wardName != null  and wardName != ''"> and ward_name = #{wardName}</if>
-            <if test="deptId != null and deptId != 0">AND (v.dept_id = #{deptId} OR v.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))</if>
+            <if test="deptId != null and deptId != 0">AND (v.dept_id = #{deptId} OR v.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, parent_id) ))</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
@@ -48,8 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             v.card_id
         FROM
             tb_visit v
-        JOIN tb_patient ON v.pat_id = tb_patient.id
-        JOIN sys_dept d ON d.dept_id = v.dept_id
+        LEFT JOIN tb_patient ON v.pat_id = tb_patient.id
+        LEFT JOIN sys_dept d ON d.dept_id = v.dept_id
         <where>
             v.hospital_status = '3'
             <if test="patientName!='' and patientName!=null">
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="physician!='' and physician!= null">
                 AND v.physician like concat('%', #{physician}, '%')
             </if>
-            <if test="deptId !=null and deptId != 0">AND (v.dept_id = #{deptId} OR v.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))</if>
+            <if test="deptId !=null and deptId != 0">AND (v.dept_id = #{deptId} OR v.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, parent_id) ))</if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}