feat:家庭医生初始化

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/vo/SignedDoctorVo.java

+package com.ebaiyihui.family.doctor.common.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName: SignedDoctorVo
+ * @Author:yanliang
+ * @Date:2024/3/25 09:04
+ * @Description
+ */
+@Data
+public class SignedDoctorVo {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("签约编号")
+    private String admId;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+    @ApiModelProperty("平台code")
+    private String appCode;
+
+    @ApiModelProperty("组织id")
+    private Long organId;
+
+    @ApiModelProperty("组织名称")
+    private String organName;
+
+    @ApiModelProperty("患者id")
+    private String patientId;
+
+    @ApiModelProperty("患者im用户id")
+    private String patientUserId;
+
+    @ApiModelProperty("患者名称")
+    private String patientName;
+
+    @ApiModelProperty("患者手机号码")
+    private String patientPhone;
+
+    @ApiModelProperty("身份证号码")
+    private String credNo;
+
+    @ApiModelProperty("医生id")
+    private Long doctorId;
+
+    @ApiModelProperty("医生名称")
+    private String doctorName;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("签约状态1.未签约2.已签约3：已解约")
+    private Integer signStatus;
+
+    @ApiModelProperty("改签状态1、正常2、已改签")
+    private Integer subStatus;
+
+    @ApiModelProperty("业务状态2:进行中3:已完成4:已过期")
+    private Integer status;
+
+    @ApiModelProperty("权益包id")
+    private String packageOrderId;
+
+    @ApiModelProperty("签名结束时间")
+    private Date signEndTime;
+
+    @ApiModelProperty("签约关联id")
+    private Long signId;
+
+    @ApiModelProperty("医生头像")
+    private String doctorPortrait;
+
+    @ApiModelProperty("医生擅长")
+    private String doctorProfession;
+}

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/controller/PatientController.java

 package com.ebaiyihui.family.doctor.server.controller;
 
 import com.ebaiyihui.family.doctor.common.dto.SignedDoctorDTO;
-import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
+import com.ebaiyihui.family.doctor.common.vo.SignedDoctorVo;
 import com.ebaiyihui.family.doctor.server.service.PatientService;
 import com.ebaiyihui.framework.response.BaseResponse;
 import io.swagger.annotations.Api;
@@ -46,11 +46,11 @@ public class PatientController {
 
     @ApiOperation(value = "获取签约医生信息", notes = "医生服务feign调用")
     @RequestMapping(value = "/getSignedDoctor", method = RequestMethod.POST)
-    public BaseResponse<PatientSignEntity> getSignedDoctor(@RequestBody SignedDoctorDTO reqVo,
+    public BaseResponse<SignedDoctorVo> getSignedDoctor(@RequestBody SignedDoctorDTO reqVo,
                                                         BindingResult bindingResult) {
 
 
-        BaseResponse<PatientSignEntity> response = null;
+        BaseResponse<SignedDoctorVo> response = null;
         try {
             response = patientService.getSignedDoctor(reqVo);
         } catch (Exception e) {

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/PatientService.java

 package com.ebaiyihui.family.doctor.server.service;
 
 import com.ebaiyihui.family.doctor.common.dto.SignedDoctorDTO;
-import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
+import com.ebaiyihui.family.doctor.common.vo.SignedDoctorVo;
 import com.ebaiyihui.framework.response.BaseResponse;
 
 /**
@@ -15,5 +15,5 @@ public interface PatientService {
 
     BaseResponse<String> signedDoctor(SignedDoctorDTO reqVo);
 
-    BaseResponse<PatientSignEntity> getSignedDoctor(SignedDoctorDTO reqVo);
+    BaseResponse<SignedDoctorVo> getSignedDoctor(SignedDoctorDTO reqVo);
 }

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -2,9 +2,12 @@ package com.ebaiyihui.family.doctor.server.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.doctoruser.api.pojo.base.dto.doctor.QueryPersonnelInfoReq;
+import com.doctoruser.api.pojo.base.vo.doctor.PersonnelInfo;
 import com.ebaiyihui.family.doctor.common.dto.NotifyConsultDataDTO;
 import com.ebaiyihui.family.doctor.common.dto.SendImMsgDTO;
 import com.ebaiyihui.family.doctor.common.dto.SignedDoctorDTO;
+import com.ebaiyihui.family.doctor.common.vo.SignedDoctorVo;
 import com.ebaiyihui.family.doctor.server.common.constants.CommonConstants;
 import com.ebaiyihui.family.doctor.server.common.enums.ImSignStatus;
 import com.ebaiyihui.family.doctor.server.common.enums.SignStatus;
@@ -13,6 +16,7 @@ import com.ebaiyihui.family.doctor.server.entity.MobileBenefitPackageEntity;
 import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 import com.ebaiyihui.family.doctor.server.entity.ScheduleRecordEntity;
 import com.ebaiyihui.family.doctor.server.exception.BusinessException;
+import com.ebaiyihui.family.doctor.server.feign.DoctorInfofeignClient;
 import com.ebaiyihui.family.doctor.server.mapper.MobileBenefitPackageMapper;
 import com.ebaiyihui.family.doctor.server.mapper.PatientSignMapper;
 import com.ebaiyihui.family.doctor.server.mapper.ScheduleRecordMapper;
@@ -27,13 +31,17 @@ import com.ebaiyihui.family.doctor.server.util.UUIDUtil;
 import com.ebaiyihui.family.doctor.server.vo.OrderTaskVo;
 import com.ebaiyihui.framework.response.BaseResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
 
 /**
  * @ClassName: PatientServiceImpl
@@ -66,6 +74,9 @@ public class PatientServiceImpl implements PatientService {
     @Autowired
     private ThirdOrderPushUtil thirdOrderPushUtil;
 
+    @Autowired
+    private DoctorInfofeignClient doctorCilent;
+
     @Autowired
     private RabbitProduct rabbitProduct;
 
@@ -255,7 +266,7 @@ public class PatientServiceImpl implements PatientService {
     }
 
     @Override
-    public BaseResponse<PatientSignEntity> getSignedDoctor(SignedDoctorDTO reqVo) {
+    public BaseResponse<SignedDoctorVo> getSignedDoctor(SignedDoctorDTO reqVo) {
         QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
         PatientSignEntity patientSign = new PatientSignEntity();
         if (Objects.nonNull(reqVo.getAdmId())) {
@@ -274,7 +285,17 @@ public class PatientServiceImpl implements PatientService {
         if (null == patientSignEntity) {
             throw new BusinessException("未查询到签约医生信息！");
         }
-        return BaseResponse.success(patientSignEntity);
+        SignedDoctorVo signedDoctorVo = new SignedDoctorVo();
+        BeanUtils.copyProperties(patientSignEntity, signedDoctorVo);
+        QueryPersonnelInfoReq queryPersonnelInfoReq = new QueryPersonnelInfoReq();
+        queryPersonnelInfoReq.setDoctorId(String.valueOf(patientSignEntity.getDoctorId()));
+        BaseResponse<PersonnelInfo> res = doctorCilent.queryPersonnelInfo(queryPersonnelInfoReq);
+        if (res.isSuccess()) {
+            signedDoctorVo.setDoctorPortrait(res.getData().getPortrait());
+            signedDoctorVo.setDoctorProfession(res.getData().getProfession());
+        }
+
+        return BaseResponse.success(signedDoctorVo);
     }
 
     /**