1

common/common-entity/sql记录

@@ -1487,5 +1487,9 @@ CREATE TABLE `base_onenet_receive_record` (
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='onenet 数据接收记录表';
-- 2021-09-13
alter table base_admin_service_dynamic add column photo varchar(255) default null COMMENT '用户头像';
alter table base_admin_service_dynamic add column del TINYINT(2) default 1 COMMENT '1有效，0失效';

common/common-entity/src/main/java/com/yihu/jw/entity/door/BaseAdminServiceDynamic.java

@@ -28,6 +28,7 @@ public class BaseAdminServiceDynamic extends IdEntity {
    private Date createTime;
    private String doctor;
    private String doctorName;
    private String photo;
    public String getPatient() {
        return patient;
@@ -93,4 +94,12 @@ public class BaseAdminServiceDynamic extends IdEntity {
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/device/DeviceController.java

@@ -3,6 +3,7 @@ package com.yihu.jw.care.endpoint.device;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.endpoint.BaseController;
import com.yihu.jw.care.service.device.DeviceDetailService;
import com.yihu.jw.care.service.device.DeviceService;
import com.yihu.jw.entity.care.device.Device;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -25,7 +26,23 @@ public class DeviceController extends BaseController {
    @Autowired
    private DeviceService deviceService;
    @Autowired
    private DeviceDetailService deviceDetailService;
    /**
     * 清除设备失联状态
     */
    @ApiOperation("清除设备失联状态")
    @RequestMapping(value = "updateContactStatus",method = {RequestMethod.GET,RequestMethod.POST})
    public String updateContactStatus(@ApiParam(name = "deviceSn", value = "设备sn码")
                                      @RequestParam(value = "deviceSn", required = true) String deviceSn) {
        try {
            deviceDetailService.updateContactStatus(deviceSn);
            return success("设备失联信息已清除！");
        } catch (Exception ex) {
            return errorResult(ex);
        }
    }
    @ApiOperation("获取设备列表")
    @RequestMapping(value = "DeviceList", method = {RequestMethod.POST, RequestMethod.GET})

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/admin/AdminDoorCoachOrderService.java

@@ -213,6 +213,10 @@ public class AdminDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOrde
            baseAdminServiceDynamic.setValue("创建了上门辅导申请");
            baseAdminServiceDynamic.setCreateTime(new Date());
            baseAdminServiceDynamic.setName(orderDO.getNumber());
            BasePatientDO patientDO = patientDao.findById(orderDO.getPatient());
            if (StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        }catch (Exception e) {
            logger.info(e.getMessage());

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

@@ -172,6 +172,11 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
		return deviceDetailDao.save(deviceDetail);
	}
	public void updateContactStatus(String deviceSn) throws Exception {
		String sql = "update wlyy_devices dd set dd.contact_status=? where dd.device_code=?";
		jdbcTemplate.update(sql,new Object[]{-1,deviceSn});
	}
	/**
	 * 全部解绑后设备表更新为未绑定
	 * @param deviceSn

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/DoctorDoorCoachOrderService.java

@@ -414,6 +414,10 @@ public class DoctorDoorCoachOrderService {
            adminServiceDynamic.setNumber(doorServiceOrder.getNumber());
            adminServiceDynamic.setType(1);
            adminServiceDynamic.setValue("已接单，工单编号：");
            BasePatientDO patientDO = patientInfoService.findById(doorServiceOrder.getPatient());
            if (org.apache.commons.lang3.StringUtils.isNotBlank(patientDO.getPhoto())) {
                adminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(adminServiceDynamic);
        }catch (Exception e) {
            logger.info(e.getMessage());
@@ -519,6 +523,10 @@ public class DoctorDoorCoachOrderService {
            baseAdminServiceDynamic.setNumber(doorServiceOrder.getNumber());
            baseAdminServiceDynamic.setType(1);
            baseAdminServiceDynamic.setValue("已拒单，工单编号：");
            BasePatientDO patientDO = patientInfoService.findById(doorServiceOrder.getPatient());
            if (org.apache.commons.lang3.StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        }catch (Exception e) {
            logger.info(e.getMessage());
@@ -643,6 +651,10 @@ public class DoctorDoorCoachOrderService {
            baseAdminServiceDynamic.setPatient(one.getPatient());
            baseAdminServiceDynamic.setName(one.getPatientName());
            baseAdminServiceDynamic.setCreateTime(new Date());
            BasePatientDO patientDO = patientInfoService.findById(one.getPatient());
            if (org.apache.commons.lang3.StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        }catch (Exception e){
            logger.info(e.getMessage());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -205,6 +205,10 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
            baseAdminServiceDynamic.setValue("创建了上门辅导申请");
            baseAdminServiceDynamic.setCreateTime(new Date());
            baseAdminServiceDynamic.setName(orderDO.getNumber());
            BasePatientDO patientDO = patientDao.findById(orderDO.getPatient());
            if (StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        }catch (Exception e) {
            logger.info(e.getMessage());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -22,11 +22,13 @@ import com.yihu.jw.entity.care.lifeCare.LifeCareItemDictDO;
import com.yihu.jw.entity.care.lifeCare.LifeCareOrderDO;
import com.yihu.jw.entity.door.BaseAdminServiceDynamic;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.entity.patient.Patient;
import com.yihu.jw.order.dao.BusinessOrderDao;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.entity.EntityUtils;
@@ -145,6 +147,10 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            baseAdminServiceDynamic.setName(lifeCareOrderDO.getPatientName());
            baseAdminServiceDynamic.setDoctor(lifeCareOrderDO.getDoctor());
            baseAdminServiceDynamic.setDoctorName(lifeCareOrderDO.getDoctorName());
            BasePatientDO patientDO = patientDao.findById(lifeCareOrderDO.getPatient());
            if (StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        }catch (Exception e) {
            logger.info(e.getMessage());
@@ -587,6 +593,10 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            baseAdminServiceDynamic.setPatient(orderDO.getPatient());
            baseAdminServiceDynamic.setName(orderDO.getPatientName());
            baseAdminServiceDynamic.setCreateTime(new Date());
            BasePatientDO patientDO = patientDao.findById(orderDO.getPatient());
            if (StringUtils.isNotBlank(patientDO.getPhoto())) {
                baseAdminServiceDynamic.setPhoto(patientDO.getPhoto());
            }
            baseAdminServiceDynamicDao.save(baseAdminServiceDynamic);
        } catch (Exception e) {
            logger.info(e.getMessage());