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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/PatientHealthIndexService.java

@@ -402,7 +402,7 @@ public class PatientHealthIndexService extends BaseService {
            }
            // 舒张压
            if (!checkHealthIndex(NumberUtils.toDouble(value2), maxValueSZY, minValueSZY)) {
                msgContent += "血压超标，舒张压" + value1 + "，参考范围：" + minValueSSY + " ~ " + maxValueSSY + ";\n";
                msgContent += "血压超标，舒张压" + value2 + "，参考范围：" + minValueSZY + " ~ " + maxValueSZY + ";\n";
            }
        }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -10,12 +10,14 @@ import javax.print.Doc;
import javax.transaction.Transactional;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabelInfo;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.consult.ConsultDao;
import com.yihu.wlyy.repository.consult.ConsultTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.app.team.AdminTeamService;
@@ -56,6 +58,8 @@ public class TalkGroupService extends BaseService {
    PatientDao patientDao;
    @Autowired
    private ConsultDao consultDao;
    @Autowired
    private ConsultTeamDao consultTeamDao;
    /**
     * 讨论组保存
@@ -1111,9 +1115,9 @@ public class TalkGroupService extends BaseService {
        return discussionGroupDao.findByConsult(consult);
    }
    public Consult findConsultByGroup(String groupCode) {
    public ConsultTeam findConsultByGroup(String groupCode) {
        WlyyTalkGroup w=discussionGroupDao.findByCode(groupCode);
        return consultDao.findByCode(w.getConsultCode());
        return consultTeamDao.findByConsult(w.getConsultCode());
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -3,12 +3,14 @@ package com.yihu.wlyy.web.doctor.discussion;
import java.util.*;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroup;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
@@ -623,9 +625,40 @@ public class DoctorDiscussionGroupController extends BaseController {
    @ResponseBody
    public String getConsultByGroupCode(String groupCode) {
        try {
           Consult consult= talkGroupService.findConsultByGroup(groupCode);
            return write(200, "查询成功", "data", new JSONObject(consult));
            ConsultTeam consult= talkGroupService.findConsultByGroup(groupCode);
            JSONObject json = new JSONObject();
            json.put("id", consult.getId());
            // 设置咨询标识
            json.put("consult", consult.getConsult());
            // 设置患者标识
            json.put("patient", consult.getPatient());
            // 设置患者头像
            json.put("photo", consult.getPhoto());
            // 设置咨询标识
            json.put("title", consult.getSymptoms());
            // 设置患者姓名
            json.put("name", consult.getName());
            // 设置患者年龄
            json.put("age", DateUtil.getAgeByBirthday(consult.getBirthday()));
            // 设置评价内容
            json.put("comment", consult.getCommentContent());
            // 设置评价星级
            json.put("star", consult.getCommentStar());
            // 设置咨询类型：1三师咨询，2家庭医生咨询 6名医咨询
            json.put("type", consult.getType());
            // 设置咨询时间
            json.put("time", DateUtil.dateToStr(consult.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
            // 咨询状态
            json.put("status", consult.getStatus());
            // 设置性别
            json.put("sex", consult.getSex());
            // 未读消息
            json.put("doctorRead", consult.getDoctorRead());
            // 设置关联指导
            json.put("guidance", consult.getGuidance());
            json.put("startId", consult.getStartMsgId());
            json.put("endId", consult.getEndMsgId());
            return write(200, "查询成功", "data", json);
        } catch (Exception e) {
            return error(-1, "查询失败");
        }