云照护修改

common/common-entity/sql/2023.sql

@@ -30,4 +30,24 @@ ALTER TABLE wlyy_knowledge_article_dict ADD comment int(11) DEFAULT NULL COMMENT
ALTER TABLE wlyy_knowledge_article_dict ADD puplish_type int(11) DEFAULT NULL COMMENT '1、图文2、视频3、音频';
ALTER TABLE wlyy_knowledge_article_dict ADD recommend_doctor varchar(1000) DEFAULT NULL;
ALTER TABLE wlyy_knowledge_article_dict ADD puplish_type_name varchar(255) DEFAULT NULL COMMENT '发布类型名称：1、图文2、视频3、音频';
ALTER TABLE wlyy_knowledge_article_dict ADD recommend_doctor_name varchar(1000) CHARACTER SET utf8 DEFAULT NULL COMMENT '推荐医生名字';
ALTER TABLE wlyy_knowledge_article_dict ADD recommend_doctor_name varchar(1000) CHARACTER SET utf8 DEFAULT NULL COMMENT '推荐医生名字';
-- 2023-10-23 ysj
ALTER TABLE `base`.`base_service_package`
ADD COLUMN `leased_code` varchar(50) NULL COMMENT '租户code' AFTER `org_name`,
ADD COLUMN `leased_name` varchar(50) NULL COMMENT '租户name' AFTER `leased_code`,
ADD COLUMN `server_time_type` varchar(20) NULL COMMENT '服务时间类型' AFTER `leased_name`,
ADD COLUMN `server_time` varchar(50) NULL COMMENT '服务期限' AFTER `server_time_type`,
ADD COLUMN `server_time_description` varchar(255) NULL COMMENT '服务时间说明' AFTER `server_time`,
ADD COLUMN `create_user` varchar(50) NULL COMMENT '创建人code' AFTER `server_time_description`,
ADD COLUMN `create_user_name` varchar(20) NULL COMMENT '创建人name' AFTER `create_user`,
ADD COLUMN `update_user` varchar(50) NULL COMMENT '更新人code' AFTER `create_user_name`,
ADD COLUMN `update_user_name` varchar(50) NULL COMMENT '更新人name' AFTER `update_user`,
ADD COLUMN `update_time` datetime NULL COMMENT '更新时间' AFTER `create_time`;
ALTER TABLE `base`.`base_service_package`
ADD COLUMN `check_doctor` varchar(50) NULL COMMENT '服务包审核人code',
ADD COLUMN `check_doctor_name` varchar(50) NULL COMMENT '服务包审核人name',
ADD COLUMN `is_check` varchar(1) NULL COMMENT '是否开启审核 1是0否',
ADD COLUMN `fee_after` varchar(1) NULL COMMENT '服务后收费标识（1是0否）';

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

@@ -0,0 +1,174 @@
package com.yihu.jw.entity.base.servicePackage;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * @author suqinyi
 * @Date 2023/9/21
 */
@Entity
@Table(name = "base_service_item_config")
public class ServiceItemConfig extends UuidIdentityEntity implements java.io.Serializable {
    @Column(name = "package_id")
    private String packageId;//服务包id
    @Column(name = "server_item_id")
    private String serverItemId;//项目的id-对应item表主键
    @Column(name = "assess_type")
    private String assessType;//项目评价
    @Column(name = "booking_type")
    private String bookingType;//是否预约
    @Column(name = "late_serve_type")
    private String lateServeType;//是否运行逾期服务
    @Column(name = "plan_start_time_type")
    private String planStartTimeType;//计划开始时间类型
    @Column(name = "server_time_type")
    private String serverTimeType;//服务方法
    @Column(name = "server_count")
    private String serverCount;//服务次数
    @Column(name = "template_type")
    private String templateType;//模板的类型-目前是随访为1
    @Column(name = "template_code")
    private String templateCode;//对应模板的id
    @Column(name = "pricing_units_code")
    private String pricingUnitsCode;//计价单位
    @Column(name = "pricing_units_name")
    private String pricingUnitsName;//计价单位名称
    @Column(name = "frequency_code")
    private String frequencyCode;//频次
    private String name;//名称
    @Transient
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getFrequencyCode() {
        return frequencyCode;
    }
    public void setFrequencyCode(String frequencyCode) {
        this.frequencyCode = frequencyCode;
    }
    public String getPricingUnitsCode() {
        return pricingUnitsCode;
    }
    public void setPricingUnitsCode(String pricingUnitsCode) {
        this.pricingUnitsCode = pricingUnitsCode;
    }
    public String getPricingUnitsName() {
        return pricingUnitsName;
    }
    public void setPricingUnitsName(String pricingUnitsName) {
        this.pricingUnitsName = pricingUnitsName;
    }
    public String getPackageId() {
        return packageId;
    }
    public void setPackageId(String packageId) {
        this.packageId = packageId;
    }
    public String getServerItemId() {
        return serverItemId;
    }
    public void setServerItemId(String serverItemId) {
        this.serverItemId = serverItemId;
    }
    public String getAssessType() {
        return assessType;
    }
    public void setAssessType(String assessType) {
        this.assessType = assessType;
    }
    public String getBookingType() {
        return bookingType;
    }
    public void setBookingType(String bookingType) {
        this.bookingType = bookingType;
    }
    public String getLateServeType() {
        return lateServeType;
    }
    public void setLateServeType(String lateServeType) {
        this.lateServeType = lateServeType;
    }
    public String getPlanStartTimeType() {
        return planStartTimeType;
    }
    public void setPlanStartTimeType(String planStartTimeType) {
        this.planStartTimeType = planStartTimeType;
    }
    public String getServerTimeType() {
        return serverTimeType;
    }
    public void setServerTimeType(String serverTimeType) {
        this.serverTimeType = serverTimeType;
    }
    public String getServerCount() {
        return serverCount;
    }
    public void setServerCount(String serverCount) {
        this.serverCount = serverCount;
    }
    public String getTemplateType() {
        return templateType;
    }
    public void setTemplateType(String templateType) {
        this.templateType = templateType;
    }
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
}

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

@@ -1,6 +1,6 @@
package com.yihu.jw.entity.base.servicePackage;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.base.team.BaseTeamDO;
@@ -18,7 +18,7 @@ import java.util.List;
 */
@Entity
@Table(name = "base_service_package")
public class ServicePackageDO extends UuidIdentityEntityWithCreateTime implements Serializable {
public class ServicePackageDO extends UuidIdentityEntityWithOperator implements Serializable {
    private String name;//'服务包名称'
    private String type;//服务类型（1养老服务、2医疗服务、3安防监护、4慢病管理）
@@ -37,6 +37,89 @@ public class ServicePackageDO extends UuidIdentityEntityWithCreateTime implement
    private String orgCode;
    private String orgName;
    /**
     * 新增字段
     */
    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 pageItemName;//服务包服务项名称
    @Transient
    public String getPageItemName() {
        return pageItemName;
    }
    public void setPageItemName(String pageItemName) {
        this.pageItemName = pageItemName;
    }
    @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 = "leased_code")
    public String getLeasedCode() {
        return leasedCode;
    }
    public void setLeasedCode(String leasedCode) {
        this.leasedCode = leasedCode;
    }
    @Column(name = "leased_name")
    public String getLeasedName() {
        return leasedName;
    }
    public void setLeasedName(String leasedName) {
        this.leasedName = leasedName;
    }
    @Column(name = "server_time_type")
    public String getServerTimeType() {
        return serverTimeType;
    }
    public void setServerTimeType(String serverTimeType) {
        this.serverTimeType = serverTimeType;
    }
    @Column(name = "server_time")
    public String getServerTime() {
        return serverTime;
    }
    public void setServerTime(String serverTime) {
        this.serverTime = serverTime;
    }
    @Column(name = "server_time_description")
    public String getServerTimeDescription() {
        return serverTimeDescription;
    }
    public void setServerTimeDescription(String serverTimeDescription) {
        this.serverTimeDescription = serverTimeDescription;
    }
    @Transient
    public String getTypeName() {
        return typeName;

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

@@ -28,6 +28,83 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    private String createTime;//
    private String dictId;//
    private String topicItem;//所属专题 security 安防专题
    /**
     * 新增字段
     */
    private String servicePackageItemId;//服务项id
    private String leasedCode;//租户code
    private String leasedName;//租户name
    private String subItemType;//是否包含子项目
    private String templateCode;//模板的code
    private String templateType;//模板的类型
    private String subItemId;//数据库不存在的字段
    @Column(name = "service_package_item_id")
    public String getServicePackageItemId() {
        return servicePackageItemId;
    }
    public void setServicePackageItemId(String servicePackageItemId) {
        this.servicePackageItemId = servicePackageItemId;
    }
    @Column(name = "template_type")
    public String getTemplateType() {
        return templateType;
    }
    public void setTemplateType(String templateType) {
        this.templateType = templateType;
    }
    @Column(name = "template_code")
    public String getTemplateCode() {
        return templateCode;
    }
    public void setTemplateCode(String templateCode) {
        this.templateCode = templateCode;
    }
    @Transient
    public String getSubItemId() {
        return subItemId;
    }
    public void setSubItemId(String subItemId) {
        this.subItemId = subItemId;
    }
    @Column(name = "sub_item_type")
    public String getSubItemType() {
        return subItemType;
    }
    public void setSubItemType(String subItemType) {
        this.subItemType = subItemType;
    }
    @Column(name = "leased_code")
    public String getLeasedCode() {
        return leasedCode;
    }
    public void setLeasedCode(String leasedCode) {
        this.leasedCode = leasedCode;
    }
    @Column(name = "leased_name")
    public String getLeasedName() {
        return leasedName;
    }
    public void setLeasedName(String leasedName) {
        this.leasedName = leasedName;
    }
    @Column(name = "dict_id")
    public String getDictId() {
        return dictId;

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

@@ -0,0 +1,38 @@
package com.yihu.jw.entity.base.servicePackage;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * 关联表
 * base_service_package_item
 * base_service_package_sub_item
 */
@Entity
@Table(name = "base_service_package_item_relational")
public class ServicePackageItemRelationalDO extends UuidIdentityEntity implements java.io.Serializable {
    @Column(name = "item_id")
    private String itemId;
    @Column(name = "sub_item_id")
    private String subItemId;
    public String getItemId() {
        return itemId;
    }
    public void setItemId(String itemId) {
        this.itemId = itemId;
    }
    public String getSubItemId() {
        return subItemId;
    }
    public void setSubItemId(String subItemId) {
        this.subItemId = subItemId;
    }
}

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

@@ -0,0 +1,152 @@
package com.yihu.jw.entity.base.servicePackage;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @author suqinyi
 * @Date 2023/9/21
 */
@Entity
@Table(name = "base_service_package_sub_item")
public class ServicePackageSubItemDO extends UuidIdentityEntity implements java.io.Serializable {
    @Column(name = "name")
    private String name;//名称
    @Column(name = "dict_item_id")
    private String dictItemId;//字典配置的服务项的id
    @Column(name = "introduce")
    private String introduce;//说明
    @Column(name = "status")
    private String status;//状态
    @Column(name = "sort")
    private String sort;//排序
    @Column(name = "leased_code")
    private String leasedCode;//租户code
    @Column(name = "leased_name")
    private String leasedName;//租户name
    @Column(name = "org_code")
    private String orgCode;//机构code
    @Column(name = "org_name")
    private String orgName;//机构name
    @Column(name = "photo")
    private String photo;//照片
    @Column(name = "create_time")
    private Date createTime;//创建时间
    @Column(name = "price")
    private BigDecimal price;//服务子项价格
    public BigDecimal getPrice() {
        return price;
    }
    public void setPrice(BigDecimal price) {
        this.price = price;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getDictItemId() {
        return dictItemId;
    }
    public void setDictItemId(String dictItemId) {
        this.dictItemId = dictItemId;
    }
    public String getIntroduce() {
        return introduce;
    }
    public void setIntroduce(String introduce) {
        this.introduce = introduce;
    }
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    public String getSort() {
        return sort;
    }
    public void setSort(String sort) {
        this.sort = sort;
    }
    public String getLeasedCode() {
        return leasedCode;
    }
    public void setLeasedCode(String leasedCode) {
        this.leasedCode = leasedCode;
    }
    public String getLeasedName() {
        return leasedName;
    }
    public void setLeasedName(String leasedName) {
        this.leasedName = leasedName;
    }
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}