Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/device/entity/DeviceDetail.java

@@ -41,6 +41,10 @@ public class DeviceDetail extends IdEntity{
    private String bindingCount;//绑定次数（{"1":"0", "2":"0"}）
    private Date grantTime;//发放时间
    //1.5.0版本新增字段
    private String grantDoctor;//发放医生code
    private String grantDoctorName;//发放医生姓名
    /** default constructor */
    public DeviceDetail() {
    }
@@ -282,4 +286,22 @@ public class DeviceDetail extends IdEntity{
    public void setGrantTime(Date grantTime) {
        this.grantTime = grantTime;
    }
    @Column(name = "grant_doctor")
    public String getGrantDoctor() {
        return grantDoctor;
    }
    public void setGrantDoctor(String grantDoctor) {
        this.grantDoctor = grantDoctor;
    }
    @Column(name = "grant_doctor_name")
    public String getGrantDoctorName() {
        return grantDoctorName;
    }
    public void setGrantDoctorName(String grantDoctorName) {
        this.grantDoctorName = grantDoctorName;
    }
}

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-service/wlyy_device/src/main/java/com/yihu/hos/device/service/AsyncService.java

@@ -145,9 +145,9 @@ public class AsyncService extends BaseService{
                } else { //餐前
                    if (!checkHealthIndex(NumberUtils.toDouble(value1), maxValueBefore, minValueBefore)) {
                        msgContentTemp += patient.getName() + "血糖异常（" + value1 + "mmol/L），请处理";
                        if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==1){
                        if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueBefore ,minValueBefore)==1){
                            msgContent = "<a>"+patient.getName()+"</a><span style=\"color: #FF4C4C;\">血糖偏高</span>";
                        }else if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueAfter ,minValueAfter)==2){
                        }else if(checkHealthIndexDetail(NumberUtils.toDouble(value1), maxValueBefore ,minValueBefore)==2){
                            msgContent = "<a>"+patient.getName()+"</a><span style=\"color: #FF4C4C;\">血糖偏低</span>";
                        }
                        //体征异常，更新体征数据状态
@@ -245,28 +245,45 @@ public class AsyncService extends BaseService{
        if (signFamily != null) {
            healthDoctorFamily = signFamily.getDoctorHealth();
            doctorFamily = signFamily.getDoctor();
            if (StringUtils.isNotEmpty(healthDoctorFamily)) {
            if (StringUtils.isNotEmpty(healthDoctorFamily) && StringUtils.isNotEmpty(doctorFamily)){
                // 添加到消息接收人列表
                if (doctorFamily.equals(healthDoctorFamily)){
                    logger.info("-------------健管师和家医同一个人-------------");
                    receivers.add(healthDoctorFamily);
                }else {
                    logger.info("-------------健管师和家医不是同一个人-------------");
                    receivers.add(healthDoctorFamily);
                    receivers.add(doctorFamily);
                }
            }else if (StringUtils.isNotEmpty(healthDoctorFamily) && StringUtils.isEmpty(doctorFamily)){
                logger.info("-------------家医为空-------------");
                receivers.add(healthDoctorFamily);
            }else if (StringUtils.isNotEmpty(doctorFamily) && StringUtils.isEmpty(healthDoctorFamily)){
                logger.info("-------------健管师为空-------------");
                receivers.add(doctorFamily);
            }
            /*if (StringUtils.isNotEmpty(healthDoctorFamily)) {
                // 添加到消息接收人列表
                receivers.add(healthDoctorFamily);
            }
            if (StringUtils.isNotEmpty(doctorFamily)){
                // 添加到消息接收人列表
                receivers.add(doctorFamily);
            }
            }*/
        }
        // 查询病人三师签约中的健康管理师
        SignFamily signFamilySS = signFamilyDao.findBySanshiPatientYes(patientCode);
        if (signFamilySS != null) {
            String healthDoctorTeam = signFamilySS.getDoctorHealth();
            // 判断是否是否是同一个健康管理师
            if (StringUtils.isNotEmpty(healthDoctorTeam) && !StringUtils.equals(healthDoctorFamily, healthDoctorTeam)) {
                // 添加到消息接收人列表
                receivers.add(healthDoctorTeam);
            }
            if (StringUtils.isNotEmpty(signFamilySS.getDoctor())&& !StringUtils.equals(doctorFamily, signFamilySS.getDoctor())){
                receivers.add(signFamilySS.getDoctor());
            }
        }
//        SignFamily signFamilySS = signFamilyDao.findBySanshiPatientYes(patientCode);
//        if (signFamilySS != null) {
//            String healthDoctorTeam = signFamilySS.getDoctorHealth();
//            // 判断是否是否是同一个健康管理师
//            if (StringUtils.isNotEmpty(healthDoctorTeam) && !StringUtils.equals(healthDoctorFamily, healthDoctorTeam)) {
//                // 添加到消息接收人列表
//                receivers.add(healthDoctorTeam);
//            }
//            if (StringUtils.isNotEmpty(signFamilySS.getDoctor())&& !StringUtils.equals(doctorFamily, signFamilySS.getDoctor())){
//                receivers.add(signFamilySS.getDoctor());
//            }
//        }
        List<Message> messages = new ArrayList<Message>();
        JSONArray array = new JSONArray();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/disease/PatientDiseaseService.java

@@ -497,7 +497,13 @@ public class PatientDiseaseService extends BaseService {
            }
        }
    }
    
    /**
     * 根据居民关联获取标签信息
     * @param doctor
     * @param teamCode
     * @return
     */
    public List<Map<String,Object>> getPatientDiseaseCount(String doctor, Long teamCode) {
        String sql ="SELECT " +
                "count(b.id) AS count," +
@@ -505,7 +511,7 @@ public class PatientDiseaseService extends BaseService {
                "b.disease AS label " +
                "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
                "JOIN wlyy.wlyy_patient_disease_server b ON a.patient=b.patient and b.del=1 " +
                "WHERE a.sign_status> 0 AND a.`status`>=0 " +
                "WHERE a.sign_status> 0 AND a.`status`>=0 AND b.del =1 " +
                "AND a.doctor='"+doctor+"' " +
                "GROUP BY b.disease";
    
@@ -518,4 +524,24 @@ public class PatientDiseaseService extends BaseService {
        
        return result;
    }
    /**
     * 根据专病关联id进行关联获取标签
     * @param doctor
     * @return
     */
    public List<Map<String,Object>> getPatientDiseaseCount(String doctor) {
        String sql ="SELECT " +
                "count(b.id) AS count," +
                "b.disease_name AS labelName," +
                "b.disease AS label " +
                "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
                "JOIN wlyy.wlyy_patient_disease_server b ON a.id = b.specialist_relation_code and b.del=1 " +
                "WHERE a.sign_status> 0 AND a.`status`>=0 AND b.del =1 " +
                "AND a.doctor='"+doctor+"' " +
                "GROUP BY b.disease";
        List<Map<String,Object>> result =  jdbcTemplate.queryForList(sql);
        return result;
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.wlyy.service.specialist;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.http.HttpResponse;
@@ -28,8 +29,10 @@ public class RehabilitationPlanService extends BaseService {
    private String specialistUrl;
    @Autowired
    private AdminTeamService teamService;
    @Autowired
    private SpecialistEvaluateSevice specialistEvaluateSevice;
    public JSONObject findTemplateInfo(String doctor, String patient) {
    public JSONArray findTemplateInfo(String doctor, String patient) throws Exception {
        Map<String, Object> param = new HashedMap();
        Long adminTeamId = null;
        AdminTeam team = teamService.findByLeaderCode(doctor);
@@ -47,10 +50,13 @@ public class RehabilitationPlanService extends BaseService {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        return rs;
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("detailModelList");
        }
        throw new Exception("请求获取模板列表失败!");
    }
    public JSONObject findTemplateDetailInfo(String templateId) {
    public JSONArray findTemplateDetailInfo(String templateId) throws Exception {
        Map<String, Object> param = new HashedMap();
        param.put("templateId", templateId);
        HttpResponse response = null;
@@ -60,10 +66,13 @@ public class RehabilitationPlanService extends BaseService {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        return rs;
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("detailModelList");
        }
        throw new Exception("请求获取模板明细列表失败!");
    }
    public String createTemplate(String title, Doctor doctor, Long teamId) {
    public String createTemplate(String title, Doctor doctor, Long teamId) throws Exception {
        JSONObject json = new JSONObject();
        json.put("title", title);
        json.put("adminTeamCode", teamId);
@@ -124,7 +133,7 @@ public class RehabilitationPlanService extends BaseService {
        return rs.getString("message");
    }
    public JSONObject findServiceItemsByHospital(String doctorHospital, String signHospital) {
    public JSONArray findServiceItemsByHospital(String doctorHospital, String signHospital) throws Exception {
        Map<String, Object> param = new HashedMap();
        param.put("doctorHospital", doctorHospital);
        param.put("signHospital", signHospital);
@@ -135,11 +144,15 @@ public class RehabilitationPlanService extends BaseService {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        return rs;
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("detailModelList");
        }
        throw new Exception("请求获取机构服务项目列表失败!");
    }
    public String createRehabilitationPlan(String json, Doctor doctor) {
        JSONObject object = new JSONObject(json);
        String patient = object.getString("patient");
        object.put("createUser", doctor.getCode());
        object.put("createUserName", doctor.getName());
        Map<String, Object> param = new HashedMap();
@@ -151,6 +164,17 @@ public class RehabilitationPlanService extends BaseService {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        JSONArray detailModelList = (JSONArray) rs.get("detailModelList");
        //康复计划创建完给执行者发送消息
        for (Object obj : detailModelList){
            JSONObject detail = new JSONObject(obj);
            Message message = new Message();
            message.setSender(doctor.getCode());
            message.setType(19);
            message.setRelationCode(detail.getString("planId"));
            message.setReceiver(detail.getString("doctor"));
            specialistEvaluateSevice.sendMessage(message, detail.getString("hospital"), patient,null);
        }
        return rs.getString("message");
    }
@@ -167,25 +191,6 @@ public class RehabilitationPlanService extends BaseService {
        return rs.getString("message");
    }
    /**
     * 根据医生code获取签约居民信息
     * @param doctor
     * @return
     */
    public JSONObject getPatientInfoByDoctor(String doctor, String patientInfo) {
        Map<String, Object> param = new HashedMap();
        param.put("doctor", doctor);
        param.put("patientInfo", patientInfo);
        HttpResponse response = null;
        try {
            response = HttpUtils.doGet(specialistUrl + "svr-specialist/getPatientAndDiseaseByDoctor", param);
        } catch (Exception e) {
            e.printStackTrace();
        }
        JSONObject rs = new JSONObject(response.getContent());
        return rs;
    }
    /**
     * 更新计划的状态
     * @param planId

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

@@ -23,7 +23,6 @@ import com.yihu.wlyy.repository.specialist.SpecialDiseaseDao;
import com.yihu.wlyy.repository.specialist.TeamDiseaseRelationDao;
import com.yihu.wlyy.repository.wechat.WechatTemplateConfigDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.service.app.label.SignPatientLabelService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
@@ -283,7 +282,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getPatientByLabel", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;
@@ -843,5 +842,25 @@ public class SpecialistService extends BaseService {
        }
        return null;
    }
    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);
        param.put("disease", disease);
        param.put("page", page);
        param.put("size", size);
        HttpResponse response = null;
        try {
            response = HttpUtils.doGet(specialistUrl + "svr-specialist/getPatientAndDiseaseByDoctor", param);
        } catch (Exception e) {
            e.printStackTrace();
        }
        JSONObject result = new JSONObject(response.getContent());
        if(result.getInt("status") == 200){
            return result.getJSONArray("detailModelList");
        }
        throw new Exception("请求获取居民信息失败！");
    }
}

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

@@ -209,10 +209,19 @@ public class RehabilitationManageService extends BaseService {
     */
    public JSONObject serviceItem(String planDetailId) throws Exception{
        Map<String, Object> param = new HashedMap();
        param.put("planDetailIds", planDetailId);
        param.put("planDetailId", planDetailId);
        HttpResponse response = HttpUtils.doGet(specialistUrl + serviceItem, param);
        JSONObject result = new JSONObject(response.getContent());
        if(result.getInt("status")==200){
            String patient = result.getJSONObject("obj").get("patient")+"";
            List<SignFamily> list = signFamilyDao.findByPatientAndExpensesStatusAndStatus(patient,"1",1);
            if(list.size()>0){
                result.getJSONObject("obj").put("familyDoctorCode",list.get(0).getDoctor());
                result.getJSONObject("obj").put("familyDoctorName",list.get(0).getDoctorName());
            }else{
                result.getJSONObject("obj").put("familyDoctorCode","");
                result.getJSONObject("obj").put("familyDoctorName","");
            }
            return result.getJSONObject("obj");
        }
        throw new Exception("请求微服务失败！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java

@@ -666,4 +666,27 @@ public class DataHandingService {
        }
        return errorList;
    }
    @Transactional(rollbackFor = Exception.class)
    public void updateDeviceGrantDoctor()throws Exception{
        String sql ="SELECT" +
                " wd.device_code,s.* FROM device.wlyy_devices wd" +
                " LEFT JOIN (" +
                " SELECT wat.id, d.`code`, d.`name` FROM wlyy.wlyy_admin_team wat" +
                " LEFT JOIN wlyy.wlyy_doctor d ON wat.leader_code = d.`code`" +
                " WHERE available = 1" +
                ") s ON wd.grant_admin_team = s.id" +
                " WHERE  wd.is_grant = 1 AND wd.grant_admin_team IN(SELECT id from wlyy.wlyy_admin_team where available=1)";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        List<String> sqlList = new ArrayList<>();
        for (Map<String,Object> map : list){
            String updateSql ="update device.wlyy_devices set grant_doctor='"+String.valueOf(map.get("code"))+"'," +
                    " grant_doctor_name='"+String.valueOf(map.get("name"))+"'"+
                    " where device_code='"+String.valueOf(map.get("device_code"))+"'";
            sqlList.add(updateSql);
        }
        String[] sqlStr = new String[sqlList.size()];
        sqlStr = sqlList.toArray(sqlStr);
        jdbcTemplate.batchUpdate(sqlStr);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -361,4 +361,26 @@ public class DataHandlingController extends BaseController {
            return write(-1,"导入数据失败！");
        }
    }
    @RequestMapping(value = "/updateDeviceGrantDoctor",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("清洗device库加上发放医生的code和姓名为团队长的数据")
    public String updateDeviceGrantDoctor(){
        try{
            dataHandingService.updateDeviceGrantDoctor();
            return write(200,"清洗数据成功！");
        }catch (Exception e){
            System.out.println(e.getMessage());
            e.printStackTrace();
            return write(-1,"清洗数据失败！");
        }
    }
    @RequestMapping(value = "/addHealthActivitRecord",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("将之前没有增加的首绑活动积分完善")
    public String addHealthActivitRecord(){
        return  "";
    }
}

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

@@ -3,6 +3,7 @@ package com.yihu.wlyy.web.doctor.specialist;
import com.alibaba.fastjson.JSONArray;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabelInfo;
import com.yihu.wlyy.service.app.disease.PatientDiseaseService;
import com.yihu.wlyy.service.specialist.SpecialistService;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
@@ -27,6 +28,8 @@ public class SpecialistController extends WeixinBaseController {
    @Autowired
    private SpecialistService specialistService;
    @Autowired
    private PatientDiseaseService patientDiseaseService;
    @RequestMapping(value = "setPatientLabelInfo", method = RequestMethod.POST)
    @ApiOperation("设置居民标签")
@@ -88,6 +91,17 @@ public class SpecialistController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "findLabelAndPatientCountByDoctor", method = RequestMethod.GET)
    @ApiOperation("根据医生获取标签与居民数量")
    public String findLabelAndPatientCount(@ApiParam(name = "doctor", value = "医生") @RequestParam(required = true) String doctor) {
        try {
            return write(200, "获取成功", "data", patientDiseaseService.getPatientDiseaseCount(doctor));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
    @RequestMapping(value = "findSpecialistPatientRelationCout", method = RequestMethod.GET)
    @ApiOperation("获取专科医生下未分配标签居民数目")
    public String findSpecialistPatientRelationCout(@ApiParam(name = "doctor", value = "医生code") @RequestParam(required = true) String doctor) {
@@ -357,4 +371,25 @@ public class SpecialistController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/getPatientInfoByDoctor", method = RequestMethod.GET)
    @ApiOperation(value = "获取医生签约居民信息")
    public String getPatientInfoByDoctor(@ApiParam(name = "doctor", value = "医生标识")
                                         @RequestParam(required = true)String doctor,
                                         @ApiParam(name = "patientInfo", value = "居民信息")
                                         @RequestParam(required = false)String patientInfo,
                                         @ApiParam(name = "disease", value = "疾病类型")
                                             @RequestParam(required = false)String disease,
                                         @ApiParam(name = "page", value = "第几页，1开始")
                                             @RequestParam(required = true)Integer page,
                                         @ApiParam(name = "size", value = "每页大小")
                                             @RequestParam(required = true)Integer size){
        try {
            return write(200, "获取成功", "data", specialistService.getPatientByDoctorAndDisease(doctor, patientInfo, disease, page, size));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
}

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

@@ -336,11 +336,11 @@ public class DoctorRehabilitationManageController extends BaseController {
    }
    @RequestMapping(value = "updateNoteAndImageRehabilitationOperate", method = RequestMethod.POST)
    @ApiOperation("康复管理-康复计划完成时更新服务完成笔记和图片接口")
    @ApiOperation("康复管理-康复计划完成时更新服务完成笔记和图片接口并且确认完成")
    @ObserverRequired
    public String updateNoteAndImageRehabilitationOperate(@ApiParam(name = "planDetailId", value = "康复计划项目明细ID")@RequestParam(value = "planDetailId", required = true)String planDetailId,
                                                          @ApiParam(name = "node", value = "服务完成笔记", required = true)@RequestParam(value = "node", required = true)String node,
                                                          @ApiParam(name = "image", value = "相关记录图片，json格式", required = true)@RequestParam(value = "image", required = true)String image){
                                                          @ApiParam(name = "node", value = "服务完成笔记", required = false)@RequestParam(value = "node", required = true)String node,
                                                          @ApiParam(name = "image", value = "相关记录图片，json格式", required = false)@RequestParam(value = "image", required = true)String image){
        try {
            JSONObject result = rehabilitationManageService.updateNodeAndRelationRecordImg(planDetailId, node, image);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/PatientFamilyController.java

@@ -81,4 +81,15 @@ public class PatientFamilyController extends BaseController {
            return error(-1, "更新失败！"+e.getMessage());
        }
    }
    @RequestMapping("/findSignFamilyByPatient")
    @ApiOperation("根据居民id获取家签信息")
    public String findSignFamilyByPatient(String patient) {
        try {
            return write(200, "查询成功!", "data", familyService.findByPatient(patient));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/specialist/ThirdRehabilitationPlanController.java

@@ -142,17 +142,4 @@ public class ThirdRehabilitationPlanController extends BaseController {
        }
    }
    @RequestMapping(value = "/getPatientInfoByDoctor", method = RequestMethod.GET)
    @ApiOperation(value = "根据医生code获取签约居民信息")
    public String getPatientInfoByDoctor(@ApiParam(name = "doctor", value = "医生标识")
                                         @RequestParam(required = true)String doctor,
                                         @ApiParam(name = "patientInfo", value = "居民信息")
                                         @RequestParam(required = false)String patientInfo){
        try {
            return write(200, "获取成功", "data", rehabilitationPlanService.getPatientInfoByDoctor(doctor, patientInfo));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
}

patient-co/patient-co-wlyy/src/main/resources/application-dev.yml

@@ -204,9 +204,9 @@ activemq:
##如果是外网项目就是flase 内网是true
neiwang:
  enable: false
  enable: true
  #wlyy: http://59.61.92.90:8072/wlyy
  wlyy: http://192.168.131.131:8080/
  wlyy: http://172.19.103.54:22122/
#系统中使用的双层对称加密使用到的KEY
Riva: