修复黄主任提出bug

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -66,6 +66,13 @@ public class SysUserController extends BaseController {
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(SysUser user) {
+        List<SysUser> list = userService.selectUserList(user);
+        return AjaxResult.success(list);
+    }
+
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
@@ -121,11 +128,9 @@ public class SysUserController extends BaseController {
     public AjaxResult add(@Validated @RequestBody SysUser user) {
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
@@ -145,11 +150,9 @@ public class SysUserController extends BaseController {
         List<Long> roles = roleService.selectRoleListByUserId(user.getUserId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail())
-                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/IndexController.java

@@ -23,6 +23,7 @@ public class IndexController extends BaseController {
     public AjaxResult index() {
         AjaxResult result = new AjaxResult();
         result.put("count", userMapper.statistics(getLoginUser().getUser()));
+        result.put("followList", userMapper.followList(getLoginUser().getUser()));
         return AjaxResult.success(result);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NextOfKinController.java

@@ -24,6 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 亲属关系
+ *
  * @author lsw
  * @date 2024-07-19
  */
@@ -37,16 +38,15 @@ public class NextOfKinController extends BaseController {
     @ApiOperation(value = "获取亲属信息列表")
     @PreAuthorize("@ss.hasPermi('work:nk:list')")
     @GetMapping("/list")
-    public TableDataInfo list(NextOfKin nk){
-        startPage();
+    public AjaxResult list(NextOfKin nk) {
         List<NextOfKin> list = nkService.selectList(nk);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation(value = "根据id查询亲属信息")
     @PreAuthorize("@ss.hasPermi('work:nk:query')")
     @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id){
+    public AjaxResult detail(@PathVariable("id") Long id) {
         return AjaxResult.success(nkService.getById(id));
     }
 
@@ -54,7 +54,7 @@ public class NextOfKinController extends BaseController {
     @PreAuthorize("@ss.hasPermi('work:nk:add')")
     @Log(title = "亲属关系", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody NextOfKin nk){
+    public AjaxResult add(@RequestBody NextOfKin nk) {
         return toAjax(nkService.save(nk));
     }
 
@@ -62,7 +62,7 @@ public class NextOfKinController extends BaseController {
     @PreAuthorize("@ss.hasPermi('work:nk:edit')")
     @Log(title = "亲属关系", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody NextOfKin nk){
+    public AjaxResult edit(@RequestBody NextOfKin nk) {
         return toAjax(nkService.updateById(nk));
     }
 
@@ -70,7 +70,7 @@ public class NextOfKinController extends BaseController {
     @PreAuthorize("@ss.hasPermi('work:nk:remove')")
     @Log(title = "亲属关系", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids){
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(nkService.removeByIds(Arrays.asList(ids)));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/RequestController.java

@@ -33,10 +33,9 @@ public class RequestController extends BaseController {
     @ApiOperation(value = "根据患者ID获取此人的全部检查项目列表")
     @PreAuthorize("@ss.hasPermi('work:request:list')")
     @GetMapping("/patid/{patId}")
-    public TableDataInfo getAllRequestByPatId(@PathVariable("patId") Long patId){
-        startPage();
+    public AjaxResult getAllRequestByPatId(@PathVariable("patId") Long patId){
         List<Request> list = requestService.getAllRequestByPatId(patId);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/ResultController.java

@@ -34,10 +34,9 @@ public class ResultController extends BaseController {
     @ApiOperation(value = "根据患者ID获取此人的全部检查结果列表")
     @PreAuthorize("@ss.hasPermi('work:result:list')")
     @GetMapping("/patid/{patId}")
-    public TableDataInfo getAllResultByPatId(@PathVariable("patId") Long patId){
-        startPage();
+    public AjaxResult getAllResultByPatId(@PathVariable("patId") Long patId){
         List<Result> list = resultService.getAllResultByPatId(patId);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation(value = "获取检测项目列表")

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/VisitController.java

@@ -7,6 +7,7 @@ import java.util.List;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.ruoyi.web.work.domain.vo.VisitVoList;
 import com.ruoyi.web.work.service.IVisitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,7 +38,7 @@ public class VisitController extends BaseController {
     @GetMapping("/patientCard")
     public TableDataInfo getPatientCardByNameOrDepartment(PatientCardDto patientCardDto){
         startPage();
-        List<PatientCardDto> list=visitService.getPatientCardByNameOrDepartmentOrPhysician(patientCardDto);
+        List<VisitVoList> list=visitService.getPatientCardByNameOrDepartmentOrPhysician(patientCardDto);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/PatientCardDto.java

@@ -45,19 +45,14 @@ public class PatientCardDto extends BaseData {
     @ApiModelProperty(value = "患者姓名")
     private String name;
 
-    @TableField(exist = false)
-    @ApiModelProperty(value = "查询开始时间")
-    private Date startTime;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "查询结束时间")
-    private Date endTime;
-
-
     @ApiModelProperty(value = "病历号")
     @TableField(exist = false)
     private String blh;
 
+    @ApiModelProperty(value = "医生id")
+    @TableField(exist = false)
+    private Long userId;
+
     @ApiModelProperty(value = "是否关注小程序")
     @TableField(exist = false)
     private Integer isBindWx;

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/vo/VisitVoList.java

@@ -9,9 +9,12 @@ import java.util.Date;
 @Data
 public class VisitVoList {
 
-    @ApiModelProperty(value = "患者ID")
+    @ApiModelProperty(value = "患者住院ID")
     private Long id;
 
+    @ApiModelProperty(value = "患者ID")
+    private Long patId;
+
     @ApiModelProperty(value = "患者姓名")
     private String name;
 
@@ -24,11 +27,11 @@ public class VisitVoList {
     @ApiModelProperty(value = "主治医师")
     private String physician;
 
-    @ApiModelProperty(value = "出院方式 1-治愈 2-好转 3 -稳定 4-恶化 5-死亡 9 -其他")
-    private String dischargeMethod;
+    @ApiModelProperty(value = "科室")
+    private String department;
 
-    @ApiModelProperty(value = " 在院状态 0 入院登记 1 病区分床 2 病人出区 3 病人出院 4 取消结算 5 进入 ICU 6 进入产房 7 转科状态 8 数据转出 9 入院作")
-    private String hospitalStatus;
+    @ApiModelProperty(value = "病历号")
+    private String blh;
 
     @ApiModelProperty(value = "入院时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -38,4 +41,18 @@ public class VisitVoList {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date dischargeTime;
 
+    @ApiModelProperty(value = "复诊提醒")
+    private Integer up = 0;
+
+    @ApiModelProperty(value = "复诊提醒已读")
+    private Integer upRead = 0;
+
+    @ApiModelProperty(value = "随访记录")
+    private Integer record = 0;
+
+    @ApiModelProperty(value = "随访记录已填")
+    private Integer recordRead = 0;
+
+    @ApiModelProperty(value = "是否绑定小程序")
+    private Integer isBindWx;
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/UserMapper.java

@@ -21,9 +21,11 @@ public interface UserMapper extends BaseMapper<User> {
 
     Map<String, Object> statistics(SysUser sysUser);
 
+    List<Map<String, Object>> followList(SysUser sysUser);
+
     User selectUser(User user);
 
-    User selectUserByPatientId( @Param("patientId") Long patientId);
+    User selectUserByPatientId(@Param("patientId") Long patientId);
 
-    List<ExpertVoList>selectExpert();
+    List<ExpertVoList> selectExpert();
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/VisitMapper.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.work.domain.vo.VisitVoList;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -27,7 +28,7 @@ public interface VisitMapper extends BaseMapper<Visit>{
     //获取当前用户部门下的患者信息
     List<Visit> selectVisitsByIdAndUserName(@Param("deptId") Long deptId,@Param("userName") String userName);
 
-    List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto);
+    List<VisitVoList> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto);
 
     Long isRole(Long userId);
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/IVisitService.java

@@ -4,6 +4,7 @@ import java.util.List;
 import com.ruoyi.web.work.domain.Visit;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.web.work.domain.vo.VisitVoList;
 
 /**
  * @author lsw
@@ -12,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IVisitService extends IService<Visit>{
     List<Visit> selectList(Visit visit);
 
-    List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto);
+    List<VisitVoList> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto);
 
 
     //根据患者Id获取就诊记录列表

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/FollowRecordServiceImpl.java

@@ -104,7 +104,7 @@ public class FollowRecordServiceImpl extends ServiceImpl<FollowRecordMapper, Fol
             throw new ServiceException("新增回访记录失败");
         }
         followRecordList.forEach(e -> {
-            sendMessage(e);
+            //sendMessage(e);
         });
         return AjaxResult.success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/VisitServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.work.service.impl;
 
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -10,7 +11,9 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.web.work.domain.*;
 import com.ruoyi.web.work.domain.dto.PatientCardDto;
+import com.ruoyi.web.work.domain.vo.VisitVoList;
 import com.ruoyi.web.work.mapper.*;
+import com.ruoyi.web.work.service.IFollowRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.web.work.service.IVisitService;
@@ -28,6 +31,9 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
     @Autowired
     private SysUserMapper userMapper;
 
+    @Autowired
+    private IFollowRecordService followRecordService;
+
 
     @Override
     public List<Visit> selectList(Visit visit) {
@@ -35,34 +41,43 @@ public class VisitServiceImpl extends ServiceImpl<VisitMapper, Visit> implements
     }
 
     @Override
-    @DataScope(deptAlias = "v",userAlias = "u")
-    public List<PatientCardDto> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto) {
-        return visitMapper.getPatientCardByNameOrDepartmentOrPhysician(patientCardDto);
-
+    @DataScope(deptAlias = "v", userAlias = "u")
+    public List<VisitVoList> getPatientCardByNameOrDepartmentOrPhysician(PatientCardDto patientCardDto) {
+        List<VisitVoList> list = visitMapper.getPatientCardByNameOrDepartmentOrPhysician(patientCardDto);
+        list.forEach(e -> {
+            List<FollowRecord> records = followRecordService.selectList(new FollowRecord().setPatientId(e.getPatId()).setDelFlag(0));
+            if (!records.isEmpty()) {
+                e.setUp(records.stream().filter(record -> record.getType() == 0).collect(Collectors.toList()).size());
+                e.setUpRead(records.stream().filter(record -> record.getType() == 0 && record.getState() == 1).collect(Collectors.toList()).size());
+                e.setRecord(records.stream().filter(record -> record.getType() == 1).collect(Collectors.toList()).size());
+                e.setRecordRead(records.stream().filter(record -> record.getType() == 1 && record.getState() == 1).collect(Collectors.toList()).size());
+            }
+        });
+        return list;
     }
 
-
     @Override
-    public List<Visit> getVisitByPatId(String patId,String startTime,String endTime) {
-        return visitMapper.selectVisitsByPatId(patId,startTime,endTime);
+    public List<Visit> getVisitByPatId(String patId, String startTime, String endTime) {
+        return visitMapper.selectVisitsByPatId(patId, startTime, endTime);
     }
 
     /**
      * 根据deptId获取所有部门的患者
+     *
      * @param deptId
      * @return
      */
     @Override
-    public List<Visit> getPatientByDeptId(Long deptId,String userName) {
+    public List<Visit> getPatientByDeptId(Long deptId, String userName) {
         SysUser sysUser = userMapper.queryUserByUserName(userName);
-        if (sysUser != null){
+        if (sysUser != null) {
             String dirDocSign = sysUser.getDirDocSign();
-            if ("1".equals(dirDocSign)){
+            if ("1".equals(dirDocSign)) {
                 //获取所有部门下的所有患者
                 return visitMapper.selectVisitsByDeptId(deptId);
-            }else {
+            } else {
                 //获取当前用户部门下的患者信息
-                return visitMapper.selectVisitsByIdAndUserName(deptId,userName);
+                return visitMapper.selectVisitsByIdAndUserName(deptId, userName);
             }
         }
         throw new ServiceException("当前用户不存在");

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

@@ -7,6 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectList" resultType="com.ruoyi.web.work.domain.FollowRecord">
         SELECT
         k.id,
+        k.type,
+        k.patient_id,
         k.template_name,
         k.patient_name,
         k.state,
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN tb_patient p ON p.id = v.pat_id
         WHERE
             v.doctor_code =#{doctorCode}
+            AND v.hospital_status = '3'
         <if test="name != null  and name != ''"> AND p.name like concat('%', #{name}, '%')</if>
         ORDER BY v.id DESC
     </select>

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

@@ -30,10 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getAllRequestByPatId" resultType="com.ruoyi.web.work.domain.Request">
-        SELECT * from tb_obr_request
-        where tb_obr_request.orc_id in
-              (SELECT tb_orc_report.id from tb_orc_report where tb_orc_report.pat_id=#{patId})
-
+        SELECT obr.*
+        FROM tb_obr_request obr
+                 JOIN tb_orc_report orc ON obr.orc_id = orc.id
+        WHERE orc.pat_id = #{patId}
     </select>
 
     <!--小程序检测报告列表-->

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

@@ -31,11 +31,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getAllResultByPatId" resultType="com.ruoyi.web.work.domain.Result">
-        SELECT * FROM tb_obx_result
-        WHERE tb_obx_result.obr_id IN
-              (SELECT tb_obr_request.id FROM tb_obr_request
-               WHERE tb_obr_request.orc_id IN
-                     ( SELECT tb_orc_report.id FROM tb_orc_report WHERE tb_orc_report.pat_id =#{patId} ))
+        SELECT
+            obx.*
+        FROM
+            tb_obx_result obx
+                JOIN tb_obr_request obr ON obx.obr_id = obr.id
+                JOIN tb_orc_report orc ON obr.orc_id = orc.id
+        WHERE
+            orc.pat_id =#{patId}
     </select>
 
 

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

@@ -25,6 +25,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ( SELECT COUNT( id ) FROM tb_knowledge WHERE user_id =#{userId} ) AS knowledge
     </select>
 
+    <!--随访首页统计-->
+    <select id="followList" resultType="java.util.Map">
+        SELECT
+            type,
+            state,
+            COUNT(*) AS count
+        FROM
+            tb_follow_record
+        WHERE
+            user_id =#{userId}
+        GROUP BY
+            type,
+            state
+    </select>
+
     <select id="selectUser" resultType="com.ruoyi.web.work.domain.User">
         SELECT
         u.*,

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

@@ -39,28 +39,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getPatientCardByNameOrDepartmentOrPhysician" resultType="com.ruoyi.web.work.domain.dto.PatientCardDto">
+    <select id="getPatientCardByNameOrDepartmentOrPhysician" resultType="com.ruoyi.web.work.domain.vo.VisitVoList">
         SELECT
-            v.department,
-            v.physician,
-            tb_patient.`name`,
-            tb_patient.blh,
-            v.discharge_method,
-            v.discharge_time,
-            v.id as visit_id,
-            v.pat_id,
-            v.card_id,
-            (SELECT COUNT(u.id) FROM tb_bind_user u WHERE u.patient_id=tb_patient.id)AS isBindWx
+        p.name,
+        p.blh,
+        p.sex,
+        v.id,
+        v.pat_id,
+        v.department,
+        v.card_id,
+        v.physician,
+        v.discharge_time,
+        v.admission_time,
+        (SELECT COUNT(u.id) FROM tb_bind_user u WHERE u.patient_id=v.pat_id)AS isBindWx
         FROM
-            tb_visit v
-        JOIN tb_orc_report ON tb_orc_report.visit_id=v.id
-        LEFT JOIN tb_patient ON v.pat_id = tb_patient.id
-        LEFT JOIN sys_dept d ON d.dept_id = v.dept_id
-        LEFT JOIN sys_user u ON u.user_name=v.doctor_code
+        tb_visit v
+        LEFT JOIN tb_patient p ON p.id = v.pat_id
+        LEFT JOIN sys_user u ON u.user_name = v.doctor_code
         <where>
             v.hospital_status = '3'
             <if test="name!='' and name!=null">
-               AND tb_patient.`name` like concat('%', #{name}, '%')
+               AND p.name like concat('%', #{name}, '%')
             </if>
             <if test="department!='' and department!= null">
                 AND v.department =#{department}
@@ -68,12 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="physician!='' and physician!= null">
                 AND v.physician like concat('%', #{physician}, '%')
             </if>
+            <if test="userId !=null">
+                AND u.user_id=#{userId}
+            </if>
             <if test="deptId !=null and deptId != 0">
                 AND (v.dept_id = #{deptId} OR v.dept_id IN (SELECT s.dept_id FROM sys_dept s WHERE s.parent_id in (SELECT s.dept_id FROM sys_dept s WHERE find_in_set( #{deptId}, parent_id ))))
             </if>
-            <if test="startTime!=null and endTime!=null ">
-                AND v.discharge_time BETWEEN #{startTime} AND DATE_ADD(#{endTime},INTERVAL 1 day)
-            </if>
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}