4e9175d0aec08f78c61efe89ac61d95ff60a601c..4e5fd1f6fcf2e3fc318cdc51b09804073739aaa9
2024-04-10 fhx
1.新增字段
4e5fd1 对比 | 目录
2024-04-10 rx
Merge branch 'rx-咨询记录' into master-prod-new
dd4543 对比 | 目录
2024-04-10 fwq
多资产领取
a67898 对比 | 目录
2024-04-10 rx
咨询记录补充字段
110f61 对比 | 目录
4个文件已修改
66 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java
@@ -146,6 +146,19 @@
    private String keyWord;
    /**查询方式*/
    private String useType;
    // --------- 复诊补充新字段
    //客户疑虑
    private String doubt;
    //异议
    private String dissent;
    //预算
    private String budget;
    // 感兴趣的活动
    private String interestedActivities;
    //客人后续是否有安排事情和工作
    private String followUpWorks;
    public ConsultRecordDto() {
    }
@@ -573,4 +586,44 @@
    public void setIsDetail(Integer isDetail) {
        this.isDetail = isDetail;
    }
    public String getDoubt() {
        return doubt;
    }
    public void setDoubt(String doubt) {
        this.doubt = doubt;
    }
    public String getDissent() {
        return dissent;
    }
    public void setDissent(String dissent) {
        this.dissent = dissent;
    }
    public String getBudget() {
        return budget;
    }
    public void setBudget(String budget) {
        this.budget = budget;
    }
    public String getInterestedActivities() {
        return interestedActivities;
    }
    public void setInterestedActivities(String interestedActivities) {
        this.interestedActivities = interestedActivities;
    }
    public String getFollowUpWorks() {
        return followUpWorks;
    }
    public void setFollowUpWorks(String followUpWorks) {
        this.followUpWorks = followUpWorks;
    }
}
phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java
@@ -22,6 +22,8 @@
    /** 签署任务模板名称 */
    private String signTemplateName;
    /** 操作人类型(OperatorConstants) */
    private Integer opType;
    /** 登录操作人角色id */
    private String loginRoleId;
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.ToString;
import java.util.List;
/**
 * 用户资金
 *
@@ -123,6 +125,9 @@
    /**查询不可领取原因*/
    private Integer isSelectNotUse = 0;
    /**待领取记录标识集合*/
    private List<String> receiveIdList;
    /*****************类型信息 注:以下常量以phis的UserMoneyLog常量为主*******************************/
    /**
     * 应用类型-第三方平台
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -32,6 +32,12 @@
    Result receive(@RequestBody UserMoneyDto userMoneyDto);
    /**
     * 开放平台-领取用户资产-多条
     */
    @PostMapping(value = "/user/money/unclaimed/receive/more")
    Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);
    /**
     * 开放平台-作废用户待领取记录
     */
    @PostMapping(value = "/user/money/unclaimed/cancel")