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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/health/bank/CreditLogService.java

@@ -5,6 +5,7 @@ package com.yihu.wlyy.service.third.health.bank;/**
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.service.app.device.PatientDeviceService;
import com.yihu.wlyy.util.HttpClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +42,8 @@ public class CreditLogService {
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    private PatientDeviceService patientDeviceService;
    /**
     * 调用第三方积分排名接口
@@ -164,8 +167,10 @@ public class CreditLogService {
        params.put("task",object.toJSONString());
        params.put("page",page.toString());
        params.put("size",size.toString());
        String patientId = object.getString("patientId");
        try {
            response = httpClientUtil.httpPost(url,params);
            Map<String,Object> taskInfo = patientDeviceService.getPatientDeviceTaskInfo(patientId);
        }catch (Exception e){
            e.printStackTrace();

patient-co/patient-co-wlyy/src/main/resources/application-test.yml

@@ -31,6 +31,9 @@ im:
#物联网配置
iot:
  url: http://172.19.103.33:8088/svr-iot/
#健康银行配置
healthBank:
  url: http://172.19.103.33:8660/svr-health-bank/
#康复计划配置
rehabilitation: