feat:家庭医生初始化

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class AbnormalDataDTO extends ThirdPushDTO{
+public class AbnormalDataDTO {
 
     private String abnormalId;
 

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class FollowUpOrderDTO extends ThirdPushDTO {
+public class FollowUpOrderDTO {
 
     private String phone;
 

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class HealthInfoDTO extends ThirdPushDTO {
+public class HealthInfoDTO {
 
     private String phone;
 }

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

@@ -10,8 +10,10 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class NotifyConsultDataDTO extends ThirdPushDTO {
-    
+public class NotifyConsultDataDTO {
+
+    private String supplierCode;
+
     @ApiModelProperty(value = "激活订单ID", required = true)
 //    @NotBlank(message = "激活订单ID 不为空")
     private String activateOrderId;

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class SyncSignedOrderDTO extends ThirdPushDTO {
+public class SyncSignedOrderDTO {
 
     private String doctorId;
 

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

-package com.ebaiyihui.family.doctor.common.dto;
-
-import lombok.Data;
-
-/**
- * @ClassName: ThirdPushDTO
- * @Author:yanliang
- * @Date:2024/3/18 15:40
- * @Description
- */
-@Data
-public class ThirdPushDTO {
-
-    private String supplierCode;
-}

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Description
  */
 @Data
-public class UserInfoDTO extends ThirdPushDTO {
+public class UserInfoDTO {
 
     private String phone;
 }

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/common/constants/CommonConstants.java

@@ -142,4 +142,6 @@ public class CommonConstants {
     public static final String SIGN_SECRET = "123456";
 
     public static final String SUPPLIER_CODE = "ZhongKang";
+
+    public static final String SUPPLIER_CODE_JTYS = "zhongkang_mfd";
 }

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

@@ -109,6 +109,18 @@ public class PatientServiceImpl implements PatientService {
                 return BaseResponse.error("已经有进行中的签约的医生，不能在进行签约！！！");
             }
         } else {
+            QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
+            PatientSignEntity patientSign = new PatientSignEntity();
+            patientSign.setPatientPhone(reqVo.getPhone());
+            patientSign.setPackageOrderId(reqVo.getPackageOrderId());
+            patientSign.setSignStatus(SignStatus.NORMAL.getValue());
+            patientSign.setStatus(StatusEnum.IN_CONSULTATION.getValue());
+            psWrapper.setEntity(patientSign);
+            PatientSignEntity patientSignEntity = patientSignMapper.selectOne(psWrapper);
+            if (Objects.nonNull(patientSignEntity)) {
+                return BaseResponse.success(patientSignEntity.getAdmId());
+            }
+
             // 查询排班医生信息
             ScheduleRecordEntity scheduleRecordEntity = getScheduleDoctor(reqVo.getPatientId());
             doctorId = Long.valueOf(scheduleRecordEntity.getDoctorId());
@@ -129,7 +141,8 @@ public class PatientServiceImpl implements PatientService {
         }
 
         // 处理换绑医生
-        if (Objects.nonNull(reqVo.getAdmId()) || Objects.nonNull(reqVo.getSignSeqId())) {
+        if ((Objects.nonNull(reqVo.getAdmId()) || Objects.nonNull(reqVo.getSignSeqId())
+                && SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus()))) {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
             PatientSignEntity patientSign = new PatientSignEntity();
             if (Objects.nonNull(reqVo.getAdmId())) {
@@ -198,6 +211,7 @@ public class PatientServiceImpl implements PatientService {
             notifyConsultDataDTO.setPatientId(entity.getUserId());
             notifyConsultDataDTO.setExpertName(reqVo.getDoctorName());
             notifyConsultDataDTO.setOrderDate(DateUtils.dateToFullString(patientSignEntity.getCreateTime()));
+            notifyConsultDataDTO.setSupplierCode(CommonConstants.SUPPLIER_CODE_JTYS);
             thirdOrderPushUtil.syncBenefitUsedOrder(notifyConsultDataDTO);
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/util/ThirdOrderPushUtil.java

@@ -31,9 +31,8 @@ public class ThirdOrderPushUtil {
     private ProjProperties projProperties;
 
 
-    public <T extends ThirdPushDTO> Map<String, String> getThirdHead(T t) {
+    public <T> Map<String, String> getThirdHead(T t) {
         log.info("业务入参：{}", t);
-        t.setSupplierCode(CommonConstants.SUPPLIER_CODE);
         String param = JSONObject.toJSONString(t);
         log.info("业务数据：{}", param);
         String assessToken = getAssessToken();