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

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

@@ -465,22 +465,26 @@ public class DeviceService extends BaseService{
                Patient patient = patientDao.findByCode(patientCode);
                //增加积分
                String url = wlyyService + "/healthBank/insertCredits";
                org.json.JSONObject params = new org.json.JSONObject();
                String creditDetail = "{\"tradeType\":\"HEALTH_TASK\",\"flag\":\"MEASURE\",\"tradeDirection\":1,\"status\":1,\"patientId\":\""+result.getUser()+"\",\"hospital\":\""+patient.getTown()+"\"}";
                params.put("creditsDetail", creditDetail);
                String response = HttpClientUtil.postBody(url, params);
                com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
                String status = jsonObject.getString("status");
                if ("200".equals(status)){
                    List<Map<String,Object>> list = (List<Map<String,Object>>)jsonObject.get("detailModelList");
                    if (list!=null && list.size()>0){
                        String integrate = String.valueOf(list.get(0).get("integrate"));
                        String flagType = String.valueOf(list.get(0).get("flag"));
                        //@TODO 调用发送微信模板接口
                String sql = "select count(*) num from wlyy.wlyy_devices where device_sn = '"+deviceSn+"'";
                Map<String,Object> deviceCountMap = jdbcTemplate.queryForMap(sql);
                if (Integer.valueOf(String.valueOf(deviceCountMap.get("num")))>0){
                    String url = wlyyService + "/healthBank/insertCredits";
                    org.json.JSONObject params = new org.json.JSONObject();
                    String creditDetail = "{\"tradeType\":\"HEALTH_TASK\",\"flag\":\"MEASURE\",\"tradeDirection\":1,\"status\":1,\"patientId\":\""+result.getUser()+"\",\"hospital\":\""+patient.getTown()+"\"}";
                    params.put("creditsDetail", creditDetail);
                    String response = HttpClientUtil.postBody(url, params);
                    com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
                    String status = jsonObject.getString("status");
                    if ("200".equals(status)){
                        List<Map<String,Object>> list = (List<Map<String,Object>>)jsonObject.get("detailModelList");
                        if (list!=null && list.size()>0){
                            String integrate = String.valueOf(list.get(0).get("integrate"));
                            //@TODO 调用发送微信模板接口
                        }
                    }
                }
	            //血糖、血压数据需校验，如果超标，需要发送消息给医生
	            if (1 == deviceType || 2 == deviceType) {
		            verifyHealthIndex(result);