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

@@ -161,6 +161,7 @@ public class CreditLogService {
     * @return
     */
    public JSONObject selectByTask(JSONObject object,Integer page,Integer size){
        JSONObject object1 = new JSONObject();
        String response = null;
        String url =baseUrl + "findTask";
        Map<String,String> params = new HashMap<>();
@@ -171,12 +172,25 @@ public class CreditLogService {
        try {
            response = httpClientUtil.httpPost(url,params);
            Map<String,Object> taskInfo = patientDeviceService.getPatientDeviceTaskInfo(patientId);
            object1 = JSONObject.parseObject(response);
            JSONArray array = object1.getJSONArray("detailModelList");
            JSONArray array1 = new JSONArray();
            for (int i =0 ;i<array.size();i++){
                JSONObject jsonObject = array.getJSONObject(i);
                String taskCode = jsonObject.getString("taskCode");
                if (taskCode.equalsIgnoreCase("BIND")){
                    jsonObject.put("deviceCount",taskInfo.get("deviceCount"));
                }else if (taskCode.equalsIgnoreCase("MEASURE")){
                    jsonObject.put("resultHealty",taskInfo.get("resultHealty"));
                }
                array1.add(jsonObject);
            }
            object1.put("detailModelList",array1);
        }catch (Exception e){
            e.printStackTrace();
            logger.error(e.getMessage());
        }
        return JSONObject.parseObject(response);
        return object1;
    }
    /**