Merge branch 'dev' of yeshijie/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/redis/RedisThread.java

@@ -3,6 +3,8 @@ package com.yihu.wlyy.redis;
import com.yihu.wlyy.service.app.prescription.PrescriptionService;
import com.yihu.wlyy.util.SystemConf;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -15,6 +17,7 @@ import redis.clients.jedis.Jedis;
@Component
public class RedisThread implements Runnable {
    private static Logger logger = LoggerFactory.getLogger(RedisThread.class);
    @Value("${channel.redis.host}")
    private String url;
    @Value("${channel.redis.port}")
@@ -35,16 +38,18 @@ public class RedisThread implements Runnable {
            jedis.auth(password);
        }
        while (true){
            String message = jedis.rpop(key);
            if(StringUtils.isEmpty(message)){
                try{
            try {
                String message = jedis.rpop(key);
                if(StringUtils.isEmpty(message)){
                    Thread.sleep(1000L);//如果没有读取到记录,等待1秒
                }catch (Exception e){
                    e.printStackTrace();
                }else {
                    prescriptionService.redisMessage(message);
                }
            }else {
                prescriptionService.redisMessage(message);
            }catch (Exception e){
                e.printStackTrace();
                logger.info(e.getMessage());
            }
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -1037,7 +1037,7 @@ public class ConsultTeamService extends ConsultService {
            consultTeamDoctorDao.save(cd);
            //7、发送系统消息提示团队长有未审核的消息
            addCheckMessage(prescription,sessionId);
            addCheckMessage(prescription,sessionId,p);
            //8、 保存医生咨询信息
            // 添加咨询转发记录
@@ -1052,12 +1052,13 @@ public class ConsultTeamService extends ConsultService {
     * 保存审核提醒消息
     * @param prescription
     */
    public void addCheckMessage(Prescription prescription,String sessionId){
    public void addCheckMessage(Prescription prescription,String sessionId,Patient p){
        Message message = new Message();
        message.setCzrq(new Date());
        message.setCreateTime(new Date());
        message.setRead(1);//设置未读
        message.setOver("1");
        message.setSenderPhoto(p.getPhoto());
        message.setReceiver(prescription.getDoctor());
        message.setSender(prescription.getPatient());
        message.setCode(getCode());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/device/DeviceController.java

@@ -50,7 +50,7 @@ public class DeviceController extends BaseController {
    }
    @ApiOperation("获取设备信息")
    @RequestMapping(value = "DeviceInfo", method = RequestMethod.POST)
    @RequestMapping(value = "DeviceInfo", method = {RequestMethod.POST, RequestMethod.GET})
    @ResponseBody
    public String getDeviceInfo(@ApiParam(name = "id", value = "设备ID", defaultValue = "19")
                                @RequestParam(value = "id", required = true) String id) {