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

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

common/common-entity/sql记录

@@ -553,8 +553,7 @@ CREATE TABLE `base_recruit_students_record` (
  `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 '付款状态',
  `status` varchar(1) DEFAULT NULL COMMENT '状态',
  `create_time` datetime DEFAULT NULL,
  `update_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)

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

@@ -39,15 +39,10 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
     */
    private String mobile;
    /**
     * '录取状态'
     * '状态'  (待审核、待支付、已支付、已退费、审核未通过)
     */
    private String admissionStatus;
    private String admissionStatusName;
    /**
     * '付款状态'
     */
    private String payStatus;
    private String payStatusName;
    private String status;
    private String statusName;
    @Column(name = "recruit_students_id")
    public String getRecruitStudentsId() {
@@ -89,36 +84,22 @@ public class RecruitStudentsRecordDO  extends UuidIdentityEntityWithTime {
    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;
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setAdmissionStatusName(String admissionStatusName) {
        this.admissionStatusName = admissionStatusName;
    }
    @Column(name = "pay_status")
    public String getPayStatus() {
        return payStatus;
    public void setStatus(String status) {
        this.status = status;
    }
    public void setPayStatus(String payStatus) {
        this.payStatus = payStatus;
    }
    @Transient
    public String getPayStatusName() {
        return payStatusName;
    public String getStatusName() {
        return statusName;
    }
    public void setPayStatusName(String payStatusName) {
        this.payStatusName = payStatusName;
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DevicePatientDevice.java

@@ -71,7 +71,10 @@ public class DevicePatientDevice extends IdEntity {
  //========================非表字段======================
    //患者居住地址
    private String address;
    /**
     * 设备图片
     */
    private String deviceImgUrl;
    @Column(name = "device_id")
    public Long getDeviceId() {
@@ -306,4 +309,13 @@ public class DevicePatientDevice extends IdEntity {
    public void setRefuseReason(String refuseReason) {
        this.refuseReason = refuseReason;
    }
    @Transient
    public String getDeviceImgUrl() {
        return deviceImgUrl;
    }
    public void setDeviceImgUrl(String deviceImgUrl) {
        this.deviceImgUrl = deviceImgUrl;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -1,14 +1,12 @@
package com.yihu.jw.care.service.device;
import com.alibaba.fastjson.JSON;
import com.yihu.jw.care.config.AqgConfig;
import com.yihu.jw.care.dao.device.DeviceDao;
import com.yihu.jw.care.dao.device.DeviceDetailDao;
import com.yihu.jw.care.dao.device.PatientDeviceDao;
import com.yihu.jw.care.service.wechat.WeiXinAccessTokenUtils;
import com.yihu.jw.care.util.ConcealUtil;
import com.yihu.jw.util.common.GpsUtil;
import com.yihu.jw.care.util.MyJdbcTemplate;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -17,6 +15,7 @@ import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.entity.care.device.DeviceDetail;
import com.yihu.jw.entity.care.device.DevicePatientDevice;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.util.common.GpsUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
@@ -246,8 +245,22 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
        }
        Specification<DevicePatientDevice> spec = DynamicSpecifications.bySearchFilter(filters.values(), DevicePatientDevice.class);
        Page<DevicePatientDevice> page = patientDeviceDao.findAll(spec, pageRequest);
        if(page.getTotalPages()>0){
            String sql = "SELECT * from dm_device ";
            List<Map<String,Object>> devices = jdbcTemplate.queryForList(sql);
            Map<String,String> map = new HashedMap();
            for (Map<String,Object> d:devices){
                map.put(String.valueOf(d.get("category_code")),String.valueOf(d.get("photo")));
            }
            Iterator<DevicePatientDevice> iterator = page.iterator();
            while (iterator.hasNext()){
                DevicePatientDevice patientDevice = iterator.next();
                patientDevice.setDeviceImgUrl(map.get(String.valueOf(patientDevice.getDeviceId())));
            }
        }
        return patientDeviceDao.findAll(spec, pageRequest);
        return page;
    }
    public List<Map<String , Object>> findDeviceFromAdmin(String patientName, int page, int pageSize) {