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

# Conflicts:
#	common/common-entity/sql记录

common/common-entity/sql记录

@@ -493,7 +493,10 @@ CREATE TABLE `base_device_sos_log` (
ALTER table base.base_emergency_assistance_order add column `order_source` tinyint(4) DEFAULT '1' COMMENT '工单发起来源状态 1APP 2手环3居家报警'
-- 2021-05-10 ysj
ALTER table base.base_business_order_refund add column `enclosure` VARCHAR(3000)  COMMENT '附件';
CREATE TABLE `base_course` (
  `id` varchar(50) NOT NULL,
  `type` varchar(1) DEFAULT NULL COMMENT '课程类型',
@@ -553,13 +556,18 @@ CREATE TABLE `base_recruit_students_record` (
  `patient` varchar(50) DEFAULT NULL,
  `patient_name` varchar(50) DEFAULT NULL COMMENT '姓名',
  `sex` varchar(1) DEFAULT NULL COMMENT '性别',
  `org_code` varchar(50) DEFAULT NULL COMMENT '机构code',
  `org_name` varchar(50) DEFAULT NULL COMMENT '机构名称',
  `mobile` varchar(20) DEFAULT NULL COMMENT '手机',
  `status` varchar(1) DEFAULT NULL COMMENT '状态',
  `status` varchar(1) DEFAULT NULL COMMENT '状态(待审核、待支付、已支付、已退费、审核未通过)',
  `del` tinyint(1) DEFAULT NULL,
  `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,

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

@@ -284,7 +284,7 @@ public class BaseDoctorDO extends UuidIdentityEntityWithOperator {
    private String visitTime;
    /**
     * 类型 1社区医生，2助老员
     * 类型 1社区医生，2助老员 3 教师
     */
    private Integer level;
    private String doctorLat;//医生当前定位地址纬度

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

@@ -19,24 +19,24 @@ import javax.persistence.Transient;
public class CourseCatalogueDO extends UuidIdentityEntityWithTime {
    /**
     *
     * 课程id
     */
    private String courserId;
    /**
     *
     * 目录名称
     */
    private String name;
    /**
     *
     * 小结类型 2视频 3文本
     */
    private String type;
    private String typeName;
    /**
     *
     * 小结内容
     */
    private String content;
    /**
     *
     * 视频url
     */
    private String videoUrl;

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

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.care.course;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
@@ -33,7 +34,7 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
     */
    private String orgCode;
    /**
     *
     * 机构名称
     */
    private String orgName;
    /**
@@ -140,6 +141,7 @@ public class CourseDO extends UuidIdentityEntityWithOperator {
        this.doctorName = doctorName;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "live_time")
    public Date getLiveTime() {
        return liveTime;

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

@@ -0,0 +1,20 @@
package com.yihu.jw.entity.care.course;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/5/13
 * @Description:
 */
@Entity
@Table(name="base_patient_order_refund")
public class PatientOrderRefundDO extends UuidIdentityEntity{
}

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

@@ -1,5 +1,6 @@
package com.yihu.jw.entity.care.course;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithTime;
import javax.persistence.Column;
@@ -83,6 +84,7 @@ public class RecruitStudentsDO  extends UuidIdentityEntityWithTime {
        this.theme = theme;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "start_time")
    public Date getStartTime() {
        return startTime;
@@ -92,6 +94,7 @@ public class RecruitStudentsDO  extends UuidIdentityEntityWithTime {
        this.startTime = startTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "end_time")
    public Date getEndTime() {
        return endTime;

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

@@ -43,6 +43,18 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
     */
    private String status;
    private String statusName;
    /**
     * 机构code
     */
    private String orgCode;
    /**
     * 机构名称
     */
    private String orgName;
    /**
     * 删除标志 1正常 0删除
     */
    private Integer del;
    @Column(name = "recruit_students_id")
    public String getRecruitStudentsId() {
@@ -102,4 +114,31 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    @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 = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/order/BusinessOrderDO.java

@@ -3,13 +3,11 @@ package com.yihu.jw.entity.order;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IntegerIdentityEntity;
import com.yihu.jw.entity.IntegerIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
/**
@@ -23,8 +21,16 @@ public class BusinessOrderDO extends IntegerIdentityEntity {
    private String patient;//居民code
    private String patientName;//居民名字
    private String orderNo;//订单号
    private Integer orderType;//订单类型订单类型：目前只能1表示图文，3表示视频大类细分如下：专家咨询：1图文咨询 |2电话咨询|3视频咨询|4免费义诊图文诊室：1图文复诊视频诊室：3视频复诊| 5社区协同
    private String orderCategory;//1：专家咨询|2：图文诊室|3：视频诊室|4处方结算|5就诊卡充值)
    /**
     *  互联网医院-订单类型订单类型：目前只能1表示图文，3表示视频大类细分如下：专家咨询：1图文咨询 |2电话咨询|3视频咨询|4免费义诊图文诊室：1图文复诊视频诊室：3视频复诊| 5社区协同
     *  医养项目 订单类型 1 新生儿托幼
     */
    private Integer orderType;
    /**
     * 互联网医院- 1：专家咨询|2：图文诊室|3：视频诊室|4处方结算|5就诊卡充值)
     * 医养项目 订单分类 orderType=1 时 1招生，2 课程，3 上门预约(托幼)
     */
    private String orderCategory;
    private String relationCode;//业务关联code
    private String relationName;//业务关联名称
    private String description;//支付备注

common/common-entity/src/main/java/com/yihu/jw/entity/order/BusinessOrderRefundDO.java

@@ -29,6 +29,7 @@ public class BusinessOrderRefundDO extends IntegerIdentityEntity {
    private String refundDesc;//退款原因
    private Integer status;//状态1待退款2已退款
    private Date refundTime;//退款时间
    private String enclosure;//附件
    private Date createTime;
    private String createUser;
    private String createUserName;
@@ -193,4 +194,13 @@ public class BusinessOrderRefundDO extends IntegerIdentityEntity {
    public void setRefundDesc(String refundDesc) {
        this.refundDesc = refundDesc;
    }
    @Column(name = "enclosure")
    public String getEnclosure() {
        return enclosure;
    }
    public void setEnclosure(String enclosure) {
        this.enclosure = enclosure;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/course/CourseEndpoint.java

@@ -42,6 +42,11 @@ public class CourseEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        CourseDO courseDO = toEntity(jsonData, CourseDO.class);
        courseDO.setDel(1);
        courseDO.setLiveStatus("1");
        if(StringUtil.isBlank(courseDO.getStatus())){
            courseDO.setStatus("1");
        }
        courseDO = courseService.save(courseDO);
        return success(courseDO);
    }
@@ -51,7 +56,7 @@ public class CourseEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        courseService.delete(ids.split(","));
        courseService.deletes(ids);
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/course/RecruitStudentsEndpoint.java

@@ -40,6 +40,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        RecruitStudentsDO recruitStudentsDO = toEntity(jsonData, RecruitStudentsDO.class);
        recruitStudentsDO.setDel(1);
        recruitStudentsDO = recruitStudentsService.save(recruitStudentsDO);
        return success(recruitStudentsDO);
    }
@@ -49,7 +50,7 @@ public class RecruitStudentsEndpoint extends EnvelopRestEndpoint {
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        recruitStudentsService.delete(ids.split(","));
        recruitStudentsService.deletes(ids);
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/CourseService.java

@@ -4,8 +4,10 @@ import com.yihu.jw.base.dao.course.CourseDao;
import com.yihu.jw.entity.care.course.CourseDO;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -19,6 +21,22 @@ import java.util.Map;
@Service
public class CourseService extends BaseJpaService<CourseDO, CourseDao> {
    @Autowired
    private CourseDao courseDao;
    /**
     * 伪删除
     * @param ids
     */
    public void deletes(String ids){
        List<CourseDO> courseDOList = new ArrayList<>();
        for(String id:ids.split(",")){
            CourseDO courseDO = courseDao.findOne(id);
            courseDO.setDel(0);
            courseDOList.add(courseDO);
        }
        courseDao.save(courseDOList);
    }
    /**
     * 查找机构的老师
@@ -29,7 +47,7 @@ public class CourseService extends BaseJpaService<CourseDO, CourseDao> {
        String sql ="SELECT d.id,d.name from base_doctor_hospital h,base_doctor d " +
                "WHERE h.doctor_code = d.id and h.del = '1' and d.del = '1' ";
        if(!StringUtil.isBlank(orgCode)){
            sql += " h.org_code = '"+orgCode+"' ";
            sql += " and h.org_code = '"+orgCode+"' ";
        }
        return jdbcTemplate.queryForList(sql);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/CustomerServiceSerivce.java

@@ -20,4 +20,5 @@ public class CustomerServiceSerivce extends BaseJpaService<CustomerServiceDO, Cu
    private CustomerServiceDao customerServiceDao;
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/course/RecruitStudentsService.java

@@ -3,8 +3,12 @@ package com.yihu.jw.base.service.course;
import com.yihu.jw.base.dao.course.RecruitStudentsDao;
import com.yihu.jw.entity.care.course.RecruitStudentsDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
 * Created with IntelliJ IDEA.
 *
@@ -14,4 +18,22 @@ import org.springframework.stereotype.Service;
 */
@Service
public class RecruitStudentsService extends BaseJpaService<RecruitStudentsDO, RecruitStudentsDao> {
    @Autowired
    private RecruitStudentsDao recruitStudentsDao;
    /**
     * 伪删除
     * @param ids
     */
    public void deletes(String ids){
        List<RecruitStudentsDO> recruitStudentsDOList = new ArrayList<>();
        for(String id:ids.split(",")){
            RecruitStudentsDO recruitStudentsDO = recruitStudentsDao.findOne(id);
            recruitStudentsDO.setDel(0);
            recruitStudentsDOList.add(recruitStudentsDO);
        }
        recruitStudentsDao.save(recruitStudentsDOList);
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doctor/CareDoctorService.java

@@ -1,14 +1,11 @@
package com.yihu.jw.care.service.doctor;
import com.alibaba.fastjson.JSONObject;
import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import com.yihu.jw.care.endpoint.org.OrgEndpoint;
import com.yihu.jw.care.service.role.RoleService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.doctor.dao.DoctorSpecialDiseaseDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -24,11 +21,8 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
 * Created by yeshijie on 2021/3/3.
@@ -61,7 +55,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
     * @return
     */
    public Map<String,Object> doctorInfo(String doctorId,String isRole){
        String sql = "SELECT d.id,d.name,d.doctor_level,d.photo,d.introduce,d.expertise,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        String sql = "SELECT d.id,d.name,d.doctor_level level,d.photo,d.introduce,d.expertise,d.mobile,d.idcard,d.sex,h.dept_code deptCode,h.dept_name deptName,d.job_title_code jobTitleCode,d.job_title_name jobTitleName ";
        sql += " ,h.org_code orgCode,org.address orgAddress,h.org_name orgName from base_doctor d left join base_doctor_hospital h on d.id = h.doctor_code  and h.del = 1" +
                " LEFT JOIN base_org org on h.org_code = org.`code`  WHERE d.id = '"+doctorId+"' limit 1 ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);