feat:家庭医生初始化

family-doctor-common/src/main/java/com/ebaiyihui/family/doctor/common/dto/DoctorSchedDTO.java

+package com.ebaiyihui.family.doctor.common.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName: DoctorSchedDTO
+ * @Author:yanliang
+ * @Date:2024/3/25 14:29
+ * @Description
+ */
+@Data
+public class DoctorSchedDTO {
+
+    private String doctorId;
+}

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

@@ -3,8 +3,6 @@ package com.ebaiyihui.family.doctor.common.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @ClassName: SignedDoctorVo
  * @Author:yanliang
@@ -12,19 +10,7 @@ import java.util.Date;
  * @Description
  */
 @Data
-public class SignedDoctorVo {
-
-    @ApiModelProperty("主键id")
-    private Long id;
-
-    @ApiModelProperty("签约编号")
-    private String admId;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
+public class DoctorSchedVo {
 
     @ApiModelProperty("平台code")
     private String appCode;
@@ -35,21 +21,6 @@ public class SignedDoctorVo {
     @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;
 
@@ -62,24 +33,6 @@ public class SignedDoctorVo {
     @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;
 

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

@@ -34,4 +34,6 @@ public class RegisterPatientVo {
     private String abnormalId;
 
     private String intention;
+
+    private String doctorId;
 }

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

 package com.ebaiyihui.family.doctor.server.controller;
 
 import com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO;
+import com.ebaiyihui.family.doctor.common.dto.DoctorSchedDTO;
 import com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO;
 import com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO;
 import com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo;
 import com.ebaiyihui.family.doctor.common.vo.DoctorListVo;
+import com.ebaiyihui.family.doctor.common.vo.DoctorSchedVo;
 import com.ebaiyihui.family.doctor.common.vo.DoctorScheduleInfoResVo;
 import com.ebaiyihui.family.doctor.server.service.DoctorService;
 import com.ebaiyihui.framework.page.PageResult;
@@ -67,4 +69,18 @@ public class DoctorController {
         return doctorService.searchDoctorDaySchedule(reqDTO);
     }
 
+    @ApiOperation(value = "获取医生排班信息", notes = "医生服务feign调用")
+    @RequestMapping(value = "/getDoctorSched", method = RequestMethod.POST)
+    public BaseResponse<DoctorSchedVo> getDoctorSched(@RequestBody DoctorSchedDTO reqVo,
+                                                           BindingResult bindingResult) {
+
+
+        BaseResponse<DoctorSchedVo> response = null;
+        try {
+            response = doctorService.getDoctorSched(reqVo);
+        } catch (Exception e) {
+            return BaseResponse.error(e.getMessage());
+        }
+        return response;
+    }
 }

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.common.vo.SignedDoctorVo;
+import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 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<SignedDoctorVo> getSignedDoctor(@RequestBody SignedDoctorDTO reqVo,
-                                                        BindingResult bindingResult) {
+    public BaseResponse<PatientSignEntity> getSignedDoctor(@RequestBody SignedDoctorDTO reqVo,
+                                                           BindingResult bindingResult) {
 
 
-        BaseResponse<SignedDoctorVo> response = null;
+        BaseResponse<PatientSignEntity> response = null;
         try {
             response = patientService.getSignedDoctor(reqVo);
         } catch (Exception e) {

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

 package com.ebaiyihui.family.doctor.server.service;
 
 import com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO;
+import com.ebaiyihui.family.doctor.common.dto.DoctorSchedDTO;
 import com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO;
 import com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO;
 import com.ebaiyihui.family.doctor.common.vo.DoctorListForScheduleResVo;
 import com.ebaiyihui.family.doctor.common.vo.DoctorListVo;
+import com.ebaiyihui.family.doctor.common.vo.DoctorSchedVo;
 import com.ebaiyihui.family.doctor.common.vo.DoctorScheduleInfoResVo;
 import com.ebaiyihui.framework.page.PageResult;
 import com.ebaiyihui.framework.response.BaseResponse;
@@ -25,4 +27,6 @@ public interface DoctorService {
     BaseResponse<List<DoctorListForScheduleResVo>> getDoctorListForSchedule(DoctorListForScheduleReqDTO req);
 
     BaseResponse<DoctorScheduleInfoResVo> searchDoctorDaySchedule(SearchDoctorDayScheduleReqDTO reqDTO);
+
+    BaseResponse<DoctorSchedVo> getDoctorSched(DoctorSchedDTO reqVo);
 }

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.common.vo.SignedDoctorVo;
+import com.ebaiyihui.family.doctor.common.vo.DoctorSchedVo;
+import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 import com.ebaiyihui.framework.response.BaseResponse;
 
 /**
@@ -15,5 +16,5 @@ public interface PatientService {
 
     BaseResponse<String> signedDoctor(SignedDoctorDTO reqVo);
 
-    BaseResponse<SignedDoctorVo> getSignedDoctor(SignedDoctorDTO reqVo);
+    BaseResponse<PatientSignEntity> getSignedDoctor(SignedDoctorDTO reqVo);
 }

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

@@ -7,16 +7,16 @@ import com.doctor.basedata.api.vo.BusinessDoctorPageReqVo;
 import com.doctor.basedata.api.vo.DepartmentDetailVo;
 import com.doctor.basedata.api.vo.DoctorBasicRespVO;
 import com.doctor.basedata.api.vo.ServiceCheckReqVo;
-import com.ebaiyihui.family.doctor.common.dto.DoctorListForScheduleReqDTO;
-import com.ebaiyihui.family.doctor.common.dto.QueryDoctorsDTO;
-import com.ebaiyihui.family.doctor.common.dto.ScheduleForWeekReqDTO;
-import com.ebaiyihui.family.doctor.common.dto.SearchDoctorDayScheduleReqDTO;
+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.*;
 import com.ebaiyihui.family.doctor.common.vo.*;
 import com.ebaiyihui.family.doctor.server.common.constants.ImConstants;
 import com.ebaiyihui.family.doctor.server.common.enums.SignStatus;
 import com.ebaiyihui.family.doctor.server.entity.PatientSignEntity;
 import com.ebaiyihui.family.doctor.server.entity.ServiceConfigEntity;
 import com.ebaiyihui.family.doctor.server.feign.DepartmentFeignClient;
+import com.ebaiyihui.family.doctor.server.feign.DoctorInfofeignClient;
 import com.ebaiyihui.family.doctor.server.feign.DoctorWorkingServiceClient;
 import com.ebaiyihui.family.doctor.server.mapper.PatientSignMapper;
 import com.ebaiyihui.family.doctor.server.mapper.ServiceConfigMapper;
@@ -48,15 +48,18 @@ public class DoctorServiceImpl implements DoctorService {
     @Autowired
     private PatientSignMapper patientSignMapper;
 
-    @Autowired
-    private DepartmentFeignClient departmentInfoApi;
-
     @Autowired
     private ServiceConfigMapper serviceConfigMapper;
 
     @Autowired
     private ScheduleRecordService scheduleRecordService;
 
+    @Autowired
+    private DepartmentFeignClient departmentInfoApi;
+
+    @Autowired
+    private DoctorInfofeignClient doctorCilent;
+
     @Autowired
     private DoctorWorkingServiceClient doctorWorkingServiceClient;
 
@@ -264,6 +267,27 @@ public class DoctorServiceImpl implements DoctorService {
         return BaseResponse.success(doctorScheduleInfoResVo);
     }
 
+    @Override
+    public BaseResponse<DoctorSchedVo> getDoctorSched(DoctorSchedDTO reqVo) {
+        DoctorSchedVo doctorSchedVo = new DoctorSchedVo();
+
+        QueryPersonnelInfoReq queryPersonnelInfoReq = new QueryPersonnelInfoReq();
+        queryPersonnelInfoReq.setDoctorId(reqVo.getDoctorId());
+        BaseResponse<PersonnelInfo> res = doctorCilent.queryPersonnelInfo(queryPersonnelInfoReq);
+        if (res.isSuccess()) {
+            doctorSchedVo.setDoctorId(Long.valueOf(reqVo.getDoctorId()));
+            doctorSchedVo.setDoctorName(res.getData().getDoctorName());
+            doctorSchedVo.setDeptId(Long.valueOf(res.getData().getDeptId()));
+            doctorSchedVo.setDeptName(res.getData().getDeptName());
+            doctorSchedVo.setOrganId(Long.valueOf(res.getData().getOrganId()));
+            doctorSchedVo.setOrganName(res.getData().getOrganName());
+            doctorSchedVo.setDoctorPortrait(res.getData().getPortrait());
+            doctorSchedVo.setDoctorProfession(res.getData().getProfession());
+            doctorSchedVo.setDoctorTitle(res.getData().getTitle());
+        }
+        return BaseResponse.success(doctorSchedVo);
+    }
+
 //    private void redisHistory(QueryFamousDotDTO reqVo) {
 //
 //        //把搜索的数据存在map中

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

@@ -117,6 +117,10 @@ public class MobileBenefitPackageServiceImpl implements MobileBenefitPackageServ
             registerPatientVo.setIntention(map.get("intention"));
         }
 
+        if (Objects.nonNull(map.get("doctorId"))) {
+            registerPatientVo.setDoctorId(map.get("doctorId"));
+        }
+
         if (Objects.nonNull(map.get("signSeqId"))) {
             registerPatientVo.setSignSeqId(map.get("signSeqId"));
             PatientSignEntity patientSignEntity = patientSignMapper.selectById(Long.valueOf(map.get("signSeqId")));

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

@@ -2,12 +2,9 @@ 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;
@@ -16,7 +13,6 @@ 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;
@@ -31,7 +27,6 @@ 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;
@@ -74,9 +69,6 @@ public class PatientServiceImpl implements PatientService {
     @Autowired
     private ThirdOrderPushUtil thirdOrderPushUtil;
 
-    @Autowired
-    private DoctorInfofeignClient doctorCilent;
-
     @Autowired
     private RabbitProduct rabbitProduct;
 
@@ -266,7 +258,7 @@ public class PatientServiceImpl implements PatientService {
     }
 
     @Override
-    public BaseResponse<SignedDoctorVo> getSignedDoctor(SignedDoctorDTO reqVo) {
+    public BaseResponse<PatientSignEntity> getSignedDoctor(SignedDoctorDTO reqVo) {
         QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
         PatientSignEntity patientSign = new PatientSignEntity();
         if (Objects.nonNull(reqVo.getAdmId())) {
@@ -285,18 +277,8 @@ public class PatientServiceImpl implements PatientService {
         if (null == patientSignEntity) {
             throw new BusinessException("未查询到签约医生信息！");
         }
-        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());
-            signedDoctorVo.setDoctorTitle(res.getData().getTitle());
-        }
 
-        return BaseResponse.success(signedDoctorVo);
+        return BaseResponse.success(patientSignEntity);
     }
 
     /**