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

@@ -470,6 +470,16 @@ public class DeviceService extends BaseService{
                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 调用发送微信模板接口
                    }
                }
	            //血糖、血压数据需校验，如果超标，需要发送消息给医生
	            if (1 == deviceType || 2 == deviceType) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -937,6 +937,16 @@ public class StatisticsESService {
                json.put("amount", amount);
                result.add(json);
            }
            if (saveModels!=null && saveModels.size()==1 && saveModels.get(0).getId()==null) {
                List<Map<String,Object>> resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(endDate,1)));
                result.clear();
                for (Map<String,Object> map : resultList){
                    JSONObject json = new JSONObject();
                    json.put("range", map.get("date"));
                    json.put("amount", 0);
                    result.add(json);
                }
            }
            // 排序
            result.sort(new Comparator<JSONObject>() {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/device/DoctorDeviceController.java

@@ -101,7 +101,15 @@ public class DoctorDeviceController extends BaseController {
				String creditDetail = "{\"tradeType\":\"HEALTH_TASK\",\"flag\":\"BIND\",\"tradeDirection\":1,\"status\":1,\"patientId\":\""+device.getUser()+"\",\"hospital\":\""+patient.getTown()+"\"}";
				JSONObject jsonObject = JSONObject.parseObject(creditDetail);
				JSONObject response = creditLogService.insert(jsonObject);
				System.out.println(response.toJSONString());
				String status = response.getString("status");
				if ("200".equals(status)){
                    List<Map<String,Object>> list = (List<Map<String,Object>>)response.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 调用发送微信模板接口
                    }
                }
			}
			return success("设备保存成功！");