suqinyi 1 anno fa
parent
commit
6d39ff7ec1

+ 6 - 2
common/common-entity/src/db/2023.sql

@ -224,8 +224,12 @@ END;
=========================== 康复模块[开始]=================================
=========================== 康复模块[开始]=================================
ALTER TABLE `base`.`wlyy_rehabilitation_patient_info`
ALTER TABLE `base`.`wlyy_rehabilitation_patient_info`
ADD COLUMN `type` tinyint(255) NULL COMMENT '1患者家签列表 2康复下转列表' AFTER `dept_name`,
ADD COLUMN `sign_status` tinyint(255) ZEROFILL NULL COMMENT '签约状态(1已家签 0 待家签)' AFTER `type`;
ADD COLUMN `type` tinyint(10) NULL COMMENT '1患者家签列表 2康复下转列表' AFTER `dept_name`,
ADD COLUMN `sign_status` tinyint(10) ZEROFILL NULL COMMENT '签约状态(1已家签 0 待家签)' AFTER `type`,
ADD COLUMN `patient` varchar(50) NULL COMMENT '居民code' AFTER `code`,
ADD COLUMN `create_user` varchar(100) NULL COMMENT '创建人' AFTER `sign_status`,
ADD COLUMN `create_user_name` varchar(50) NULL COMMENT '创建人姓名' AFTER `create_user`;
=========================== 康复模块[结束]=================================
=========================== 康复模块[结束]=================================

+ 47 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationPatientInfoDO.java

@ -54,6 +54,53 @@ public class RehabilitationPatientInfoDO extends IdEntity {
    private Integer archiveStatus;//档案状态
    private Integer archiveStatus;//档案状态
    private String archiveStatusName;//档案状态
    private String archiveStatusName;//档案状态
    private String patient;    //居民code
    private Integer type;//1患者家签列表 2康复下转列表
    private Integer signStatus;//签约状态(1已家签 0 待家签)
    private String createUser;//创建code
    private String createUserName;//创建者
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getSignStatus() {
        return signStatus;
    }
    public void setSignStatus(Integer signStatus) {
        this.signStatus = signStatus;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public String getCode() {
    public String getCode() {
        return code;
        return code;
    }
    }

+ 46 - 0
svr/svr-manage/src/main/java/com/yihu/customer/entity/RehabilitationPatientInfoDO.java

@ -36,6 +36,52 @@ public class RehabilitationPatientInfoDO extends IdEntity {
    private Date createTime;//请求时间
    private Date createTime;//请求时间
    private Integer status;//是否分配 0未分配 1已分配
    private Integer status;//是否分配 0未分配 1已分配
    private String patient;    //居民code
    private Integer type;//1患者家签列表 2康复下转列表
    private Integer signStatus;//签约状态(1已家签 0 待家签)
    private String createUser;//创建code
    private String createUserName;//创建者
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public Integer getSignStatus() {
        return signStatus;
    }
    public void setSignStatus(Integer signStatus) {
        this.signStatus = signStatus;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    public String getCode() {
    public String getCode() {
        return code;
        return code;
    }
    }

+ 8 - 6
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@ -34,12 +34,14 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
    @RequestMapping(value = "getRehabilitationPatientList", method = RequestMethod.GET)
    @RequestMapping(value = "getRehabilitationPatientList", method = RequestMethod.GET)
    @ApiOperation("获取康复下转居民列表")
    @ApiOperation("获取康复下转居民列表")
    public String getRehabilitationPatientList(@ApiParam(name = "idcard", value = "身份证", required = false)
                                               @RequestParam(value = "idcard", required = false) String idcard,
                                               @ApiParam(name = "isTurnDown", value = "是否已下转 -2:未下转未家签,-1未下转 0未下转全部,;1已下转(未接收);2已下转(已接收);3已下转全部;03已下转全部+未下转全部", defaultValue = "0", required = false)
                                               @RequestParam(value = "isTurnDown", required = false, defaultValue = "3") String isTurnDown,
                                               @ApiParam(name = "page", value = "起始页", required = false) @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
                                               @ApiParam(name = "pagesize", value = "每页显示数据条数", required = false) @RequestParam(value = "pagesize", required = false, defaultValue = "10") Integer pagesize
    public String getRehabilitationPatientList(
            @ApiParam(name = "idcard", value = "身份证", required = false)
            @RequestParam(value = "idcard", required = false) String idcard,
            @ApiParam(name = "isTurnDown", value = "是否已下转 -2:未下转未家签,-1未下转 0未下转全部,;1已下转(未接收);2已下转(已接收);3已下转全部;03已下转全部+未下转全部", defaultValue = "0", required = false) @RequestParam(value = "isTurnDown", required = false, defaultValue = "3") String isTurnDown,
            @ApiParam(name = "page", value = "起始页", required = false)
            @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
            @ApiParam(name = "pagesize", value = "每页显示数据条数", required = false)
            @RequestParam(value = "pagesize", required = false, defaultValue = "10") Integer pagesize
    ) {
    ) {
        try {
        try {
            if (page == null) {
            if (page == null) {

File diff suppressed because it is too large
+ 236 - 213
svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java