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

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/AsyncService.java

@@ -598,7 +598,19 @@ public class AsyncService extends BaseService{
                flagStr="GLU_MEASURE";
            }
            PatientDevice patientDevice = patientDeviceDao.findByDeviceSnAndCategoryCodeAndUserType(deviceSn,type,userType);
            //根据设备获取患者(设备只绑定一个人的时候，不判断按键)
            List<PatientDevice> patientDeviceList =  patientDeviceDao.findByDeviceSnAndCategoryCode(deviceSn, type);
            PatientDevice patientDevice = null;
            if (patientDeviceList != null&&patientDeviceList.size()==1) {
                patientDevice = patientDeviceList.get(0);
            }else if(patientDeviceList != null&&patientDeviceList.size()==2){
                for (int i=0;i<patientDeviceList.size();i++){
                    if(userType.equals(patientDeviceList.get(i).getUserType())){
                        patientDevice = patientDeviceList.get(i);
                        break;
                    }
                }
            }
            boolean dataUoloadCount = true;
            if (patientDevice!=null){
                //String today = DateUtil.getStringDateShort();

patient-co-service/wlyy_device/src/main/java/com/yihu/hos/device/service/DeviceService.java

@@ -471,10 +471,20 @@ public class DeviceService extends BaseService{
            userType = "-1";
        }
        //根据设备获取患者
        PatientDevice device = patientDeviceDao.findByDeviceSnAndCategoryCodeAndUserType(deviceSn, type, userType);
        if (device != null) {
        //根据设备获取患者(设备只绑定一个人的时候，不判断按键)
        List<PatientDevice> patientDeviceList =  patientDeviceDao.findByDeviceSnAndCategoryCode(deviceSn, type);
        PatientDevice device = null;
        if (patientDeviceList != null&&patientDeviceList.size()==1) {
            device = patientDeviceList.get(0);
        }else if(patientDeviceList != null&&patientDeviceList.size()==2){
            for (int i=0;i<patientDeviceList.size();i++){
                if(userType.equals(patientDeviceList.get(i).getUserType())){
                    device = patientDeviceList.get(i);
                    break;
                }
            }
        }
        if (device!=null) {
            /************设备数据重复推送处理 start**********************/
            String value1 = data;
            if("2".equals(type)){

patient-co-service/wlyy_device/src/main/resources/application.yml

@@ -26,9 +26,9 @@ spring:
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
    url: jdbc:mysql://172.19.103.85:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: linzhou
    password: linzhou
    driverClassName: com.mysql.jdbc.Driver
    maxTotal: 500
    maxIdle: 30
@@ -58,7 +58,7 @@ healthStandard:
systemConfig:
  msg_push_server: http://127.0.0.1:3000/system/sendmsg.im
  jw_server: http://172.19.103.87:8011/wlyy_service
  socket_server: http://192.168.131.102:3008
  socket_server: http://192.168.131.24:3000
  server_url: http://192.168.131.24:8080/
# Specify the DBMS
#医生助手服务器地址及模板跳转链接(医生未读消息统计页)