Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpClientUtil.java

@@ -146,7 +146,7 @@ public class HttpClientUtil {
            }
        } catch (Exception e) {
            e.printStackTrace();
            return null;
            return e.getMessage();
        } finally {
            httpclient.close();
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/health/bank/AccountController.java

@@ -130,7 +130,7 @@ public class AccountController extends WeixinBaseController {
        try {
            JSONObject object = JSONObject.parseObject(activeRecord);
            JSONObject result = taskService.createActiveRecord(object);
            return write(200,"获取成功","data",result);
            return write(200,"添加成功","data",result);
        }catch (Exception e){
            error(e);
            return error(-1,e.getMessage());
@@ -154,6 +154,7 @@ public class AccountController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/insertCredits",method = RequestMethod.POST)
    @ApiOperation("添加积分")
    public String insert(@ApiParam(name = "creditsDetail",value = "居民id集合")
@@ -171,4 +172,22 @@ public class AccountController extends WeixinBaseController {
            return error(-1,e.getMessage());
        }
    }
    @RequestMapping(value = "/weekReward",method = RequestMethod.POST)
    @ApiOperation("周奖励")
    public String weekReward(@ApiParam(name = "creditsDetail",value = "居民信息")
                                 @RequestParam(name = "creditsDetail") String creditsDetail){
        try {
            JSONObject object = JSONObject.parseObject(creditsDetail);
            JSONObject object1 = service.weekReward(object);
            return write(200,"添加成功","data",object1);
        }catch (Exception e){
            error(e);
            return error(-1,e.getMessage());
        }
    }
}

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

@@ -116,6 +116,7 @@ images:
sign:
  check_upload: http://172.19.103.87:8011/wlyy_service
  check_upload_sign: http://172.19.103.88:8011/wlyy_sign
express:
  sf_url: http://218.17.248.244:11080/bsp-oisp/sfexpressService