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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/device/BaseDeviceRepairDao.java

@@ -2,8 +2,14 @@ package com.yihu.jw.care.dao.device;
import com.yihu.jw.entity.patient.BaseDeviceRepairEntity;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface BaseDeviceRepairDao extends PagingAndSortingRepository<BaseDeviceRepairEntity,Long>,
        JpaSpecificationExecutor<BaseDeviceRepairEntity> {
    @Query(value = "select r from BaseDeviceRepairEntity r where r.deviceSn = ?1")
    List<BaseDeviceRepairEntity> findbydeviceSn(String deviceSn);
}

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

@@ -272,9 +272,13 @@ public class DoctorDeviceController extends BaseController {
			if(permissionService.noPermission(2,param)){
				return write(-1,"该操作没有权限");
			}
			BaseDeviceRepairEntity baseDeviceRepairEntity = JSON.parseObject(repairJson, BaseDeviceRepairEntity.class);
            return write(200,"成功","data",deviceManageService.deviceRepair(baseDeviceRepairEntity,doctor));
			BaseDeviceRepairEntity baseDRDO = deviceManageService.deviceRepair(baseDeviceRepairEntity, doctor);
			if (null==baseDRDO) {
				return write(-1,"当前设备已存在报修订单,请联系管理员进行处理！");
			}
			return write(200,"成功","data",baseDRDO);
        } catch (Exception e) {
            error(e);
			return errorResult(e);

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

@@ -85,7 +85,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
            //level == 4 助老员
            if (doctorById.getLevel() == 4) {
                 repairSql ="SELECT DISTINCT" +
                         " pd.device_name AS deviceName,dr.`status` AS `status` ,dr.bind_user_name AS bindName,dr.deal_peoper_name AS dealName,dr.create_time AS createTime" +
                         " pd.device_name AS deviceName,pd.category_code as categoryCode,dr.`status` AS `status` ,dr.bind_user_name AS bindName,dr.deal_peoper_name AS dealName,dr.create_time AS createTime" +
                         " FROM" +
                         " wlyy_patient_device pd," +
                         " base_device_repair dr," +
@@ -100,7 +100,7 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
                         " AND ph.doctor = '"+doctor+"'" +
                         " AND ph.del = '1'";
            } else {
                 repairSql = "SELECT DISTINCT dr.order_id AS id,dr.bind_user_name AS patientName," +
                 repairSql = "SELECT DISTINCT dr.order_id AS id,dr.bind_user_name AS patientName, pd.category_code as categoryCode," +
                        " dr.`status` AS `status`,dr.create_time AS createTime,dr.repair_peoper_name AS repairName,wd.device_name AS deviceName" +
                        " FROM" +
                        " wlyy_patient_device pd," +
@@ -144,8 +144,12 @@ public class DeviceManageService extends BaseJpaService<BaseDeviceRepairEntity,B
    public BaseDeviceRepairEntity deviceRepair(BaseDeviceRepairEntity repairEntity,String doctor) {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctor);
        List<BaseDeviceRepairEntity> baseDeviceRepairEntities = baseDeviceRepairDao.findbydeviceSn(repairEntity.getDeviceSn());
        if (baseDeviceRepairEntities.size()>0){
            return null;
        }
            if (2==doctorDO.getLevel()||4==doctorDO.getLevel()){
        if (2==doctorDO.getLevel()||4==doctorDO.getLevel()){
                repairEntity.setOrderId(UUID.randomUUID().toString().replaceAll("-", ""));
                repairEntity.setStatus(0);
                repairEntity.setCreateTime(DateUtil.getNowDate());

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

@@ -38,8 +38,9 @@ public class DayHandoverService {
    //获取交接列表
    public List<BaseDayHandover> getDayHandoverList(String doctor,String staterDate,String endDate) {
        String sql ="SELECT * from base_day_handover WHERE create_user ='"+doctor+"' AND create_time >= '"+staterDate+"' AND create_time <= '"+endDate+"' ORDER BY create_time DESC";
        return jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(BaseDayHandover.class));
        //发起
        String createSql ="SELECT * from base_day_handover WHERE (create_user = '"+doctor+"' OR handover_user = '"+doctor+"') AND create_time >= '"+staterDate+"' AND create_time <= '"+endDate+"' ORDER BY create_time DESC";
        return jdbcTemplate.query(createSql, new BeanPropertyRowMapper<>(BaseDayHandover.class));
    }
    //获取团队成员