云照护修改

common/common-entity/sql/2023.sql

@@ -147,6 +147,12 @@ ADD COLUMN `serve_lon` varchar(50) NULL COMMENT '服务地址经度',
ADD COLUMN `remark` varchar(2000) NULL COMMENT '备注说明',
ADD COLUMN `type` varchar(1) NULL COMMENT '类型（1本人发起 2家人代 3医生代）';
ALTER TABLE `base`.`base_service_package_record`
ADD COLUMN `package_item_id` varchar(50) NULL COMMENT '服务项id ',
ADD COLUMN `type` varchar(1) NULL COMMENT '类型 1预约后分配 2直接分配服务者 ',
ADD COLUMN `doctor` varchar(50) NULL COMMENT '服务者',
ADD COLUMN `doctor_name` varchar(50) NULL COMMENT '服务者姓名';
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('sign_status1', NULL, 'sign_status', '0', '待审核', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('sign_status0', NULL, 'sign_status', '1', '已签约', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('sign_status2', NULL, 'sign_status', '2', '待支付', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约状态');

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorRoleDO.java

@@ -26,7 +26,7 @@ public class BaseDoctorRoleDO extends IntegerIdentityEntity {
    /**
	 * 医生角色id
	 */
	private String roleCode;
	private String roleCode;//dispatcher 调度员
    /**
     * 是否生效 1生效 0失效(默认1)

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageDO.java

@@ -44,8 +44,8 @@ public class ServicePackageDO extends UuidIdentityEntityWithOperator implements
    private String checkDoctorName;//服务包审核人name
    private String leasedCode;//租户code
    private String leasedName;//租户name
    private String serverTimeType;//服务时间类型
    private String serverTime;//服务期限
    private String serverTimeType;//服务时间类型 1固定 2自定义 3无期限
    private String serverTime;//服务期限 *号间隔
    private String serverTimeDescription;//服务时间说明
    private String isCheck;//是否开启审核 1是0否
    private String feeAfter;//'服务后收费标识（1是0否）

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageItemDO.java

@@ -43,44 +43,10 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    private String subItemId;
    private String serverCount;//服务次数
    private String assignStatus;//是否分配服务者【1是0否】
    private String serverUserId;//服务者id
    private String serverUserName;//服务者name
    private String serverUserType;//服务者类型
    public String getAssignStatus() {
        return assignStatus;
    }
    public void setAssignStatus(String assignStatus) {
        this.assignStatus = assignStatus;
    }
    public String getServerUserId() {
        return serverUserId;
    }
    public void setServerUserId(String serverUserId) {
        this.serverUserId = serverUserId;
    }
    public String getServerUserName() {
        return serverUserName;
    }
    public void setServerUserName(String serverUserName) {
        this.serverUserName = serverUserName;
    }
    public String getServerUserType() {
        return serverUserType;
    }
    public void setServerUserType(String serverUserType) {
        this.serverUserType = serverUserType;
    }
    private String recordId;//分配记录id
    private String serviceType;//类型 1预约后分配 2直接分配服务者 3服务团队
    private String doctor;//服务者
    private String doctorName;//服务者姓名
    @Column(name = "service_package_item_id")
    public String getServicePackageItemId() {
@@ -270,4 +236,37 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    public void setServerCount(String serverCount) {
        this.serverCount = serverCount;
    }
    @Transient
    public String getRecordId() {
        return recordId;
    }
    public void setRecordId(String recordId) {
        this.recordId = recordId;
    }
    @Transient
    public String getServiceType() {
        return serviceType;
    }
    public void setServiceType(String serviceType) {
        this.serviceType = serviceType;
    }
    @Transient
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Transient
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageRecordDO.java

@@ -16,11 +16,11 @@ import java.io.Serializable;
public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime implements Serializable {
    /**
     * '签约id'
     * 签约id
     */
    private String signId;
    /**
     * '服务包id'
     * 服务包id
     */
    private String servicePackageId;
    /**
@@ -29,6 +29,13 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
    private String patient;
    private String teamCode;//服务团队id
    //新增字段
    private String packageItemId;//服务项id
    private String type;//类型 1预约后分配 2直接分配服务者 3服务团队
    private String doctor;//服务者
    private String doctorName;//服务者姓名
    @Column(name = "sign_id")
    public String getSignId() {
        return signId;
    }
@@ -37,6 +44,7 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
        this.signId = signId;
    }
    @Column(name = "service_package_id")
    public String getServicePackageId() {
        return servicePackageId;
    }
@@ -45,6 +53,7 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
        this.servicePackageId = servicePackageId;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -61,4 +70,37 @@ public class ServicePackageRecordDO extends UuidIdentityEntityWithCreateTime imp
    public void setTeamCode(String teamCode) {
        this.teamCode = teamCode;
    }
    @Column(name = "package_item_id")
    public String getPackageItemId() {
        return packageItemId;
    }
    public void setPackageItemId(String packageItemId) {
        this.packageItemId = packageItemId;
    }
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/SystemMessageDO.java

@@ -30,6 +30,7 @@ public class SystemMessageDO extends UuidIdentityEntity {
     * 老人健康咨询 852
     *
     * 体征设备测量系统消息 42  老人pad语音
     * 签约分配消息 980
     * 智能手表佩戴提示 991
     * 智能手表电量提示 992
     * 报警器电量提示 993