phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -12,9 +12,13 @@ /******MarketingDto继承字段 -必填项****/ /**审核类型 >20的值*/ /**审核类型 >1000的值 (参考m_application_subject) -必填项*/ private Integer type; /**审核唯一标识*/ /**审核类型唯一字符串 -必填项*/ private String typeStr; /**审核标题 -必填项*/ private String title; /**审核唯一标识 -必填项*/ private String uniqueId; /**审批界面展示的内容 -必填项*/ phis-feign/src/main/java/com/hz/his/dto/meiji/MeiJiDataDto.java
New file @@ -0,0 +1,15 @@ package com.hz.his.dto.meiji; import lombok.Data; /** * @USER: fhx * @DATE: 2023/11/9 **/ @Data public class MeiJiDataDto { /** 美际皮肤档案id */ private String mjSkinReportId; } phis-feign/src/main/java/com/hz/his/dto/micro/MicroRecordDto.java
@@ -1,7 +1,5 @@ package com.hz.his.dto.micro; import com.gitee.sunchenbin.mybatis.actable.annotation.Column; import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant; import com.hz.his.dto.PageDto; import lombok.Data;
@@ -32,6 +32,8 @@ private String platformType; /** 总价(逻辑累计后填充，非传参使用) */ private BigDecimal totalPrice; /** 报价项目-图片路径 */ private String bpImgUrl; /** 皮肤档案标识(MjSkinReport) */ private String pfDaId; @@ -44,6 +46,8 @@ /** 体态塑形-图片路径 */ private String ttSxImgUrl; /** 操作人标识 */ private String opId; /** 操作人名称 */ phis-feign/src/main/java/com/hz/his/dto/report/UserReportDto.java
New file @@ -0,0 +1,20 @@ package com.hz.his.dto.report; import lombok.Data; import java.util.List; /** * 咨询师报表扩展 * @author fwq * */ @Data public class UserReportDto { /**员工标识*/ private String userId; /**开始时间*/ private String startTime; /**结束时间*/ private String endTime; } phis-feign/src/main/java/com/hz/his/dto/report/UserReportListDto.java
New file @@ -0,0 +1,16 @@ package com.hz.his.dto.report; import lombok.Data; import java.util.List; /** * 咨询师报表扩展 * @author fwq * */ @Data public class UserReportListDto { private List<UserReportDto> list; } phis-feign/src/main/java/com/hz/his/feign/service/phis/SQuestionnaireService.java
@@ -38,5 +38,12 @@ Result getSendingRecordsList(@RequestBody(required = false) UserDto dto); /** * 获取调查问卷推送记录详情 * @param dto 用户标识 * @return Result */ @PostMapping(value = "/sending/records/see") Result see(@RequestBody(required = false) UserDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeService.java
@@ -30,4 +30,10 @@ */ @PostMapping(value = "/employee/search/acquisition/link") Result searchAcquisitionLink(@RequestBody EmployeeDto employeeDto); /** * 开放平台-企业微信发送邮件通知 */ @PostMapping(value = "/employee/sent/email/notice") Result senEmailNotice(@RequestBody EmployeeDto employeeDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiJiDataService.java
New file @@ -0,0 +1,21 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; import com.hz.his.dto.meiji.MeiJiDataDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 美际数据 * @USER: fhx * @DATE: 2023/11/9 **/ @FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-meiji-data") public interface SPhipMeiJiDataService { /** 列表 */ @PostMapping(value = "/meiji/data/resource/file/list") Result resourceFileList(@RequestBody MeiJiDataDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMicroRecordService.java
@@ -42,6 +42,8 @@ @PostMapping(value = "/micro/record/del") Result del(@RequestBody MicroRecordDto dto); /** crm查看记录详情 */ @PostMapping(value = "/micro/record/crm/see") Result crmSee(@RequestBody MicroRecordDto dto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -60,18 +60,6 @@ /** * 会员治疗情况总表 */ @PostMapping("/admin/doctor/sale/report/treat/detail/list") Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto); /** * 重点品项数据 */ @PostMapping("/admin/doctor/sale/report/project/items/list") Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto); /** * 分类治疗渗透情况 */ @PostMapping("/admin/doctor/sale/report/type/permeate/list") @@ -83,14 +71,48 @@ @PostMapping("/admin/doctor/sale/report/project/therapy/multiple") Result projectTypeMultiple(@RequestBody EmployeeReportDto employeeReportDto); /** * 医生初复诊简报 */ @PostMapping("/admin/doctor/sale/report/first/treat/list") Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto); /** * 会员治疗情况总表 */ @PostMapping("/admin/doctor/sale/report/treat/detail/list/V2") Result treatDetailListV2(@RequestBody EmployeeReportDto employeeReportDto); /** * 重点品项数据 */ @PostMapping("/admin/doctor/sale/report/project/items/list/V2") Result projectItemListV2(@RequestBody EmployeeReportDto employeeReportDto); /** * 客户预约到访情况 */ @PostMapping("/admin/doctor/sale/report/appoint/list/V2") Result appointListV2(@RequestBody EmployeeReportDto employeeReportDto); /*******************************下面接口3.0废弃*********************************/ /** * 会员治疗情况总表 */ @PostMapping("/admin/doctor/sale/report/treat/detail/list") Result treatDetailList(@RequestBody EmployeeReportDto employeeReportDto); /** * 重点品项数据 */ @PostMapping("/admin/doctor/sale/report/project/items/list") Result projectItemList(@RequestBody EmployeeReportDto employeeReportDto); /** * 客户预约情况 */ @PostMapping("/admin/doctor/sale/report/appoint/list") Result appointList(@RequestBody EmployeeReportDto employeeReportDto);
New file @@ -0,0 +1,25 @@ package com.hz.his.feign.service.platform.bi; import com.hx.resultTool.Result; import com.hz.his.dto.report.CxjReportReqDto; import com.hz.his.dto.report.UserReportListDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; /** * 用户数据 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀 */ @FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-user-data") public interface BiUserService { /** * 成交现金 */ @PostMapping("/admin/user/report/cash/money") Result cashTotalList(@RequestBody UserReportListDto userReportListDto); }
