Merge remote-tracking branch 'origin/chenjiahe-咨询记录（未成交）' into master-prod-new

chenjiahe

2024-06-25 50345f3b921e6c9763ea713bc0f7824d23717c40

Merge remote-tracking branch 'origin/chenjiahe-咨询记录（未成交）' into master-prod-new

 phis-feign/src/main/java/com/hz/his/dto/PageDto.java

@@ -23,9 +23,8 @@
    /**分类标识*/
    private String typeId;
    private List<String> typeIdList;
    //appid
    /**appid*/
    private String appId;


    public Integer getPageNum() {
        if(this.pageNum == null || this.pageNum < 0){

 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultAppearancePlanVo.java

New file
@@ -0,0 +1,16 @@
package com.hz.his.dto.consultation;

import lombok.Data;


/**
 * 咨询记录dto-颜值规划
 * @author CJH
 */
@Data
public class ConsultAppearancePlanVo {

    /**颜值规划详情*/
    private String details;

}

 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java

@@ -1,6 +1,7 @@
package com.hz.his.dto.consultation;

import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;

import java.util.Date;
import java.util.List;
@@ -11,6 +12,7 @@
 * 咨询记录dto 新版
 */
@JsonInclude(JsonInclude.Include.NON_NULL)
@Data
public class ConsultRecordDto{

    //用户id
@@ -33,10 +35,20 @@
    private String treatPlanQuote;
    //剂量参数
    private String dosageParams;
    /**是否无既往史：0否1是*/
    private Integer unanamnesis;
    //既往病史
    private String anamnesis;
    //来院前治疗过的项目
    private String hasTreatProjects;

    /**既往治疗机构*/
    private String anamTreatAgency;
    /**既往治疗医生*/
    private String anamTreatDoctor;
    /**既往治疗医生*/
    private String anamTreatSatisfaction;

    //是否草稿 0=否 1=是
    private Integer isDraft;
    //创建人类型 0=员工 1=后台
@@ -62,6 +74,28 @@
    //咨询方式名称
    private String methodCodeName;

    /**未成交原因*/
    private String description;
    /**用户职业*/
    private String userCareer;
    /**作息*/
    private String workRest;
    /**性格*/
    private String characterInfo;
    /**用户喜好*/
    private String userLike;
    /**婚姻状况*/
    private Integer maritalStatus = 0;
    /**备孕情况*/
    private Integer preparationPregnancy = 0;

    /**过敏史*/
    private String allergyHistory;
    /**疾病史*/
    private String diseaseHistory;
    /**白光美紧肌塑生评估*/
    private String estimateMapper;

    //------------- 修改传值
    private String id;

@@ -81,6 +115,10 @@
    private List<Map<String,Object>> recommendProjectList;
    //上次治疗项目
    private List<Map<String,Object>> lastTreatProjectList;
    /**预约项目集合*/
    private List<ConsultTreatProjectVo> preProjectList;
    /**颜值规划集合*/
    private List<ConsultAppearancePlanVo> appearancePlanList;


    //-------------- 搜索条件
@@ -150,6 +188,8 @@
    // --------- 复诊补充新字段
    //客户疑虑
    private String doubt;
    /**客户特殊情况*/
    private String specialSituation;
    //异议
    private String dissent;
    //预算

 phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultTreatProjectVo.java

New file
@@ -0,0 +1,18 @@
package com.hz.his.dto.consultation;

import lombok.Data;


/**
 * 咨询记录dto-项目
 * @author CJH
 */
@Data
public class ConsultTreatProjectVo {

    /**项目标识*/
    private String projectId;
    /**项目名称*/
    private String projectName;

}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SAppointmentService.java

New file
@@ -0,0 +1,20 @@
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import com.hz.his.vo.appointment.AppointmentProjectFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author CJH
 **/
@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "read-appointment")
public interface SAppointmentService {

    /** 获取用户时间内预约的项目 */
    @PostMapping("/appointment/user/project/list")
    Result userAppointmentProjectList(@RequestBody AppointmentProjectFindVo appointmentProjectFindVo);


}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java

@@ -4,6 +4,7 @@
import com.hz.his.dto.PageDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.project.ProjectDto;
import com.hz.his.vo.project.ProjectFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -48,6 +49,13 @@
     * @return Result
     */
    @PostMapping(value = "/project/page/list")
    Result getProjectList(@RequestBody ProjectFindVo projectFindVo);

    /**
     * 获取项目列表（因为代码的问题，这个接口保存下来）
     * @return Result
     */
    @PostMapping(value = "/project/page/list2")
    Result getProjectList(@RequestBody PageDto pageDto);

    /**

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipConsultationService.java

@@ -15,7 +15,7 @@
    /**
     * 开放平台-咨询记录新增/修改
     */
    @PostMapping(value = "/consultation/record/add/or/edit")
    @PostMapping(value = "/consultation/record/addOrUpdate")
    Result addOrEditConsult(@RequestBody ConsultRecordDto consultRecordNewDto);



 phis-feign/src/main/java/com/hz/his/vo/appointment/AppointmentProjectFindVo.java

New file
@@ -0,0 +1,21 @@
package com.hz.his.vo.appointment;

import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.Date;

/**
 * @author CJH
 */
@Data
public class AppointmentProjectFindVo extends PageDto {

    /**用户标识*/
    private String userId;
    /**预约时间-开始*/
    private Date preStartTime;
    /**预约时间-结束*/
    private Date preEndTime;

}

 phis-feign/src/main/java/com/hz/his/vo/project/ProjectFindVo.java

New file
@@ -0,0 +1,18 @@
package com.hz.his.vo.project;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * @author CJH
 */
@Data
public class ProjectFindVo extends PageDto {

    /**类型*/
    private Integer type;
    /**是否上下架-默认上架*/
    private Integer isUp = 1;


}