评分列表页面显示列相关接口、获取患者列表接口相关功能提交

common/src/main/java/com/lantone/common/dto/analyze/BasDeptInfoDTO.java

@@ -0,0 +1,23 @@
+package com.lantone.common.dto.analyze;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/27 18:56
+ */
+@Getter
+@Setter
+public class BasDeptInfoDTO {
+    /**
+     * 科室编码（HIS导入）
+     */
+    private String deptId;
+
+    /**
+     * 科室名称
+     */
+    private String deptName;
+}

common/src/main/java/com/lantone/common/dto/analyze/BehospitalInfoDTO.java

@@ -0,0 +1,134 @@
+package com.lantone.common.dto.analyze;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class BehospitalInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 病区名称
+     */
+    private String wardName;
+
+    /**
+     * 住院科室名称
+     */
+    private String behDeptName;
+
+    /**
+     * 床位号
+     */
+    private String bedCode;
+
+    /**
+     * 入院时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date behospitalDate;
+
+    /**
+     * 出院时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date leaveHospitalDate;
+
+    /**
+     * 疾病名称
+     */
+    private String diagnose;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
+    /**
+     * 年龄
+     */
+    private String age;
+
+    /**
+     * 病历等级
+     */
+    private String level;
+
+    /**
+     * 最后得分
+     */
+    private Double scoreRes;
+
+    /**
+     * 病案首页得分
+     */
+    private Double scoreBn;
+
+    /**
+     * 评分类型(1：机器，2：人工)
+     */
+    private String gradeType;
+
+    /**
+     * 评分时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date gradeTime;
+
+    private String directorDoctorName ;
+
+    private String behDoctorName;
+
+    /**
+     * 归档时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date placefileDate;
+
+    private Integer checkStatus;
+    private Integer mrStatus;
+    private String chName;
+    private String mrName;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date chTime;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date mrTime;
+}

common/src/main/java/com/lantone/common/dto/analyze/SysUserPagesetDTO.java

@@ -0,0 +1,33 @@
+package com.lantone.common.dto.analyze;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:26
+ */
+@Getter
+@Setter
+public class SysUserPagesetDTO {
+    /**
+     * 列名
+     */
+    private String name;
+
+    /**
+     * 列名值
+     */
+    private String val;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+}

common/src/main/java/com/lantone/common/vo/analyze/BasDeptInfoVO.java

@@ -0,0 +1,24 @@
+package com.lantone.common.vo.analyze;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/4/29 11:28
+ */
+@Getter
+@Setter
+public class BasDeptInfoVO {
+    /**
+     * 搜索参数
+     */
+    private String inputStr = "";
+
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+}

common/src/main/java/com/lantone/common/vo/analyze/BehospitalPageVO.java

@@ -0,0 +1,112 @@
+package com.lantone.common.vo.analyze;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 住院病历信息
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2020-04-13
+ */
+@Data
+public class BehospitalPageVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 医院ID
+     */
+    @ApiModelProperty(hidden = true)
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    private String behospitalCode;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 档案号
+     */
+    private String fileCode;
+
+    /**
+     * 入院时间开始时间
+     */
+    private Date behosDateStart;
+
+    /**
+     * 入院时间结束时间
+     */
+    private Date behosDateEnd;
+
+    /**
+     * 出院时间开始时间
+     */
+    private Date leaveHosDateStart;
+
+    /**
+     * 出院时间结束时间
+     */
+    private Date leaveHosDateEnd;
+
+    /**
+     * 等级
+     */
+    private String level;
+
+    /**
+     * 住院科室名称
+     */
+    private String deptName;
+
+    /**
+     * 主诊断
+     */
+    private String diagnose;
+
+    /**
+     * 医生姓名
+     */
+    private String doctorName;
+
+    @ApiModelProperty(hidden = true)
+    private Long userId;
+
+    /**
+     * 医生工号
+     */
+    private String doctorCode;
+
+    /**
+     * 统计维度 1-本月，2-本年
+     */
+    private Integer statisticsType;
+
+    /**
+     * 是否归档（0：未归档，1：已归档）
+     */
+//    @ApiModelProperty(hidden = true)
+    private String isPlacefile = "1";
+
+    private Integer checkStatus;
+    private Integer mrStatus;
+    private String chName;
+    private String mrName;
+    private Date chTimeStart;
+    private Date chTimeEnd;
+    private Date mrTimeStart;
+    private Date mrTimeEnd;
+
+}

common/src/main/java/com/lantone/common/vo/analyze/SysUserPagesetQueryVO.java

@@ -0,0 +1,22 @@
+package com.lantone.common.vo.analyze;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:30
+ */
+@Getter
+@Setter
+public class SysUserPagesetQueryVO {
+
+    /**
+     * 页面分组（值自定义）
+     */
+    @NotNull(message = "请输入页面分组")
+    private Long pageType;
+}

common/src/main/java/com/lantone/common/vo/analyze/SysUserPagesetSaveVO.java

@@ -0,0 +1,24 @@
+package com.lantone.common.vo.analyze;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:30
+ */
+@Getter
+@Setter
+public class SysUserPagesetSaveVO {
+    /**
+     * 页面分组（值自定义）
+     */
+    @NotNull(message = "请输入页面分组")
+    private Long pageType;
+
+    private List<SysUserPagesetVO> sysUserPagesetVOList;
+}

common/src/main/java/com/lantone/common/vo/analyze/SysUserPagesetVO.java

@@ -0,0 +1,40 @@
+package com.lantone.common.vo.analyze;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/6/12 10:26
+ */
+@Getter
+@Setter
+public class SysUserPagesetVO {
+    /**
+     * 列名
+     */
+    @NotBlank(message = "请输入列名")
+    private String name;
+
+    /**
+     * 列名值
+     */
+    @NotBlank(message = "请输入列名值")
+    private String val;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    @NotNull(message = "请输入是否启用装填")
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    @NotNull(message = "请输入排序号")
+    private Integer orderNo;
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/analyze/UserPageset.java

@@ -0,0 +1,103 @@
+package com.lantone.dblayermbg.entity.analyze;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户页面设定表 实体类
+ * </p>
+ */
+@Data
+@TableName("sys_user_pageset")
+public class UserPageset implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 系统用户表.用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 页面分组（值自定义）
+     */
+    @TableField("page_type")
+    private Long pageType;
+
+    /**
+     * 列名
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 列名值
+     */
+    @TableField("val")
+    private String val;
+
+    /**
+     * 是否启用(0:停用，1：启用)
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 排序号
+     */
+    @TableField("order_no")
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/analyze/UserPagesetFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.analyze;
+
+import com.lantone.dblayermbg.service.impl.analyze.UserPagesetServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：sys_user_pageset 业务类
+ * </p>
+ */
+@Component
+public class UserPagesetFacade extends UserPagesetServiceImpl {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapper/analyze/UserPagesetMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapper.analyze;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.analyze.UserPageset;
+
+/**
+ * <p>
+ * 表名：sys_user_pageset Mapper接口
+ * </p>
+ */
+public interface UserPagesetMapper extends BaseMapper<UserPageset> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/analyze/UserPagesetService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.analyze;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.analyze.UserPageset;
+
+/**
+ * <p>
+ * 用户页面设定表 Service类
+ * </p>
+ */
+public interface UserPagesetService extends IService<UserPageset> {
+
+}

dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/analyze/UserPagesetServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.analyze;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.analyze.UserPageset;
+import com.lantone.dblayermbg.mapper.analyze.UserPagesetMapper;
+import com.lantone.dblayermbg.service.analyze.UserPagesetService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户页面设定表 Service实现类
+ * </p>
+ */
+@Service
+public class UserPagesetServiceImpl extends ServiceImpl<UserPagesetMapper, UserPageset> implements UserPagesetService {
+
+}

dblayer-mbg/src/main/resources/mapper/analyze/UserPagesetMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.analyze.UserPagesetMapper">
+
+</mapper>

dblayer-mbg/src/main/resources/mapper/analyze/base/BaseUserPagesetMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapper.analyze.UserPagesetMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.analyze.UserPageset">
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="user_id" property="userId"/>
+        <result column="page_type" property="pageType"/>
+        <result column="name" property="name"/>
+        <result column="val" property="val"/>
+        <result column="status" property="status"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

security-center/src/main/java/com/lantone/security/facade/UserPagesetManagementFacade.java

@@ -0,0 +1,116 @@
+package com.lantone.security.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.common.dto.analyze.SysUserPagesetDTO;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.exception.Asserts;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.DateUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.SysUserUtils;
+import com.lantone.common.vo.analyze.SysUserPagesetQueryVO;
+import com.lantone.common.vo.analyze.SysUserPagesetSaveVO;
+import com.lantone.common.vo.analyze.SysUserPagesetVO;
+import com.lantone.dblayermbg.entity.analyze.UserPageset;
+import com.lantone.dblayermbg.service.impl.analyze.UserPagesetServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author songxl
+ * @Date 2021/9/28
+ */
+@Component
+public class UserPagesetManagementFacade {
+    @Autowired
+    @Qualifier("userPagesetServiceImpl")
+    private UserPagesetServiceImpl userPagesetService;
+
+    /**
+     * 获取用户对应页面设置
+     *
+     * @param sysUserPagesetQueryVO 获取用户对应页面设置参数
+     * @return 对应页面设置列表
+     */
+    public List<SysUserPagesetDTO> getPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        List<UserPageset> sysUserPagesetList = userPagesetService.list(
+                new QueryWrapper<UserPageset>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("user_id", SysUserUtils.getCurrentPrinciple())
+                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
+                        .orderByAsc("order_no")
+        );
+
+        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
+        if (ListUtil.isEmpty(sysUserPagesetList)) {
+            List<UserPageset> sysUserPagesetListDefault = userPagesetService.list(
+                    new QueryWrapper<UserPageset>()
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                            .eq("user_id", -1)
+                            .eq("page_type", sysUserPagesetQueryVO.getPageType())
+                            .orderByAsc("order_no")
+            );
+            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
+        } else {
+            sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetList, SysUserPagesetDTO.class);
+        }
+        return sysUserPagesetDTOList;
+    }
+
+    /**
+     * 保存用户对应页面设置
+     *
+     * @param sysUserPagesetSaveVO 保存用户对应页面设置参数
+     * @return 是否成功
+     */
+    public Boolean savePageSet(SysUserPagesetSaveVO sysUserPagesetSaveVO) {
+        if (ListUtil.isEmpty(sysUserPagesetSaveVO.getSysUserPagesetVOList())) {
+            Asserts.fail("列名输入列表不能为空");
+        }
+        userPagesetService.remove(
+                new QueryWrapper<UserPageset>()
+                        .eq("user_id", SysUserUtils.getCurrentPrinciple())
+                        .eq("page_type", sysUserPagesetSaveVO.getPageType())
+        );
+        List<UserPageset> saveList = new ArrayList<>();
+        Date now = DateUtil.now();
+        String userId = SysUserUtils.getCurrentPrinciple();
+        for (SysUserPagesetVO sysUserPagesetVO : sysUserPagesetSaveVO.getSysUserPagesetVOList()) {
+            UserPageset sysUserPageset = new UserPageset();
+            BeanUtil.copyProperties(sysUserPagesetVO, sysUserPageset);
+            sysUserPageset.setPageType(sysUserPagesetSaveVO.getPageType());
+            sysUserPageset.setUserId(Long.valueOf(userId));
+            sysUserPageset.setCreator(userId);
+            sysUserPageset.setModifier(userId);
+            sysUserPageset.setGmtCreate(now);
+            sysUserPageset.setGmtModified(now);
+            saveList.add(sysUserPageset);
+        }
+        return userPagesetService.saveBatch(saveList);
+    }
+
+    /**
+     * 获取默认列设置
+     *
+     * @param sysUserPagesetQueryVO
+     * @return
+     */
+    public List<SysUserPagesetDTO> getDefaultPageSet(SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        List<SysUserPagesetDTO> sysUserPagesetDTOList = new ArrayList<>();
+        List<UserPageset> sysUserPagesetListDefault = userPagesetService.list(
+                new QueryWrapper<UserPageset>()
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .eq("user_id", -1)
+                        .eq("page_type", sysUserPagesetQueryVO.getPageType())
+                        .orderByAsc("order_no")
+        );
+        sysUserPagesetDTOList = BeanUtil.listCopyTo(sysUserPagesetListDefault, SysUserPagesetDTO.class);
+        return sysUserPagesetDTOList;
+    }
+}

security-center/src/main/java/com/lantone/security/web/UserPagesetManagementController.java

@@ -0,0 +1,61 @@
+package com.lantone.security.web;
+
+
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.dto.analyze.SysUserPagesetDTO;
+import com.lantone.common.vo.analyze.SysUserPagesetQueryVO;
+import com.lantone.common.vo.analyze.SysUserPagesetSaveVO;
+import com.lantone.security.facade.UserPagesetManagementFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户页面设定表 前端控制器
+ * </p>
+ *
+ * @author gaodm
+ * @since 2020-06-12
+ */
+@RestController
+@Api(value = "用户页面设置API", tags = { "用户页面设置API" })
+@RequestMapping("/userPagesetManage")
+public class UserPagesetManagementController {
+
+    @Autowired
+    private UserPagesetManagementFacade userPagesetManagementFacade;
+
+    @ApiOperation(value = "获取用户对应页面设置[by:gaodm]",
+            notes = "pageType：页面分组，必填<br>")
+    @PostMapping("/getPageSet")
+    public CommonResult<List<SysUserPagesetDTO>> getPageSet(@RequestBody @Valid SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        return CommonResult.success(userPagesetManagementFacade.getPageSet(sysUserPagesetQueryVO));
+    }
+
+
+    @ApiOperation(value = "保存用户对应页面设置[by:gaodm]",
+            notes = "pageType：页面分组，必填<br>" +
+                    "name： 列名，必填<br>" +
+                    "val： 列名值，必填<br>" +
+                    "status：  是否启用(0:停用，1：启用)，必填<br>" +
+                    "orderNo： 排序号，必填<br>")
+    @PostMapping("/savePageSet")
+    public CommonResult<Boolean> savePageSet(@RequestBody @Valid SysUserPagesetSaveVO sysUserPagesetSaveVO) {
+        return CommonResult.success(userPagesetManagementFacade.savePageSet(sysUserPagesetSaveVO));
+    }
+
+    @ApiOperation(value = "获取默认列设置[by:zhaops]",
+            notes = "pageType：页面分组，必填<br>")
+    @PostMapping("/getDefaultPageSet")
+    public CommonResult<List<SysUserPagesetDTO>> getDefaultPageSet(@RequestBody @Valid SysUserPagesetQueryVO sysUserPagesetQueryVO) {
+        return CommonResult.success(userPagesetManagementFacade.getDefaultPageSet(sysUserPagesetQueryVO));
+    }
+}