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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/bank/TaskService.java

@@ -84,8 +84,14 @@ public class TaskService {
     */
    public JSONObject selectActivity(JSONObject object,Integer page,Integer size){
        String response = null;
        Patient patient = patientDao.findByCode(object.getString("patientId"));
        String url =getBaseUrl() + "findActivity";
        Map<String,String> params = new HashMap<>();
        if (patient != null){
            object.put("patientIdcard",patient.getIdcard());
            object.put("unionId",patient.getUnionid());
        }
        object.remove("patientId");
        params.put("activity",object.toJSONString());
        params.put("page",page.toString());
        params.put("size",size.toString());

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

@@ -44,7 +44,7 @@ public class TaskController extends BaseController{
                                    @RequestParam(value = "size", required = false)Integer size){
        try {
            JSONObject object = JSONObject.parseObject(task);
            object.put("openId",getOpenid());
            object.put("patientId",getUID());
            return write(200,"查询成功","data",service.selectActivity(object,page,size));
        }catch (Exception e){
            error(e);