Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

 Conflicts:

	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

common/common-entity/sql记录

@@ -490,4 +490,77 @@ CREATE TABLE `base_device_sos_log` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='设备紧急救助日志表';
-- 2021-05-10 lb
ALTER table base.base_emergency_assistance_order add column `order_source` tinyint(4) DEFAULT '1' COMMENT '工单发起来源状态 1APP 2手环3居家报警'
ALTER table base.base_emergency_assistance_order add column `order_source` tinyint(4) DEFAULT '1' COMMENT '工单发起来源状态 1APP 2手环3居家报警'
-- 2021-05-10
CREATE TABLE `base_course` (
  `id` varchar(50) NOT NULL,
  `type` varchar(1) DEFAULT NULL COMMENT '课程类型',
  `name` varchar(50) DEFAULT NULL COMMENT '课程名称',
  `org_code` varchar(50) DEFAULT NULL COMMENT '机构id',
  `org_name` varchar(50) DEFAULT NULL COMMENT '机构名称',
  `doctor` varchar(50) DEFAULT NULL COMMENT '教师id',
  `doctor_name` varchar(50) DEFAULT NULL COMMENT '教师名称',
  `live_time` datetime DEFAULT NULL COMMENT '直播时间',
  `course_cover` varchar(300) DEFAULT NULL COMMENT '课程封面',
  `fee` decimal(10,2) DEFAULT NULL COMMENT '费用',
  `introduction` varchar(3000) DEFAULT NULL COMMENT '课程简介',
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程表';
CREATE TABLE `base_course_catalogue` (
  `id` varchar(50) NOT NULL,
  `course_id` varchar(50) DEFAULT NULL,
  `name` varchar(50) DEFAULT NULL COMMENT '目录名称',
  `type` varchar(1) DEFAULT NULL COMMENT '目录类型',
  `content` varchar(3000) DEFAULT NULL COMMENT '小节内容',
  `video_url` varchar(300) DEFAULT NULL COMMENT '小节视频url',
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='课程目录表';
CREATE TABLE `base_recruit_students` (
  `id` varchar(50) NOT NULL,
  `org_code` varchar(50) DEFAULT NULL COMMENT '招生机构',
  `org_name` varchar(50) DEFAULT NULL COMMENT '招生机构名称',
  `theme` varchar(100) DEFAULT NULL COMMENT '招生主题',
  `start_time` datetime DEFAULT NULL COMMENT '报名开始时间',
  `end_time` datetime DEFAULT NULL COMMENT '报名结束时间',
  `num` int(11) DEFAULT NULL COMMENT '招生名额',
  `fee` decimal(10,2) DEFAULT NULL COMMENT '报名费用',
  `admitted_num` int(11) DEFAULT NULL COMMENT '已录取人数',
  `del` tinyint(1) DEFAULT NULL COMMENT '删除标志 1正常 0删除',
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='招生表';
CREATE TABLE `base_recruit_students_record` (
  `id` varchar(50) NOT NULL,
  `recruit_students_id` varchar(50) DEFAULT NULL COMMENT '招生id',
  `patient` varchar(50) DEFAULT NULL,
  `patient_name` varchar(50) DEFAULT NULL COMMENT '姓名',
  `sex` varchar(1) DEFAULT NULL COMMENT '性别',
  `mobile` varchar(20) DEFAULT NULL COMMENT '手机',
  `admission_status` varchar(1) DEFAULT NULL COMMENT '录取状态',
  `pay_status` varchar(1) DEFAULT NULL COMMENT '付款状态',
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='招生记录表';
CREATE TABLE `base_customer_service` (
  `id` varchar(50) NOT NULL,
  `org_code` varchar(50) DEFAULT NULL,
  `org_name` varchar(50) DEFAULT NULL,
  `team_id` varchar(50) DEFAULT NULL,
  `team_name` varchar(50) DEFAULT NULL,
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构客服团队表';

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/CourseCatalogueDO.java

@@ -0,0 +1,92 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/10
 * @Description: 课程目录表
 */
@Entity
@Table(name="base_course_catalogue")
public class CourseCatalogueDO extends UuidIdentityEntityWithTime {
    /**
     *
     */
    private String courserId;
    /**
     *
     */
    private String name;
    /**
     *
     */
    private String type;
    private String typeName;
    /**
     *
     */
    private String content;
    /**
     *
     */
    private String videoUrl;
    @Column(name = "course_id")
    public String getCourserId() {
        return courserId;
    }
    public void setCourserId(String courserId) {
        this.courserId = courserId;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Transient
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    @Column(name = "content")
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(name = "video_url")
    public String getVideoUrl() {
        return videoUrl;
    }
    public void setVideoUrl(String videoUrl) {
        this.videoUrl = videoUrl;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/CourseDO.java

@@ -0,0 +1,163 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/10
 * @Description: 课程表
 */
@Entity
@Table(name="base_course")
public class CourseDO extends UuidIdentityEntityWithTime{
    /**
     * '课程类型'
     */
    private String type;
    private String typeName;
    /**
     * '课程名称'
     */
    private String name;
    /**
     * 机构id
     */
    private String orgCode;
    /**
     *
     */
    private String orgName;
    /**
     *'教师id'
     */
    private String doctor;
    /**
     *'教师名称'
     */
    private String doctorName;
    /**
     * '直播时间'
     */
    private Date liveTime;
    /**
     * '课程封面'
     */
    private String courseCover;
    /**
     * '费用'
     */
    private String fee;
    /**
     * '课程简介'
     */
    private String introduction;
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Transient
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @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;
    }
    @Column(name = "live_time")
    public Date getLiveTime() {
        return liveTime;
    }
    public void setLiveTime(Date liveTime) {
        this.liveTime = liveTime;
    }
    @Column(name = "course_cover")
    public String getCourseCover() {
        return courseCover;
    }
    public void setCourseCover(String courseCover) {
        this.courseCover = courseCover;
    }
    @Column(name = "fee")
    public String getFee() {
        return fee;
    }
    public void setFee(String fee) {
        this.fee = fee;
    }
    @Column(name = "introduction")
    public String getIntroduction() {
        return introduction;
    }
    public void setIntroduction(String introduction) {
        this.introduction = introduction;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/CustomerServiceDO.java

@@ -0,0 +1,55 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/10
 * @Description: 机构客服团队表
 */
@Entity
@Table(name="base_customer_service")
public class CustomerServiceDO  extends UuidIdentityEntityWithTime {
    private String orgCode;
    private String orgName;
    private String teamId;
    private String teamName;
    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 getTeamId() {
        return teamId;
    }
    public void setTeamId(String teamId) {
        this.teamId = teamId;
    }
    public String getTeamName() {
        return teamName;
    }
    public void setTeamName(String teamName) {
        this.teamName = teamName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/RecruitStudentsDO.java

@@ -0,0 +1,139 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/10
 * @Description: 招生表
 */
@Entity
@Table(name="base_recruit_students")
public class RecruitStudentsDO  extends UuidIdentityEntityWithTime {
    /**
     * '招生机构'
     */
    private String orgCode;
    /**
     *'招生机构名称'
     */
    private String orgName;
    /**
     *'招生主题'
     */
    private String theme;
    /**
     *'报名开始时间'
     */
    private Date startTime;
    /**
     *'报名结束时间'
     */
    private Date endTime;
    /**
     *'招生名额'
     */
    private Integer num;
    /**
     *'报名费用'
     */
    private BigDecimal fee;
    /**
     *'已录取人数'
     */
    private Integer admittedNum;
    /**
     * '删除标志 1正常 0删除'
     */
    private Integer del;
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "theme")
    public String getTheme() {
        return theme;
    }
    public void setTheme(String theme) {
        this.theme = theme;
    }
    @Column(name = "start_time")
    public Date getStartTime() {
        return startTime;
    }
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    @Column(name = "end_time")
    public Date getEndTime() {
        return endTime;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    @Column(name = "num")
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    @Column(name = "fee")
    public BigDecimal getFee() {
        return fee;
    }
    public void setFee(BigDecimal fee) {
        this.fee = fee;
    }
    @Column(name = "admitted_num")
    public Integer getAdmittedNum() {
        return admittedNum;
    }
    public void setAdmittedNum(Integer admittedNum) {
        this.admittedNum = admittedNum;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/course/RecruitStudentsRecordDO.java

@@ -0,0 +1,124 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/10
 * @Description: 招生记录表
 */
@Entity
@Table(name="base_recruit_students_record")
public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
    /**
     * '招生id'
     */
    private String recruitStudentsId;
    /**
     *
     */
    private String patient;
    /**
     * '姓名'
     */
    private String patientName;
    /**
     * '性别'
     */
    private String sex;
    /**
     * '手机'
     */
    private String mobile;
    /**
     * '录取状态'
     */
    private String admissionStatus;
    private String admissionStatusName;
    /**
     * '付款状态'
     */
    private String payStatus;
    private String payStatusName;
    @Column(name = "recruit_students_id")
    public String getRecruitStudentsId() {
        return recruitStudentsId;
    }
    public void setRecruitStudentsId(String recruitStudentsId) {
        this.recruitStudentsId = recruitStudentsId;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    @Column(name = "sex")
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "admission_status")
    public String getAdmissionStatus() {
        return admissionStatus;
    }
    public void setAdmissionStatus(String admissionStatus) {
        this.admissionStatus = admissionStatus;
    }
    @Transient
    public String getAdmissionStatusName() {
        return admissionStatusName;
    }
    public void setAdmissionStatusName(String admissionStatusName) {
        this.admissionStatusName = admissionStatusName;
    }
    @Column(name = "pay_status")
    public String getPayStatus() {
        return payStatus;
    }
    public void setPayStatus(String payStatus) {
        this.payStatus = payStatus;
    }
    @Transient
    public String getPayStatusName() {
        return payStatusName;
    }
    public void setPayStatusName(String payStatusName) {
        this.payStatusName = payStatusName;
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -764,6 +764,7 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
        loginTypeList.add("4");
        loginTypeList.add("5");
        loginTypeList.add("6");
        loginTypeList.add("7");
    }
    public boolean setRolePhth(String loginType, OAuth2AccessToken token, String id, StringRedisTemplate redisTemplate) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -157,7 +157,7 @@ public class ContactsService {
     */
    public List<Map<String,Object>> findSignOrg(String patient,String lng,String lat){
        List<Map<String,Object>> result = new ArrayList<>();
        List<BaseOrgDO> orgDOList = servicePackageService.findSignOrg(patient,null);
        List<BaseOrgDO> orgDOList = servicePackageService.findSignOrg(patient,"3");
        for (BaseOrgDO orgDO : orgDOList){
            Map<String,Object> map = new HashedMap();
            map.put("distance", LatitudeUtils.getDistance(lat,lng,orgDO.getLatitude(),orgDO.getLongitude()));

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -168,6 +168,7 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        patientBrief.setCommitteeCode(patientDetail.getCommitteeCode());
        patientBrief.setCommitteeName(patientDetail.getCommitteeName());
        patientBrief.setArchiveStatus(patientDetail.getArchiveStatus());
        patientBrief.setArchiveType(patientDetail.getArchiveType());
        patientBrief.setSsc(patientDetail.getSsc());
        patientBrief.setMedicareNumber(patientDetail.getMedicareNumber());
        patientBrief.setMobile(patientDetail.getMobile());