ANDRU-PC\Andru
2023-06-01 abb5a863db85dd62045d7a2f463195d61029c9e5
Merge branch 'master' into master-test
4个文件已修改
33 ■■■■■ 已修改文件
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -18,6 +18,6 @@
    private String userId;
    /**是否客户确认(0:否,1:是)*/
    private Integer isCustomerConfirm;
    /**治疗通知单治疗项目id*/
    private String treatProjectId;
}
phis-feign/src/main/java/com/hz/his/dto/user/UserParamDto.java
@@ -178,6 +178,9 @@
    /** 用户兴趣爱好json */
    private String userInterestsJson;
    /** 科室关系json */
    private String departmentJson;
    /** email */
    private String email;
@@ -222,6 +225,11 @@
    /** 搜索:做过项目 */
    private String projectName;
    /** 医生id */
    private String doctorId;
    /** 部门id */
    private String department;
    /** 用户消费时间(开始),格式:yyyy-MM-dd HH:mm:ss */
    private String consumeStartTime;
@@ -229,6 +237,9 @@
    private String createStartTime;
    /** 搜索:用户创建时间(结束),格式:yyyy-MM-dd HH:mm:ss */
    private String createEndTime;
    public UserParamDto() {
    }
    /**性别-未知*/
    public static final Integer SEX_UNKNOWN = 0;
@@ -260,4 +271,6 @@
    //修改操作的备注
    private String note;
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -31,5 +31,9 @@
    @PostMapping(value = "/deduction/customer/confirm/before")
    Result customerConfirmBefore(@RequestBody DeductionDto dto);
    /**
     * 获取用户划扣信息之前的医生信息
     */
    @PostMapping(value = "/deduction/project/before/doctor/info")
    Result projectBeforeDoctorInfo(@RequestBody DeductionDto dto);
}
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -85,5 +85,15 @@
    @PostMapping("/attention/product/record/edit")
    Result userAttentionProductRecordEdit(@RequestBody UserAttentionProductDto userAttentionProductDto);
    /**
     * 开放平台-获取用户科室关系信息
     */
    @PostMapping(value = "/user/families/room/info")
    Result getUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
    /**
     * 开放平台-修改用户科室关系信息
     */
    @PostMapping(value = "/user/families/room/info/update")
    Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
}