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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/entity/DeviceHealthIndexVO.java

@@ -2,7 +2,6 @@ package com.yihu.wlyy.device.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.util.Date;
/**
@@ -30,6 +29,7 @@ public class DeviceHealthIndexVO {
    private String value6;
    private String value7;
    private String healthStandard;
    private String button;
    public DeviceHealthIndexVO() {
    }
@@ -196,4 +196,12 @@ public class DeviceHealthIndexVO {
    public void setHealthStandard(String healthStandard) {
        this.healthStandard = healthStandard;
    }
    public String getButton() {
        return button;
    }
    public void setButton(String button) {
        this.button = button;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceHealthIndexService.java

@@ -179,6 +179,7 @@ public class DeviceHealthIndexService extends BaseDeviceJpaService<DeviceHealthI
                    bean.setIdcard(bean.getIdcard().replaceAll(regex, "$1****$3"));
                }
                bean.setHealthStandard(gethealthStandard(bean.getType(),bean.getUser()).toString());
                bean.setButton(info.get("button") != null ? info.get("button") + "" : null);
                listTemp.add(bean);
            }
        }

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceHealthIndex_list.jsp

@@ -36,6 +36,9 @@
			<div class="m-form-control f-ml15">
				<input type="text" id="inp_index_type" placeholder="血糖/血压/体重/腰围" class="f-ml10" data-attr-scan="indexType"/>
			</div>
			<div class="m-form-control f-ml15 ">
				<input type="text" id="inp_doctor_name" placeholder="请输入医生/健管师名称" class="f-ml10" data-attr-scan="doctorName"/>
			</div>
			<sec:authorize url="/admin/healthIndex/list">
				<div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
					<span>查询</span>
@@ -46,9 +49,7 @@
					<span>导出</span>
				</div>
			</sec:authorize>
			<div class="m-form-control f-ml15 f-mt10">
				<input type="text" id="inp_doctor_name" placeholder="请输入医生/健管师名称" class="f-ml10" data-attr-scan="doctorName"/>
			</div>
			<div id="select-list" class="f-mt10" style="display: none">
				<div class="m-form-control f-ml15">
					<input type="text" id="search-min-1" placeholder="" class="f-ml10" data-attr-scan="indexTypeMin1"/>

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/deviceHealthIndex_list_js.jsp

@@ -196,6 +196,20 @@
									}
								}
							},
                            {
                                display: '设备绑定类型', name: 'button', width: '5%', align: "center",
                                render: function (row) {
                                    if (row.button == 1) {
                                        return "A键";
                                    }
                                    if (row.button == 2) {
                                        return "B键";
                                    }
                                    if (row.button == -1) {
                                        return "默认";
                                    }
                                }
                            },
							{display: 'value1', name: 'value1', width: '5%', align: "center",
                                render: function (row) {
                                    var standard = typeof(row.healthStandard)=='object'?row.healthStandard:JSON.parse(row.healthStandard)

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

@@ -843,7 +843,7 @@ public class SpecialistService extends BaseService {
        return null;
    }
    public JSONArray getPatientByDoctorAndDisease(String doctor, String patientInfo, String disease, String page, String size) throws Exception{
    public JSONArray getPatientByDoctorAndDisease(String doctor, String patientInfo, String disease, Integer page, Integer size) throws Exception{
        Map<String, Object> param = new HashedMap();
        param.put("doctor", doctor);
        param.put("patientInfo", patientInfo);
@@ -857,7 +857,7 @@ public class SpecialistService extends BaseService {
            e.printStackTrace();
        }
        JSONObject result = new JSONObject(response.getContent());
        if(result.getInt("status")==200){
        if(result.getInt("status") == 200){
            return result.getJSONArray("detailModelList");
        }
        throw new Exception("请求获取居民信息失败！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/HospitalServiceItemController.java

@@ -51,7 +51,8 @@ public class HospitalServiceItemController extends BaseController {
     */
    @RequestMapping(value = "/selectByIds",method = RequestMethod.GET)
    @ApiOperation(value = "根据机构id获取服务项目")
    public String selectByIds(@ApiParam(name = "ids", value = "机构服务项目id")@RequestParam(value = "hospitals")String ids){
    public String selectByIds(@ApiParam(name = "ids", value = "机构服务项目id")
                                  @RequestParam(value = "ids")String ids){
        try {
            return write(200,"获取成功！","data",specialistHospitalItemService.selectByIds(ids));
        }catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/SpecialistController.java

@@ -373,7 +373,7 @@ public class SpecialistController extends WeixinBaseController {
    @RequestMapping(value = "/getPatientInfoByDoctor", method = RequestMethod.GET)
    @ApiOperation(value = "根据医生code获取签约居民信息")
    @ApiOperation(value = "获取医生签约居民信息")
    public String getPatientInfoByDoctor(@ApiParam(name = "doctor", value = "医生标识")
                                         @RequestParam(required = true)String doctor,
                                         @ApiParam(name = "patientInfo", value = "居民信息")
@@ -381,9 +381,9 @@ public class SpecialistController extends WeixinBaseController {
                                         @ApiParam(name = "disease", value = "疾病类型")
                                             @RequestParam(required = false)String disease,
                                         @ApiParam(name = "page", value = "第几页，1开始")
                                             @RequestParam(required = true)String page,
                                             @RequestParam(required = true)Integer page,
                                         @ApiParam(name = "size", value = "每页大小")
                                             @RequestParam(required = true)String size){
                                             @RequestParam(required = true)Integer size){
        try {
            return write(200, "获取成功", "data", specialistService.getPatientByDoctorAndDisease(doctor, patientInfo, disease, page, size));
        } catch (Exception e) {