云照护修改

common/common-entity/sql/2023.sql

@@ -105,3 +105,53 @@ ALTER TABLE `base`.`base_service_package_item`
CREATE TABLE `base_followup_template` (
    `id` varchar(100) NOT NULL,
    `template_name` varchar(255) DEFAULT NULL,
    `followup_statrt_time_type` varchar(100) DEFAULT NULL,
    `followup_count` varchar(10) DEFAULT NULL,
    `description` varchar(255) DEFAULT NULL,
    `template_detail_json` text,
    `status` varchar(10) DEFAULT NULL,
    `leased_code` varchar(100) DEFAULT NULL,
    `leased_name` varchar(100) DEFAULT NULL,
    `org_code` varchar(100) DEFAULT NULL,
    `org_name` varchar(255) DEFAULT NULL,
    `create_time` datetime DEFAULT NULL,
    `update_time` datetime DEFAULT NULL,
    `create_user` varchar(100) DEFAULT NULL,
    `create_user_name` varchar(100) DEFAULT NULL,
    `update_user` varchar(100) DEFAULT NULL,
    `update_user_name` varchar(100) DEFAULT NULL,
    PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
ALTER TABLE `base`.`base_service_package_sign_record`
ADD COLUMN `check_doctor` varchar(1) NULL COMMENT '审核人code ',
ADD COLUMN `check_doctor_name` varchar(1) NULL COMMENT '审核人姓名 ',
ADD COLUMN `check_time` varchar(50) NULL COMMENT '审核时间 ',
ADD COLUMN `refuse_type` varchar(1) NULL COMMENT '拒绝原因 ',
ADD COLUMN `refuse_reason` varchar(500) NULL COMMENT '拒绝说明 ',
ADD COLUMN `pay_time` varchar(50) NULL COMMENT '剩余付款时间（审核后3天 无需审核的10分钟） ',
ADD COLUMN `update_time` datetime NULL COMMENT '更新时间',
ADD COLUMN `service_package_id` varchar(50) NULL COMMENT '服务包id',
ADD COLUMN `proxy_patient` varchar(50) NULL COMMENT '代理人code',
ADD COLUMN `proxy_patient_name` varchar(50) NULL COMMENT '代理人',
ADD COLUMN `mobile` varchar(50) NULL COMMENT '联系方式',
ADD COLUMN `service_address` varchar(200) NULL COMMENT '服务地址',
ADD COLUMN `serve_lat` varchar(50) NULL COMMENT '服务地址纬度',
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医生代）';
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, '签约状态');
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_status3', NULL, 'sign_status', '3', '已拒绝', 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_status4', 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_status5', NULL, 'sign_status', '-2', '已失效', 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_status6', NULL, 'sign_status', '-3', '已撤销', 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_refuse_type1', NULL, 'sign_refuse_type', '0', '其他', NULL, '4', 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_refuse_type2', NULL, 'sign_refuse_type', '1', '基本资料错误', NULL, '1', 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_refuse_type3', NULL, 'sign_refuse_type', '2', '超出服务范围', NULL, '2', 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_refuse_type4', NULL, 'sign_refuse_type', '3', '签约用户已满', NULL, '3', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '签约拒绝原因');

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

@@ -40,13 +40,15 @@ public class ServicePackageDO extends UuidIdentityEntityWithOperator implements
    /**
     * 新增字段
     */
    private String  checkDoctor;//服务包审核人code
    private String  checkDoctorName;//服务包审核人name
    private String  leasedCode;//租户code
    private String  leasedName;//租户name
    private String  serverTimeType;//服务时间类型
    private String  serverTime;//服务期限
    private String  serverTimeDescription;//服务时间说明
    private String checkDoctor;//服务包审核人code
    private String checkDoctorName;//服务包审核人name
    private String leasedCode;//租户code
    private String leasedName;//租户name
    private String serverTimeType;//服务时间类型
    private String serverTime;//服务期限
    private String serverTimeDescription;//服务时间说明
    private String isCheck;//是否开启审核 1是0否
    private String feeAfter;//'服务后收费标识（1是0否）
    private String pageItemName;//服务包服务项名称
@@ -262,4 +264,22 @@ public class ServicePackageDO extends UuidIdentityEntityWithOperator implements
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "is_check")
    public String getIsCheck() {
        return isCheck;
    }
    public void setIsCheck(String isCheck) {
        this.isCheck = isCheck;
    }
    @Column(name = "fee_after")
    public String getFeeAfter() {
        return feeAfter;
    }
    public void setFeeAfter(String feeAfter) {
        this.feeAfter = feeAfter;
    }
}

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

@@ -26,7 +26,26 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntityWithCreateTime
    private String signDoctorName;//签约医生名称
    private Date startTime;//服务开始时间
    private Date endTime;//服务结束时间
    private Integer status;//状态 0新增，1生效，-1已过期
    //状态新- 0待审核 1已签约 2待支付 3已拒绝 -1已过期 -2已失效 -3已撤销
    private Integer status;//状态旧 0新增，1生效，-1已过期
    private String servicePackageId;//服务包id
    private String proxyPatient;//代理人code
    private String proxyPatientName;//代理人/申请人
    private String mobile;//联系方式
    private String serviceAddress;//服务地址
    private String serveLat;//服务地址纬度
    private String serveLon;//服务地址经度
    private String remark;//备注说明
    private String refuseType;//拒绝原因 1基本资料错误 2超出服务范围  3签约用户已满   0其他  字典（sign_refuse_type）
    private String refuseReason;//拒绝说明
    private String type;//类型（1本人发起 2家人代 3医生代）
    private String payTime;//剩余付款时间（审核后3天 无需审核的10分钟） 时间单位分钟
    private Date updateTime;//更新时间
    private String checkDoctor;//审核人code
    private String checkDoctorName;//审核人姓名
    private String checkTime;//审核时间
    /**
     * 签约的服务包
@@ -138,4 +157,148 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntityWithCreateTime
        this.packageList = packageList;
    }
    @Column(name = "proxy_patient")
    public String getProxyPatient() {
        return proxyPatient;
    }
    public void setProxyPatient(String proxyPatient) {
        this.proxyPatient = proxyPatient;
    }
    @Column(name = "proxy_patient_name")
    public String getProxyPatientName() {
        return proxyPatientName;
    }
    public void setProxyPatientName(String proxyPatientName) {
        this.proxyPatientName = proxyPatientName;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "service_address")
    public String getServiceAddress() {
        return serviceAddress;
    }
    public void setServiceAddress(String serviceAddress) {
        this.serviceAddress = serviceAddress;
    }
    @Column(name = "serve_lat")
    public String getServeLat() {
        return serveLat;
    }
    public void setServeLat(String serveLat) {
        this.serveLat = serveLat;
    }
    @Column(name = "serve_lon")
    public String getServeLon() {
        return serveLon;
    }
    public void setServeLon(String serveLon) {
        this.serveLon = serveLon;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "service_package_id")
    public String getServicePackageId() {
        return servicePackageId;
    }
    public void setServicePackageId(String servicePackageId) {
        this.servicePackageId = servicePackageId;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", nullable = false,updatable = false)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "pay_time")
    public String getPayTime() {
        return payTime;
    }
    public void setPayTime(String payTime) {
        this.payTime = payTime;
    }
    @Column(name = "refuse_type")
    public String getRefuseType() {
        return refuseType;
    }
    public void setRefuseType(String refuseType) {
        this.refuseType = refuseType;
    }
    @Column(name = "refuse_reason")
    public String getRefuseReason() {
        return refuseReason;
    }
    public void setRefuseReason(String refuseReason) {
        this.refuseReason = refuseReason;
    }
    @Column(name = "check_doctor")
    public String getCheckDoctor() {
        return checkDoctor;
    }
    public void setCheckDoctor(String checkDoctor) {
        this.checkDoctor = checkDoctor;
    }
    @Column(name = "check_doctor_name")
    public String getCheckDoctorName() {
        return checkDoctorName;
    }
    public void setCheckDoctorName(String checkDoctorName) {
        this.checkDoctorName = checkDoctorName;
    }
    @Column(name = "check_time")
    public String getCheckTime() {
        return checkTime;
    }
    public void setCheckTime(String checkTime) {
        this.checkTime = checkTime;
    }
}