Skip to content

B
byh-family-doctor
提交 5a1beaab authored 作者: 杨凯's avatar 杨凯
浏览文件
操作

feat:家庭医生初始化

上级 a48b153a
显示空白字符变更
内嵌 并排
正在显示 包含 59 行增加 和 14 行删除
family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/bo/PatientSignInfo.java
浏览文件 @ 5a1beaab
...@@ -74,4 +74,9 @@ public class PatientSignInfo { ...@@ -74,4 +74,9 @@ public class PatientSignInfo {
* 医生职称 * 医生职称
*/ */
private String doctorProfessional; private String doctorProfessional;
/**
* 签约id
*/
private Long signedId;
} }
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/ImChatTemplateImpl.java
浏览文件 @ 5a1beaab
...@@ -8,10 +8,7 @@ import com.doctoruser.api.pojo.base.vo.doctor.PersonnelInfo; ...@@ -8,10 +8,7 @@ import com.doctoruser.api.pojo.base.vo.doctor.PersonnelInfo;
import com.doctoruser.api.pojo.vo.UserInfoByDoctorIdRespVO; import com.doctoruser.api.pojo.vo.UserInfoByDoctorIdRespVO;
import com.doctoruser.api.pojo.vo.UserInfoByUserIdRespVO; import com.doctoruser.api.pojo.vo.UserInfoByUserIdRespVO;
import com.ebaiyihui.family.doctor.common.bo.*; import com.ebaiyihui.family.doctor.common.bo.*;
import com.ebaiyihui.family.doctor.common.dto.DoctorIdDTO; import com.ebaiyihui.family.doctor.common.dto.*;
import com.ebaiyihui.family.doctor.common.dto.HealthInfoDTO;
import com.ebaiyihui.family.doctor.common.dto.ReportDetailDTO;
import com.ebaiyihui.family.doctor.common.dto.SendImMsgDTO;
import com.ebaiyihui.family.doctor.common.vo.ReportDetailItemVo; import com.ebaiyihui.family.doctor.common.vo.ReportDetailItemVo;
import com.ebaiyihui.family.doctor.common.vo.ReportDetailVo; import com.ebaiyihui.family.doctor.common.vo.ReportDetailVo;
import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants; import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants;
...@@ -161,8 +158,8 @@ public class ImChatTemplateImpl implements ImChatTemplate { ...@@ -161,8 +158,8 @@ public class ImChatTemplateImpl implements ImChatTemplate {
if (MsgTempTypeEnum.REP_INTER.getValue().equals(sendImMsgDTO.getType())) { if (MsgTempTypeEnum.REP_INTER.getValue().equals(sendImMsgDTO.getType())) {
ReportDetailDTO reportDetailDTO = new ReportDetailDTO(); ReportDetailDTO reportDetailDTO = new ReportDetailDTO();
reportDetailDTO.setThirdId(sendImMsgDTO.getThirdId()); reportDetailDTO.setThirdId(sendImMsgDTO.getThirdId());
// reportResult = thirdOrderPushUtil.getReportDetail(reportDetailDTO); reportResult = thirdOrderPushUtil.getReportDetail(reportDetailDTO);
reportResult = "{\"code\":\"200\",\"message\":\"success\",\"data\":{\"reportType\":1,\"institution\":\"瑞金医院\",\"reportFileList\":[{\"fileUrl\":\"https://pension.home.komect.com/ac-health-oss/health-container/K4aW5uWQToWj0Ty7rCUlqw?AWSAccessKeyId=82A0955SWSXVITYRB1Z4&Expires=4070880000&Signature=Efrj6X4BI%2BtYlcdjoGboaJhedE0%3D\",\"fileType\":1}],\"reportName\":\"验血报告\",\"createTime\":\"2024-03-26 19:29:28\",\"examinationTime\":\"2024-03-26\"},\"time\":1711530711174}"; // reportResult = "{\"code\":\"200\",\"message\":\"success\",\"data\":{\"reportType\":1,\"institution\":\"瑞金医院\",\"reportFileList\":[{\"fileUrl\":\"https://pension.home.komect.com/ac-health-oss/health-container/K4aW5uWQToWj0Ty7rCUlqw?AWSAccessKeyId=82A0955SWSXVITYRB1Z4&Expires=4070880000&Signature=Efrj6X4BI%2BtYlcdjoGboaJhedE0%3D\",\"fileType\":1}],\"reportName\":\"验血报告\",\"createTime\":\"2024-03-26 19:29:28\",\"examinationTime\":\"2024-03-26\"},\"time\":1711530711174}";
} }
for (int i = 0; i < componentsList.size(); i++) { for (int i = 0; i < componentsList.size(); i++) {
String content = componentsList.get(i).getContent(); String content = componentsList.get(i).getContent();
...@@ -187,7 +184,7 @@ public class ImChatTemplateImpl implements ImChatTemplate { ...@@ -187,7 +184,7 @@ public class ImChatTemplateImpl implements ImChatTemplate {
imageMap.put("UserAction", CommonConstants.USER_ACTION); imageMap.put("UserAction", CommonConstants.USER_ACTION);
imageMap.put("applicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE); imageMap.put("applicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
imageMap.put("appointmentId", sendImMsgDTO.getAdmId()); imageMap.put("appointmentId", sendImMsgDTO.getAdmId());
imageMap.put("attacheUrl", patientSignInfo.getDoctorHeadPortrait()); imageMap.put("attacheUrl", reportDetailItemVos.get(0).getFileUrl());
imageMap.put("businessCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE); imageMap.put("businessCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
imageMap.put("doctorHeadUrl", patientSignInfo.getDoctorHeadPortrait()); imageMap.put("doctorHeadUrl", patientSignInfo.getDoctorHeadPortrait());
imageMap.put("doctorName", patientSignInfo.getDoctorName()); imageMap.put("doctorName", patientSignInfo.getDoctorName());
...@@ -212,6 +209,18 @@ public class ImChatTemplateImpl implements ImChatTemplate { ...@@ -212,6 +209,18 @@ public class ImChatTemplateImpl implements ImChatTemplate {
} else if (MsgTempTypeEnum.REP_ANO.getValue().equals(sendImMsgDTO.getType())) { // 报告异常特殊处理 } else if (MsgTempTypeEnum.REP_ANO.getValue().equals(sendImMsgDTO.getType())) { // 报告异常特殊处理
content = MessageFormat.format(content, patientSignInfo.getDoctorName(), sendImMsgDTO.getIntention()); content = MessageFormat.format(content, patientSignInfo.getDoctorName(), sendImMsgDTO.getIntention());
} else if (MsgTempTypeEnum.AFTER_HEAL_ASSE.getValue().equals(sendImMsgDTO.getType())) { // 健康评估后特殊处理
MasterUrlDTO masterUrlDTO = new MasterUrlDTO();
masterUrlDTO.setPhone(patientSignInfo.getPatientPhone());
masterUrlDTO.setSignSeqId(String.valueOf(patientSignInfo.getSignedId()));
masterUrlDTO.setType("2");
String masterResult = thirdOrderPushUtil.getMasterUrl(masterUrlDTO);
if (!StringUtils.isEmpty(masterResult)) {
Result<String> muResult = JSON.parseObject(masterResult, Result.class);
if (muResult.isSuccess()) {
content = MessageFormat.format(content, muResult.getData());
}
}
} else { } else {
if (!StringUtils.isEmpty(sendImMsgDTO.getOldAdmId())) { if (!StringUtils.isEmpty(sendImMsgDTO.getOldAdmId())) {
if (MsgTempTypeEnum.UP_SUC.getValue().equals(sendImMsgDTO.getType())) { if (MsgTempTypeEnum.UP_SUC.getValue().equals(sendImMsgDTO.getType())) {
...@@ -227,6 +236,17 @@ public class ImChatTemplateImpl implements ImChatTemplate { ...@@ -227,6 +236,17 @@ public class ImChatTemplateImpl implements ImChatTemplate {
if (hssResult.isSuccess() && CommonConstants.STATUS_VALID.equals(hssResult.getData())) { if (hssResult.isSuccess() && CommonConstants.STATUS_VALID.equals(hssResult.getData())) {
continue; continue;
} }
MasterUrlDTO masterUrlDTO = new MasterUrlDTO();
masterUrlDTO.setPhone(patientSignInfo.getPatientPhone());
masterUrlDTO.setSignSeqId(String.valueOf(patientSignInfo.getSignedId()));
masterUrlDTO.setType("3");
String masterResult = thirdOrderPushUtil.getMasterUrl(masterUrlDTO);
if (!StringUtils.isEmpty(masterResult)) {
Result<String> muResult = JSON.parseObject(masterResult, Result.class);
if (muResult.isSuccess()) {
content = MessageFormat.format(content, muResult.getData());
}
}
} }
} }
} else { } else {
...@@ -289,6 +309,8 @@ public class ImChatTemplateImpl implements ImChatTemplate { ...@@ -289,6 +309,8 @@ public class ImChatTemplateImpl implements ImChatTemplate {
PatientSignInfo patientSignInfo = new PatientSignInfo(); PatientSignInfo patientSignInfo = new PatientSignInfo();
BeanUtils.copyProperties(patientSignEntity, patientSignInfo); BeanUtils.copyProperties(patientSignEntity, patientSignInfo);
patientSignInfo.setSignedId(patientSignEntity.getId());
// 获取医生基本信息 // 获取医生基本信息
QueryPersonnelInfoReq queryPersonnelInfoReq = new QueryPersonnelInfoReq(); QueryPersonnelInfoReq queryPersonnelInfoReq = new QueryPersonnelInfoReq();
queryPersonnelInfoReq.setDoctorId(String.valueOf(patientSignEntity.getDoctorId())); queryPersonnelInfoReq.setDoctorId(String.valueOf(patientSignEntity.getDoctorId()));
......
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientSignServiceImpl.java
浏览文件 @ 5a1beaab
...@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doctoruser.api.pojo.base.dto.doctor.QueryPersonnelInfoReq; import com.doctoruser.api.pojo.base.dto.doctor.QueryPersonnelInfoReq;
import com.doctoruser.api.pojo.base.vo.doctor.PersonnelInfo; import com.doctoruser.api.pojo.base.vo.doctor.PersonnelInfo;
import com.ebaiyihui.family.doctor.common.bo.Result; import com.ebaiyihui.family.doctor.common.bo.Result;
import com.ebaiyihui.family.doctor.common.dto.ImAccountReqDTO; import com.ebaiyihui.family.doctor.common.dto.*;
import com.ebaiyihui.family.doctor.common.dto.ImInfoDetailDocReqDTO;
import com.ebaiyihui.family.doctor.common.dto.ImInfoListDocReqDTO;
import com.ebaiyihui.family.doctor.common.dto.MasterUrlDTO;
import com.ebaiyihui.family.doctor.common.vo.*; import com.ebaiyihui.family.doctor.common.vo.*;
import com.ebaiyihui.family.doctor.server.common.constants.IMInformConstants; import com.ebaiyihui.family.doctor.server.common.constants.IMInformConstants;
import com.ebaiyihui.family.doctor.server.common.constants.ImConstants; import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
...@@ -137,7 +134,18 @@ public class PatientSignServiceImpl implements PatientSignService { ...@@ -137,7 +134,18 @@ public class PatientSignServiceImpl implements PatientSignService {
.build(); .build();
// 患者信息 // 患者信息
resVo.setPatientName(patientSignEntity.getPatientName()); resVo.setPatientName(patientSignEntity.getPatientName());
// 查询患者头像
resVo.setPatientPortrait(""); resVo.setPatientPortrait("");
UserInfoDTO userInfoDTO = new UserInfoDTO();
userInfoDTO.setPhone(patientSignEntity.getPatientPhone());
String userPicResult = thirdOrderPushUtil.getUserPic(userInfoDTO);
if (StringUtils.isNotEmpty(userPicResult)) {
Result<String> upResult = JSON.parseObject(userPicResult, Result.class);
if (upResult.isSuccess()) {
resVo.setPatientPortrait(upResult.getData());
}
}
resVo.setDoctorId(patientSignEntity.getDoctorId()); resVo.setDoctorId(patientSignEntity.getDoctorId());
...@@ -240,6 +248,15 @@ public class PatientSignServiceImpl implements PatientSignService { ...@@ -240,6 +248,15 @@ public class PatientSignServiceImpl implements PatientSignService {
patientInfoVo.setCredNo(patientEntity.getCredNo()); patientInfoVo.setCredNo(patientEntity.getCredNo());
patientInfoVo.setPatientUserId(patientSignEntity.getPatientUserId()); patientInfoVo.setPatientUserId(patientSignEntity.getPatientUserId());
patientInfoVo.setPortrait(""); patientInfoVo.setPortrait("");
UserInfoDTO userInfoDTO = new UserInfoDTO();
userInfoDTO.setPhone(patientSignEntity.getPatientPhone());
String userPicResult = thirdOrderPushUtil.getUserPic(userInfoDTO);
if (StringUtils.isNotEmpty(userPicResult)) {
Result<String> upResult = JSON.parseObject(userPicResult, Result.class);
if (upResult.isSuccess()) {
patientInfoVo.setPortrait(upResult.getData());
}
}
resVo.setPatientInfo(patientInfoVo); resVo.setPatientInfo(patientInfoVo);
// 获取医生基本信息 // 获取医生基本信息
......
family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/util/ThirdOrderPushUtil.java
浏览文件 @ 5a1beaab
...@@ -216,16 +216,17 @@ public class ThirdOrderPushUtil { ...@@ -216,16 +216,17 @@ public class ThirdOrderPushUtil {
* *
* @param userInfoDTO * @param userInfoDTO
*/ */
public void getUserPic(UserInfoDTO userInfoDTO) { public String getUserPic(UserInfoDTO userInfoDTO) {
String result = "";
try { try {
String param = JSONObject.toJSONString(userInfoDTO); String param = JSONObject.toJSONString(userInfoDTO);
log.info("getUserPic请求入参{}", param); log.info("getUserPic请求入参{}", param);
String result = HttpKit.jsonPost(projProperties.getFamilyDoctorThirdUrl() + UrlConstants.USER_PIC_URL, param, getThirdHead(userInfoDTO)); result = HttpKit.jsonPost(projProperties.getFamilyDoctorThirdUrl() + UrlConstants.USER_PIC_URL, param, getThirdHead(userInfoDTO));
log.info("getUserPic请求返参{}", param); log.info("getUserPic请求返参{}", param);
} catch (Exception e) { } catch (Exception e) {
log.error("getUserPic请求失败：{}", e); log.error("getUserPic请求失败：{}", e);
} }
return result;
} }
/** /**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论