|
|
@ -112,13 +112,25 @@ public class DoctorConsultController extends WeixinBaseController {
|
|
|
json.put("doctorPhoto", doctor.getPhoto());
|
|
|
// 设置医生sex
|
|
|
json.put("doctorSex", doctor.getSex());
|
|
|
Patient p = patientService.findByCode(consult.getPatient());
|
|
|
// 设置患者头像
|
|
|
json.put("photo", p.getPhoto());
|
|
|
if(consult.getType() == 8) {
|
|
|
Doctor d = doctorInfoService.findDoctorByCode(consult.getPatient());
|
|
|
// 设置患者头像
|
|
|
json.put("photo", d.getPhoto());
|
|
|
// 设置患者年龄
|
|
|
json.put("age", IdCardUtil.getAgeForIdcard(d.getIdcard()));
|
|
|
// 设置性别
|
|
|
json.put("sex", d.getSex());
|
|
|
} else {
|
|
|
Patient p = patientService.findByCode(consult.getPatient());
|
|
|
// 设置患者头像
|
|
|
json.put("photo", p.getPhoto());
|
|
|
// 设置患者年龄
|
|
|
json.put("age", IdCardUtil.getAgeForIdcard(p.getIdcard()));
|
|
|
// 设置性别
|
|
|
json.put("sex", p.getSex());
|
|
|
}
|
|
|
// 设置咨询标识
|
|
|
json.put("title", consult.getSymptoms());
|
|
|
// 设置患者年龄
|
|
|
json.put("age", IdCardUtil.getAgeForIdcard(p.getIdcard()));
|
|
|
// 设置评价内容
|
|
|
json.put("comment", consult.getCommentContent());
|
|
|
// 设置评价星级
|
|
|
@ -129,8 +141,6 @@ public class DoctorConsultController extends WeixinBaseController {
|
|
|
json.put("time", DateUtil.dateToStr(consult.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
|
|
|
// 咨询状态
|
|
|
json.put("status", consult.getStatus());
|
|
|
// 设置性别
|
|
|
json.put("sex", p.getSex());
|
|
|
// 未读消息
|
|
|
json.put("doctorRead", consult.getDoctorRead());
|
|
|
// 设置关联指导
|
lyr